- move to LOCALBASE

- fix patch
- portlint

PR:		ports/107346
Submitted by:	 Naram Qashat

3 files changed, 85 insertions, 95 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index f55917034d43..6dbb5a0df427 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scite
 PORTVERSION=	1.71
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -22,7 +22,6 @@ LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 MAKEFILE=	makefile
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index 455c64b317a4..ef23382eee95 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -2,12 +2,12 @@
 +++ makefile		Sat Jun 24 09:06:54 2006
 @@ -5,7 +5,7 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
- 
+
  .SUFFIXES: .cxx .o .h .a .c
 -CC = g++
 +CC ?= g++
  AR = ar
- 
+
  # If explicit setting of GTK1 or GTK2 then use that else look for
 @@ -28,10 +28,10 @@
  CONFIGTHREADS=
@@ -23,19 +23,9 @@
  endif
  ifndef prefix
  ifdef gnomeprefix
-@@ -51,17 +51,17 @@
- 
- all: $(PROG)
- 
--vpath %.h ../src ../../scintilla/include
-+vpath %.h ../src $(X11BASE)/include/scintilla
- vpath %.cxx ../src
- 
- #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
--INCLUDEDIRS=-I ../../scintilla/include -I ../src
-+INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
+@@ -59,9 +59,9 @@
  CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
- 
+
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
 +CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
@@ -43,10 +33,10 @@
 -CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
 +CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
  endif
- 
+
  ifndef NO_LUA
 @@ -102,9 +102,9 @@
- 
+
  $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
  MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
 -	$(COMPLIB) $(LUA_OBJS)
@@ -57,4 +47,4 @@
 +	`$(CONFIGTHREADS)` -DGTK $^ -o $@
  # Automatically generate header dependencies with "make deps"
  include deps.mak
- 
+
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 45728f2064f6..f97ba06b20a4 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -1,80 +1,81 @@
 bin/SciTE
 share/applications/SciTE.desktop
 share/pixmaps/Sci48M.png
-share/scite/Embedded.properties
-share/scite/PrintHi.png
-share/scite/SciBreak2.jpg
-share/scite/SciTE.html
-share/scite/SciTE.properties
-share/scite/SciTEDirector.html
-share/scite/SciTEDoc.html
-share/scite/SciTEDownload.html
-share/scite/SciTEExtension.html
-share/scite/SciTEExternalLexer.html
-share/scite/SciTEExtras.html
-share/scite/SciTEFAQ.html
-share/scite/SciTEGlobal.properties
-share/scite/SciTEIco.png
-share/scite/SciTEImage.html
-share/scite/SciTELexer.html
-share/scite/SciTELua.html
-share/scite/SciTERegEx.html
-share/scite/SciTEWord.jpg
-share/scite/abbrev.properties
-share/scite/ada.properties
-share/scite/asm.properties
-share/scite/asn1.properties
-share/scite/au3.properties
-share/scite/ave.properties
-share/scite/baan.properties
-share/scite/blitzbasic.properties
-share/scite/bullant.properties
-share/scite/caml.properties
-share/scite/conf.properties
-share/scite/cpp.properties
-share/scite/csound.properties
-share/scite/css.properties
-share/scite/demo.png
-share/scite/eiffel.properties
-share/scite/erlang.properties
-share/scite/escript.properties
-share/scite/flagship.properties
-share/scite/forth.properties
-share/scite/fortran.properties
-share/scite/freebasic.properties
-share/scite/html.properties
-share/scite/inno.properties
-share/scite/kix.properties
-share/scite/latex.properties
-share/scite/lisp.properties
-share/scite/lot.properties
-share/scite/lout.properties
-share/scite/lua.properties
-share/scite/matlab.properties
-share/scite/metapost.properties
-share/scite/mmixal.properties
-share/scite/nncrontab.properties
-share/scite/nsis.properties
-share/scite/opal.properties
-share/scite/others.properties
-share/scite/pascal.properties
-share/scite/perl.properties
-share/scite/pov.properties
-share/scite/ps.properties
-share/scite/purebasic.properties
-share/scite/python.properties
-share/scite/rebol.properties
-share/scite/ruby.properties
-share/scite/scriptol.properties
-share/scite/smalltalk.properties
-share/scite/specman.properties
-share/scite/spice.properties
-share/scite/sql.properties
-share/scite/tcl.properties
-share/scite/tex.properties
-share/scite/vb.properties
-share/scite/verilog.properties
-share/scite/vhdl.properties
-share/scite/yaml.properties
-@dirrm share/scite
+share/pixmaps
+%%DATADIR%%/Embedded.properties
+%%DATADIR%%/PrintHi.png
+%%DATADIR%%/SciBreak2.jpg
+%%DATADIR%%/SciTE.html
+%%DATADIR%%/SciTE.properties
+%%DATADIR%%/SciTEDirector.html
+%%DATADIR%%/SciTEDoc.html
+%%DATADIR%%/SciTEDownload.html
+%%DATADIR%%/SciTEExtension.html
+%%DATADIR%%/SciTEExternalLexer.html
+%%DATADIR%%/SciTEExtras.html
+%%DATADIR%%/SciTEFAQ.html
+%%DATADIR%%/SciTEGlobal.properties
+%%DATADIR%%/SciTEIco.png
+%%DATADIR%%/SciTEImage.html
+%%DATADIR%%/SciTELexer.html
+%%DATADIR%%/SciTELua.html
+%%DATADIR%%/SciTERegEx.html
+%%DATADIR%%/SciTEWord.jpg
+%%DATADIR%%/abbrev.properties
+%%DATADIR%%/ada.properties
+%%DATADIR%%/asm.properties
+%%DATADIR%%/asn1.properties
+%%DATADIR%%/au3.properties
+%%DATADIR%%/ave.properties
+%%DATADIR%%/baan.properties
+%%DATADIR%%/blitzbasic.properties
+%%DATADIR%%/bullant.properties
+%%DATADIR%%/caml.properties
+%%DATADIR%%/conf.properties
+%%DATADIR%%/cpp.properties
+%%DATADIR%%/csound.properties
+%%DATADIR%%/css.properties
+%%DATADIR%%/demo.png
+%%DATADIR%%/eiffel.properties
+%%DATADIR%%/erlang.properties
+%%DATADIR%%/escript.properties
+%%DATADIR%%/flagship.properties
+%%DATADIR%%/forth.properties
+%%DATADIR%%/fortran.properties
+%%DATADIR%%/freebasic.properties
+%%DATADIR%%/html.properties
+%%DATADIR%%/inno.properties
+%%DATADIR%%/kix.properties
+%%DATADIR%%/latex.properties
+%%DATADIR%%/lisp.properties
+%%DATADIR%%/lot.properties
+%%DATADIR%%/lout.properties
+%%DATADIR%%/lua.properties
+%%DATADIR%%/matlab.properties
+%%DATADIR%%/metapost.properties
+%%DATADIR%%/mmixal.properties
+%%DATADIR%%/nncrontab.properties
+%%DATADIR%%/nsis.properties
+%%DATADIR%%/opal.properties
+%%DATADIR%%/others.properties
+%%DATADIR%%/pascal.properties
+%%DATADIR%%/perl.properties
+%%DATADIR%%/pov.properties
+%%DATADIR%%/ps.properties
+%%DATADIR%%/purebasic.properties
+%%DATADIR%%/python.properties
+%%DATADIR%%/rebol.properties
+%%DATADIR%%/ruby.properties
+%%DATADIR%%/scriptol.properties
+%%DATADIR%%/smalltalk.properties
+%%DATADIR%%/specman.properties
+%%DATADIR%%/spice.properties
+%%DATADIR%%/sql.properties
+%%DATADIR%%/tcl.properties
+%%DATADIR%%/tex.properties
+%%DATADIR%%/vb.properties
+%%DATADIR%%/verilog.properties
+%%DATADIR%%/vhdl.properties
+%%DATADIR%%/yaml.properties
+@dirrm %%DATADIR%%
 @dirrmtry share/applications