Attachment #80292 for bug #115188




#
PORTNAME=	scite
PORTVERSION=	1.74
PORTREVISION=	4
CATEGORIES=	editors gnome
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		http://www.scintilla.org/

DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
EXTRACT_SUFX=	.tgz
MAINTAINER=	cyberbotx@cyberbotx.com
COMMENT=	A full-featured SCIntilla based Text Editor for GTK/GNOME
LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
IGNORE=		is unusable, writing text does not work
DEPRECATED=	${IGNORE}
EXPIRATION_DATE=2007-09-30

WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
USE_GMAKE=	yes
WANT_GNOME=	yes
USE_GNOME+=	gtk20
MAKEFILE=	makefile
MAKE_ENV=	CC="${CXX}"
EXTRA_PATCH_FILES=	lua/include/lauxlib.h \

			lua/src/lparser.c \
			lua/src/lib/lauxlib.c
OPTIONS=	GTK2 "Turns on GTK+ 2.x support (Default is GTK+ 1)" off

.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
IGNORE=		coredumps on startup
.endif

.if !exists(${PREFIX}/include/scintilla/.scintilla-gtk2)
IGNORE=		requires x11-toolkits/scintilla to be built with GTK2
.else
USE_GNOME+=	gtk12
MAKE_ARGS=	GTK1=yes
.endif
MAN1=		scite.1

	@col < ${WRKSRC}/../${file}.orig \
		> ${WRKSRC}/../${file}
.endfor
.if defined(WITH_FULL_BUFFER_MENU)
	@${REINPLACE_CMD} -e 's|30, "/Buffers|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers|g' ${WRKSRC}/SciTEGTK.cxx
.endif
do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin

Lines 1-3 Link Here

(-)/kirby/shared/scite/distinfo (-3 / +3 lines)
1	MD5 (scite171.tgz) = b62946c770686909a4d4d0e42de3754c	1	MD5 (scite174.tgz) = 09ad25f1fa6dab3feec41dba2480047f
2	SHA256 (scite171.tgz) = c84ba2fc252345e3d36d36f14b3ab43c6f20e0e7ee5c30d8560f938d505116e3	2	SHA256 (scite174.tgz) = 10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01
3	SIZE (scite171.tgz) = 1300416	3	SIZE (scite174.tgz) = 1460459

Lines 1-5 Link Here

(-)/kirby/shared/scite/files/patch-aa (-13 / +18 lines)
1	--- makefile.bak Mon Feb 13 07:27:08 2006	1	--- makefile.orig Wed Aug 1 09:41:29 2007
2	+++ makefile Sat Jun 24 09:06:54 2006	2	+++ makefile Wed Aug 1 09:46:30 2007
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.
Lines 9-24 Link Here
9	AR = ar	9	AR = ar
10	# If explicit setting of GTK1 or GTK2 then use that else look for	10	# If explicit setting of GTK1 or GTK2 then use that else look for
11	@@ -28,10 +28,10 @@	11	@@ -24,14 +24,14 @@
		12	# "h@h@" is printed here when gnome-config unavailable. Seems harmless.
		13	ifdef GTK2
		14	CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
		15	-CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
		16	+CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0
12	CONFIGTHREADS=	17	CONFIGTHREADS=
13	gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)	18	gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
14	else	19	else
15	-CONFIGFLAGS=gtk-config --cflags	20	-CONFIGFLAGS=$(shell gtk-config --cflags)
16	-CONFIGLIB=gtk-config --libs	21	-CONFIGLIB=$(shell gtk-config --libs)
17	+CONFIGFLAGS=pkg-config --cflags gtk+	22	-CONFIGTHREADS=$(shell glib-config --libs gthread)
18	+CONFIGLIB=pkg-config --libs gtk+
19	CONFIGTHREADS=glib-config --libs gthread
20	-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)	23	-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
		24	+CONFIGFLAGS=$(shell pkg-config --cflags gtk+)
		25	+CONFIGLIB=pkg-config --libs gtk+
		26	+CONFIGTHREADS=glib-config --libs gthread
21	+gnomeprefix:=$(PREFIX)	27	+gnomeprefix:=$(PREFIX)
22	endif	28	endif
23	ifndef prefix	29	ifndef prefix
Lines 31-50 Link Here
31	+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)	37	+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
32	else	38	else
33	-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)	39	-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
34	+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)	40	+CXXTFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS)
35	endif	41	endif
36	ifndef NO_LUA	42	ifndef NO_LUA
37	@@ -102,9 +102,9 @@	43	@@ -102,8 +102,9 @@
38	$(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \	44	$(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
39	MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \	45	MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
40	- $(COMPLIB) $(LUA_OBJS)	46	- $(COMPLIB) $(LUA_OBJS)
41	- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`	47	- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
42	-
43	+ $(LUA_OBJS)	48	+ $(LUA_OBJS)
44	+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \	49	+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \
45	+ `$(CONFIGTHREADS)` -DGTK $^ -o $@	50	+ `$(CONFIGTHREADS)` -DGTK $^ -o $@
		51
46	# Automatically generate header dependencies with "make deps"	52	# Automatically generate header dependencies with "make deps"
47	include deps.mak	53	include deps.mak
48




bin/SciTE
share/applications/SciTE.desktop
share/pixmaps/Sci48M.png
%%DATADIR%%/CommandValues.html
%%DATADIR%%/Embedded.properties
%%DATADIR%%/PrintHi.png
%%DATADIR%%/SciBreak2.jpg

%%DATADIR%%/blitzbasic.properties
%%DATADIR%%/bullant.properties
%%DATADIR%%/caml.properties
%%DATADIR%%/cmake.properties
%%DATADIR%%/conf.properties
%%DATADIR%%/cpp.properties
%%DATADIR%%/csound.properties
%%DATADIR%%/css.properties
%%DATADIR%%/d.properties
%%DATADIR%%/demo.png
%%DATADIR%%/eiffel.properties
%%DATADIR%%/erlang.properties

%%DATADIR%%/forth.properties
%%DATADIR%%/fortran.properties
%%DATADIR%%/freebasic.properties
%%DATADIR%%/gap.properties
%%DATADIR%%/html.properties
%%DATADIR%%/inno.properties
%%DATADIR%%/kix.properties

Return to bug 115188

Lines 6-13 Link Here

(-)/kirby/shared/scite/Makefile (-17 / +11 lines)
6	#	6	#
7	PORTNAME= scite	7	PORTNAME= scite
8	PORTVERSION= 1.71	8	PORTVERSION= 1.74
9	PORTREVISION= 4
10	CATEGORIES= editors gnome	9	CATEGORIES= editors gnome
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
12	http://www.scintilla.org/	11	http://www.scintilla.org/
Lines 15-33 Link Here
15	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}	14	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
16	EXTRACT_SUFX= .tgz	15	EXTRACT_SUFX= .tgz
17	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= cyberbotx@cyberbotx.com
18	COMMENT= A full-featured SCIntilla based Text Editor for GTK/GNOME	17	COMMENT= A full-featured SCIntilla based Text Editor for GTK/GNOME
19	LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla	18	LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
20	IGNORE= is unusable, writing text does not work
21	DEPRECATED= ${IGNORE}
22	EXPIRATION_DATE=2007-09-30
23
24	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	19	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
25	USE_GMAKE= yes	20	USE_GMAKE= yes
26	WANT_GNOME= yes	21	WANT_GNOME= yes
		22	USE_GNOME+= gtk20
27	MAKEFILE= makefile	23	MAKEFILE= makefile
28	MAKE_ENV= CC="${CXX}"	24	MAKE_ENV= CC="${CXX}"
29	EXTRA_PATCH_FILES= lua/include/lauxlib.h \	25	EXTRA_PATCH_FILES= lua/include/lauxlib.h \
Lines 49-67 Link Here
49	lua/src/lparser.c \	45	lua/src/lparser.c \
50	lua/src/lib/lauxlib.c	46	lua/src/lib/lauxlib.c
51	OPTIONS= GTK2 "Turns on GTK+ 2.x support (Default is GTK+ 1)" off
52
53	.include <bsd.port.pre.mk>	47	.include <bsd.port.pre.mk>
54	.if (${ARCH} == "amd64") && defined(WITH_GTK2)	48	.if ${ARCH} == "amd64"
55	IGNORE= coredumps on startup	49	IGNORE= coredumps on startup
56	.endif	50	.endif
57	.if defined(WITH_GTK2)	51
58	USE_GNOME+= gtk20	52	.if !exists(${PREFIX}/include/scintilla/.scintilla-gtk2)
59	PKGNAMESUFFIX:= -gtk2	53	IGNORE= requires x11-toolkits/scintilla to be built with GTK2
60	.else
61	USE_GNOME+= gtk12
62	MAKE_ARGS= GTK1=yes
63	.endif	54	.endif
64	MAN1= scite.1	55	MAN1= scite.1
Lines 77-82 Link Here
77	@col < ${WRKSRC}/../${file}.orig \	68	@col < ${WRKSRC}/../${file}.orig \
78	> ${WRKSRC}/../${file}	69	> ${WRKSRC}/../${file}
79	.endfor	70	.endfor
		71	.if defined(WITH_FULL_BUFFER_MENU)
		72	@${REINPLACE_CMD} -e 's\|30, "/Buffers\|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers\|g' ${WRKSRC}/SciTEGTK.cxx
		73	.endif
80	do-install:	74	do-install:
81	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin	75	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin

Lines 1-6 Link Here

(-)/kirby/shared/scite/pkg-plist (+4 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	%%DATADIR%%/CommandValues.html
4	%%DATADIR%%/Embedded.properties	5	%%DATADIR%%/Embedded.properties
5	%%DATADIR%%/PrintHi.png	6	%%DATADIR%%/PrintHi.png
6	%%DATADIR%%/SciBreak2.jpg	7	%%DATADIR%%/SciBreak2.jpg
Lines 30-39 Link Here
30	%%DATADIR%%/blitzbasic.properties	31	%%DATADIR%%/blitzbasic.properties
31	%%DATADIR%%/bullant.properties	32	%%DATADIR%%/bullant.properties
32	%%DATADIR%%/caml.properties	33	%%DATADIR%%/caml.properties
		34	%%DATADIR%%/cmake.properties
33	%%DATADIR%%/conf.properties	35	%%DATADIR%%/conf.properties
34	%%DATADIR%%/cpp.properties	36	%%DATADIR%%/cpp.properties
35	%%DATADIR%%/csound.properties	37	%%DATADIR%%/csound.properties
36	%%DATADIR%%/css.properties	38	%%DATADIR%%/css.properties
		39	%%DATADIR%%/d.properties
37	%%DATADIR%%/demo.png	40	%%DATADIR%%/demo.png
38	%%DATADIR%%/eiffel.properties	41	%%DATADIR%%/eiffel.properties
39	%%DATADIR%%/erlang.properties	42	%%DATADIR%%/erlang.properties
Lines 42-47 Link Here
42	%%DATADIR%%/forth.properties	45	%%DATADIR%%/forth.properties
43	%%DATADIR%%/fortran.properties	46	%%DATADIR%%/fortran.properties
44	%%DATADIR%%/freebasic.properties	47	%%DATADIR%%/freebasic.properties
		48	%%DATADIR%%/gap.properties
45	%%DATADIR%%/html.properties	49	%%DATADIR%%/html.properties
46	%%DATADIR%%/inno.properties	50	%%DATADIR%%/inno.properties
47	%%DATADIR%%/kix.properties	51	%%DATADIR%%/kix.properties