Attachment #74166 for bug #107346

View | Details | Raw Unified | Return to bug 107346
Collapse All | Expand All

Lines 7-13 Link Here

(-)/kirby/shared/scite/Makefile (-2 / +1 lines)
7		7
8	PORTNAME= scite	8	PORTNAME= scite
9	PORTVERSION= 1.71	9	PORTVERSION= 1.71
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= editors gnome	11	CATEGORIES= editors gnome
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
13	http://www.scintilla.org/	13	http://www.scintilla.org/
Lines 22-28 Link Here
22		22
23	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	23	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
24		24
25	USE_X_PREFIX= yes
26	USE_GMAKE= yes	25	USE_GMAKE= yes
27	WANT_GNOME= yes	26	WANT_GNOME= yes
28	MAKEFILE= makefile	27	MAKEFILE= makefile




+++ 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=

 endif
 ifndef prefix
 ifdef gnomeprefix
@@ -59,9 +59,9 @@
 
 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
 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)

-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)

+	`$(CONFIGTHREADS)` -DGTK $^ -o $@
 # Automatically generate header dependencies with "make deps"
 include deps.mak





bin/SciTE
share/applications/SciTE.desktop
share/pixmaps/Sci48M.png
%%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

Return to bug 107346

Lines 1-80 Link Here

(-)/kirby/shared/scite/pkg-plist (-76 / +76 lines)
1	bin/SciTE	1	bin/SciTE
2	share/applications/SciTE.desktop	2	share/applications/SciTE.desktop
3	share/pixmaps/Sci48M.png	3	share/pixmaps/Sci48M.png
4	share/scite/Embedded.properties	4	%%DATADIR%%/Embedded.properties
5	share/scite/PrintHi.png	5	%%DATADIR%%/PrintHi.png
6	share/scite/SciBreak2.jpg	6	%%DATADIR%%/SciBreak2.jpg
7	share/scite/SciTE.html	7	%%DATADIR%%/SciTE.html
8	share/scite/SciTE.properties	8	%%DATADIR%%/SciTE.properties
9	share/scite/SciTEDirector.html	9	%%DATADIR%%/SciTEDirector.html
10	share/scite/SciTEDoc.html	10	%%DATADIR%%/SciTEDoc.html
11	share/scite/SciTEDownload.html	11	%%DATADIR%%/SciTEDownload.html
12	share/scite/SciTEExtension.html	12	%%DATADIR%%/SciTEExtension.html
13	share/scite/SciTEExternalLexer.html	13	%%DATADIR%%/SciTEExternalLexer.html
14	share/scite/SciTEExtras.html	14	%%DATADIR%%/SciTEExtras.html
15	share/scite/SciTEFAQ.html	15	%%DATADIR%%/SciTEFAQ.html
16	share/scite/SciTEGlobal.properties	16	%%DATADIR%%/SciTEGlobal.properties
17	share/scite/SciTEIco.png	17	%%DATADIR%%/SciTEIco.png
18	share/scite/SciTEImage.html	18	%%DATADIR%%/SciTEImage.html
19	share/scite/SciTELexer.html	19	%%DATADIR%%/SciTELexer.html
20	share/scite/SciTELua.html	20	%%DATADIR%%/SciTELua.html
21	share/scite/SciTERegEx.html	21	%%DATADIR%%/SciTERegEx.html
22	share/scite/SciTEWord.jpg	22	%%DATADIR%%/SciTEWord.jpg
23	share/scite/abbrev.properties	23	%%DATADIR%%/abbrev.properties
24	share/scite/ada.properties	24	%%DATADIR%%/ada.properties
25	share/scite/asm.properties	25	%%DATADIR%%/asm.properties
26	share/scite/asn1.properties	26	%%DATADIR%%/asn1.properties
27	share/scite/au3.properties	27	%%DATADIR%%/au3.properties
28	share/scite/ave.properties	28	%%DATADIR%%/ave.properties
29	share/scite/baan.properties	29	%%DATADIR%%/baan.properties
30	share/scite/blitzbasic.properties	30	%%DATADIR%%/blitzbasic.properties
31	share/scite/bullant.properties	31	%%DATADIR%%/bullant.properties
32	share/scite/caml.properties	32	%%DATADIR%%/caml.properties
33	share/scite/conf.properties	33	%%DATADIR%%/conf.properties
34	share/scite/cpp.properties	34	%%DATADIR%%/cpp.properties
35	share/scite/csound.properties	35	%%DATADIR%%/csound.properties
36	share/scite/css.properties	36	%%DATADIR%%/css.properties
37	share/scite/demo.png	37	%%DATADIR%%/demo.png
38	share/scite/eiffel.properties	38	%%DATADIR%%/eiffel.properties
39	share/scite/erlang.properties	39	%%DATADIR%%/erlang.properties
40	share/scite/escript.properties	40	%%DATADIR%%/escript.properties
41	share/scite/flagship.properties	41	%%DATADIR%%/flagship.properties
42	share/scite/forth.properties	42	%%DATADIR%%/forth.properties
43	share/scite/fortran.properties	43	%%DATADIR%%/fortran.properties
44	share/scite/freebasic.properties	44	%%DATADIR%%/freebasic.properties
45	share/scite/html.properties	45	%%DATADIR%%/html.properties
46	share/scite/inno.properties	46	%%DATADIR%%/inno.properties
47	share/scite/kix.properties	47	%%DATADIR%%/kix.properties
48	share/scite/latex.properties	48	%%DATADIR%%/latex.properties
49	share/scite/lisp.properties	49	%%DATADIR%%/lisp.properties
50	share/scite/lot.properties	50	%%DATADIR%%/lot.properties
51	share/scite/lout.properties	51	%%DATADIR%%/lout.properties
52	share/scite/lua.properties	52	%%DATADIR%%/lua.properties
53	share/scite/matlab.properties	53	%%DATADIR%%/matlab.properties
54	share/scite/metapost.properties	54	%%DATADIR%%/metapost.properties
55	share/scite/mmixal.properties	55	%%DATADIR%%/mmixal.properties
56	share/scite/nncrontab.properties	56	%%DATADIR%%/nncrontab.properties
57	share/scite/nsis.properties	57	%%DATADIR%%/nsis.properties
58	share/scite/opal.properties	58	%%DATADIR%%/opal.properties
59	share/scite/others.properties	59	%%DATADIR%%/others.properties
60	share/scite/pascal.properties	60	%%DATADIR%%/pascal.properties
61	share/scite/perl.properties	61	%%DATADIR%%/perl.properties
62	share/scite/pov.properties	62	%%DATADIR%%/pov.properties
63	share/scite/ps.properties	63	%%DATADIR%%/ps.properties
64	share/scite/purebasic.properties	64	%%DATADIR%%/purebasic.properties
65	share/scite/python.properties	65	%%DATADIR%%/python.properties
66	share/scite/rebol.properties	66	%%DATADIR%%/rebol.properties
67	share/scite/ruby.properties	67	%%DATADIR%%/ruby.properties
68	share/scite/scriptol.properties	68	%%DATADIR%%/scriptol.properties
69	share/scite/smalltalk.properties	69	%%DATADIR%%/smalltalk.properties
70	share/scite/specman.properties	70	%%DATADIR%%/specman.properties
71	share/scite/spice.properties	71	%%DATADIR%%/spice.properties
72	share/scite/sql.properties	72	%%DATADIR%%/sql.properties
73	share/scite/tcl.properties	73	%%DATADIR%%/tcl.properties
74	share/scite/tex.properties	74	%%DATADIR%%/tex.properties
75	share/scite/vb.properties	75	%%DATADIR%%/vb.properties
76	share/scite/verilog.properties	76	%%DATADIR%%/verilog.properties
77	share/scite/vhdl.properties	77	%%DATADIR%%/vhdl.properties
78	share/scite/yaml.properties	78	%%DATADIR%%/yaml.properties
79	@dirrm share/scite	79	@dirrm %%DATADIR%%
80	@dirrmtry share/applications	80	@dirrmtry share/applications

Lines 2-13 Link Here

(-)/kirby/shared/scite/files/patch-aa (-17 / +7 lines)
2	+++ makefile Sat Jun 24 09:06:54 2006	2	+++ makefile Sat Jun 24 09:06:54 2006
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4	# GNU make does not like \r\n line endings so should be saved to CVS in binary form.	4	# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
5		5
6	.SUFFIXES: .cxx .o .h .a .c	6	.SUFFIXES: .cxx .o .h .a .c
7	-CC = g++	7	-CC = g++
8	+CC ?= g++	8	+CC ?= g++
9	AR = ar	9	AR = ar
10		10
11	# If explicit setting of GTK1 or GTK2 then use that else look for	11	# If explicit setting of GTK1 or GTK2 then use that else look for
12	@@ -28,10 +28,10 @@	12	@@ -28,10 +28,10 @@
13	CONFIGTHREADS=	13	CONFIGTHREADS=
Lines 23-41 Link Here
23	endif	23	endif
24	ifndef prefix	24	ifndef prefix
25	ifdef gnomeprefix	25	ifdef gnomeprefix
26	@@ -51,17 +51,17 @@	26	@@ -59,9 +59,9 @@
27
28	all: $(PROG)
29
30	-vpath %.h ../src ../../scintilla/include
31	+vpath %.h ../src $(X11BASE)/include/scintilla
32	vpath %.cxx ../src
33
34	#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
35	-INCLUDEDIRS=-I ../../scintilla/include -I ../src
36	+INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
37	CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)	27	CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
38		28
39	ifdef DEBUG	29	ifdef DEBUG
40	-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)	30	-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
41	+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)	31	+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
Lines 43-52 Link Here
43	-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)	33	-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
44	+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)	34	+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
45	endif	35	endif
46		36
47	ifndef NO_LUA	37	ifndef NO_LUA
48	@@ -102,9 +102,9 @@	38	@@ -102,9 +102,9 @@
49		39
50	$(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \	40	$(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
51	MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \	41	MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
52	- $(COMPLIB) $(LUA_OBJS)	42	- $(COMPLIB) $(LUA_OBJS)
Lines 57-60 Link Here
57	+ `$(CONFIGTHREADS)` -DGTK $^ -o $@	47	+ `$(CONFIGTHREADS)` -DGTK $^ -o $@
58	# Automatically generate header dependencies with "make deps"	48	# Automatically generate header dependencies with "make deps"
59	include deps.mak	49	include deps.mak
60		50