Attachment #106659 for bug #147299

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

Lines 6-12 Link Here

(-)/kirby/shared/ports/scite/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= scite	8	PORTNAME= scite
9	PORTVERSION= 2.11	9	PORTVERSION= 2.12
10	CATEGORIES= editors gnome	10	CATEGORIES= editors gnome
11	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	11	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
12	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}	12	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
Lines 27-34 Link Here
27	MAN1= scite.1	27	MAN1= scite.1
28		28
29	post-patch:	29	post-patch:
30	@${REINPLACE_CMD} -e 's\|[(]CC[)]\|(CXX)\|g ; s\|gcc\|$$(CC)\|g ; s\| -Os\|\|g' \	30	@${REINPLACE_CMD} -e 's\|[(]CC[)]\|(CXX)\|g ; s\|[(]CCOMP[)]\|(CC)\|g ; \
31	${WRKSRC}/makefile	31	s\| -Os\|\|g' ${WRKSRC}/makefile
32	.if defined(WITH_FULL_BUFFER_MENU)	32	.if defined(WITH_FULL_BUFFER_MENU)
33	@${REINPLACE_CMD} -e 's\|30, "/Buffers\|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers\|g' ${WRKSRC}/SciTEGTK.cxx	33	@${REINPLACE_CMD} -e 's\|30, "/Buffers\|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers\|g' ${WRKSRC}/SciTEGTK.cxx
34	.endif	34	.endif

Lines 1-3 Link Here

(-)/kirby/shared/ports/scite/distinfo (-3 / +3 lines)
1	MD5 (scite211.tgz) = 129aad231c9618aaa2c2e41226db2327	1	MD5 (scite212.tgz) = 8868c06c1cfb248abd92cb3956bb5ba1
2	SHA256 (scite211.tgz) = bf0254e8eadbda1f32214a909b34c35bfb1f38f39551643c0445d92e224e34c8	2	SHA256 (scite212.tgz) = e1da8da68a75237b6c0d25533c92192564fc9a0df4f1f44665f241991d49963b
3	SIZE (scite211.tgz) = 1784014	3	SIZE (scite212.tgz) = 1930331

Lines 1-33 Link Here

(-)/kirby/shared/ports/scite/files/patch-aa (-17 / +28 lines)
1	--- makefile.orig 2010-03-13 20:41:15.000000000 -0500	1	--- makefile.orig 2010-05-31 23:35:36.000000000 -0400
2	+++ makefile 2010-04-05 07:57:38.000000000 -0400	2	+++ makefile 2010-06-01 18:35:04.000000000 -0400
3	@@ -5,7 +5,7 @@	3	@@ -5,20 +5,20 @@
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	-ifdef CLANG
		8	-CC = clang
		9	-CCOMP = clang
		10	-else
7	-CC = g++	11	-CC = g++
		12	-CCOMP = gcc
		13	-endif
		14	+#ifdef CLANG
		15	+#CC = clang
		16	+#CCOMP = clang
		17	+#else
8	+#CC = g++	18	+#CC = g++
		19	+#CCOMP = gcc
		20	+#endif
9	AR = ar	21	AR = ar
10		22
11	# If explicit setting of GTK1 or GTK2 then use that else look for	23	# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
12	@@ -26,7 +26,7 @@
13	CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)	24	CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
14	CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)	25	CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
15	CONFIGTHREADS:=	26	CONFIGTHREADS:=
16	-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)	27	-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
17	+gnomeprefix:=$(PREFIX)	28	+gnomeprefix:=$(PREFIX)
18	else	29	ifndef prefix
19	CONFIGFLAGS:=$(shell gtk-config --cflags)	30	ifdef gnomeprefix
20	CONFIGLIB:=$(shell gtk-config --libs)	31	prefix=$(gnomeprefix)
21	@@ -76,12 +76,12 @@	32	@@ -61,12 +61,12 @@
22		33
23	INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include	34	INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
24	$(LUA_CORE_OBJS): ../lua/src/*.c	35	$(LUA_CORE_OBJS): ../lua/src/*.c
25	- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c	36	- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
26	+ gcc $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c	37	+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
27	$(LUA_LIB_OBJS): ../lua/src/lib/*.c	38	$(LUA_LIB_OBJS): ../lua/src/lib/*.c
28	- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c	39	- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
29	-CXXFLAGS=$(CXXTFLAGS)	40	-CXXFLAGS=$(CXXTFLAGS)
30	+ gcc $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c	41	+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
31	+CXXFLAGS+=$(CXXTFLAGS)	42	+CXXFLAGS+=$(CXXTFLAGS)
32	else	43	else
33	-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA	44	-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
Lines 35-49 Link Here
35	endif	46	endif
36		47
37	ifeq ($(shell uname), Darwin)	48	ifeq ($(shell uname), Darwin)
38	@@ -102,8 +102,9 @@	49	@@ -87,8 +87,9 @@
39		50
40	$(PROG): SciTEGTK.o GUIGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \	51	$(PROG): SciTEGTK.o GUIGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \
41	PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \	52	PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
42	- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)	53	- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
43	- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB)	54	- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -lstdc++
44	+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)	55	+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
45	+ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers \	56	+ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \
46	+ -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@	57	+ -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@
47		58
48	# Automatically generate header dependencies with "make deps"	59	# Automatically generate header dependencies with "make deps"
49	include deps.mak	60	include deps.mak

Return to bug 147299