Attachment #80291 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 defined(WITH_GTK2)
USE_GNOME+=	gtk20
PKGNAMESUFFIX:=	-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.
5		5
Lines 9-24 Link Here
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	@@ -24,14 +24,14 @@
		13	# "h@h@" is printed here when gnome-config unavailable. Seems harmless.
		14	ifdef GTK2
		15	CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
		16	-CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
		17	+CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0
13	CONFIGTHREADS=	18	CONFIGTHREADS=
14	gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)	19	gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
15	else	20	else
16	-CONFIGFLAGS=gtk-config --cflags	21	-CONFIGFLAGS=$(shell gtk-config --cflags)
17	-CONFIGLIB=gtk-config --libs	22	-CONFIGLIB=$(shell gtk-config --libs)
18	+CONFIGFLAGS=pkg-config --cflags gtk+	23	-CONFIGTHREADS=$(shell glib-config --libs gthread)
19	+CONFIGLIB=pkg-config --libs gtk+
20	CONFIGTHREADS=glib-config --libs gthread
21	-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)	24	-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
		25	+CONFIGFLAGS=$(shell pkg-config --cflags gtk+)
		26	+CONFIGLIB=pkg-config --libs gtk+
		27	+CONFIGTHREADS=glib-config --libs gthread
22	+gnomeprefix:=$(PREFIX)	28	+gnomeprefix:=$(PREFIX)
23	endif	29	endif
24	ifndef prefix	30	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		42
37	ifndef NO_LUA	43	ifndef NO_LUA
38	@@ -102,9 +102,9 @@	44	@@ -102,8 +102,9 @@
39		45
40	$(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \	46	$(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
41	MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \	47	MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
42	- $(COMPLIB) $(LUA_OBJS)	48	- $(COMPLIB) $(LUA_OBJS)
43	- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`	49	- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
44	-
45	+ $(LUA_OBJS)	50	+ $(LUA_OBJS)
46	+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \	51	+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \
47	+ `$(CONFIGTHREADS)` -DGTK $^ -o $@	52	+ `$(CONFIGTHREADS)` -DGTK $^ -o $@
		53
48	# Automatically generate header dependencies with "make deps"	54	# Automatically generate header dependencies with "make deps"
49	include deps.mak	55	include deps.mak
50




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