ports/107346: [PATCH] editors/scite: follow gtk's move to /usr/local

Naram Qashat cyberbotx at cyberbotx.com
Sat Dec 30 10:10:14 UTC 2006 

>Number:         107346
>Category:       ports
>Synopsis:       [PATCH] editors/scite: follow gtk's move to /usr/local
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 30 10:10:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 6.2-RC1 i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 6.2-RC1 FreeBSD 6.2-RC1 #4: Mon Dec 18 01:38:52 EST 2006
>Description:
Because GTK has moved to /usr/local, it has caused SciTE to try to look for it's
data files in /usr/local instead of /usr/X11R6.  This patch makes SciTE follow
GTK's move to /usr/local.

Also, the makefile patch was attempting to tell SciTE to use the already installed
scintilla files to build the object files of SciTE, but they were being ignored and
SciTE is still built out of the scintilla files that come with the scite tarball.
So I have removed the portion of the patch to makefile that edits the location of
where the scintilla files are.  It still uses the installed scintilla library, though.

Made pkg-plist a little more portslint friendly.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- scite-1.71_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/editors/scite/Makefile /kirby/shared/scite/Makefile
--- /usr/ports/editors/scite/Makefile	Tue Sep 19 18:49:20 2006
+++ /kirby/shared/scite/Makefile	Sat Dec 30 05:00:02 2006
@@ -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 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 MAKEFILE=	makefile
diff -ruN --exclude=CVS /usr/ports/editors/scite/files/patch-aa /kirby/shared/scite/files/patch-aa
--- /usr/ports/editors/scite/files/patch-aa	Tue Jun 27 11:36:43 2006
+++ /kirby/shared/scite/files/patch-aa	Sat Dec 30 04:50:30 2006
@@ -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 -ruN --exclude=CVS /usr/ports/editors/scite/pkg-plist /kirby/shared/scite/pkg-plist
--- /usr/ports/editors/scite/pkg-plist	Tue Sep 19 18:49:20 2006
+++ /kirby/shared/scite/pkg-plist	Sat Dec 30 04:38:05 2006
@@ -1,80 +1,80 @@
 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
- at dirrm share/scite
+%%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
+ at dirrm %%DATADIR%%
 @dirrmtry share/applications
--- scite-1.71_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list