diff options
| -rw-r--r-- | editors/gxedit/Makefile | 21 | ||||
| -rw-r--r-- | editors/gxedit/distinfo | 2 | ||||
| -rw-r--r-- | editors/gxedit/files/patch-aa | 4 | ||||
| -rw-r--r-- | editors/gxedit/files/patch-ab | 36 | ||||
| -rw-r--r-- | editors/gxedit/files/patch-ae | 14 | ||||
| -rw-r--r-- | editors/gxedit/pkg-plist | 12 |
6 files changed, 60 insertions, 29 deletions
diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile index 3155ecc9fce7..b3552125a9c9 100644 --- a/editors/gxedit/Makefile +++ b/editors/gxedit/Makefile @@ -1,19 +1,19 @@ # New ports collection makefile for: gxedit -# Version required: 1.22 +# Version required: 1.23 # Date created: 01 Jul 1998 # Whom: Dom Mitchell <dom@myrddin.demon.co.uk> # -# $Id: Makefile,v 1.18 1999/02/02 17:04:09 vanilla Exp $ +# $Id: Makefile,v 1.19 1999/03/24 17:41:04 steve Exp $ # -DISTNAME= GXedit1.22 -PKGNAME= gxedit-1.22 +DISTNAME= GXedit1.23 +PKGNAME= gxedit-1.23 CATEGORIES= editors MASTER_SITES= http://devplanet.fastethernet.net/ MAINTAINER= dom@myrddin.demon.co.uk -LIB_DEPENDS= gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel +LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes ALL_TARGET= gxedit @@ -24,5 +24,16 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/ftp.sh ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/ftp-ls.sh ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/ftp-put.sh ${PREFIX}/bin + ${MKDIR} ${PREFIX}/share/gxedit/ +.for i in popmail.scr traceroute.scr userinfo.scr www.scr + ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/gxedit +.endfor + +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/gxedit/ +.for i in COPYING charmap.txt manual.ps manual.txt quickref.ps quickref.txt + ${INSTALL_DATA} ${WRKSRC}/docs/$i ${PREFIX}/share/doc/gxedit/ +.endfor +.endif .include <bsd.port.mk> diff --git a/editors/gxedit/distinfo b/editors/gxedit/distinfo index dd2dd44322f3..7cbe6f6a572c 100644 --- a/editors/gxedit/distinfo +++ b/editors/gxedit/distinfo @@ -1 +1 @@ -MD5 (GXedit1.22.tar.gz) = 857ffac0e813b50b41e881d9f4cf1a4e +MD5 (GXedit1.23.tar.gz) = afbd834a2fbb73b598e600f23655c13d diff --git a/editors/gxedit/files/patch-aa b/editors/gxedit/files/patch-aa index 45493f253049..1945abcb42ee 100644 --- a/editors/gxedit/files/patch-aa +++ b/editors/gxedit/files/patch-aa @@ -1,5 +1,5 @@ ---- config.h.orig Sat Mar 6 13:16:31 1999 -+++ config.h Sat Mar 6 13:17:25 1999 +--- config.h.orig Fri Mar 19 16:39:48 1999 ++++ config.h Mon Apr 5 17:16:37 1999 @@ -1,7 +1,7 @@ /* configuration file - precompile options */ diff --git a/editors/gxedit/files/patch-ab b/editors/gxedit/files/patch-ab index 510c987c3ef0..22343cd85df9 100644 --- a/editors/gxedit/files/patch-ab +++ b/editors/gxedit/files/patch-ab @@ -1,18 +1,23 @@ ---- Makefile.orig Sat Mar 6 14:05:41 1999 -+++ Makefile Sat Mar 6 14:07:05 1999 -@@ -3,9 +3,9 @@ +--- Makefile.orig Fri Mar 19 16:31:49 1999 ++++ Makefile Mon Apr 5 17:00:51 1999 +@@ -3,12 +3,13 @@ INSTALL_DIR = /usr/X11R6/bin/ DOCS = /usr/doc SHARE = /usr/share --CFLAGS = `gtk-config --cflags` -I/usr/local/include -I. -O -Wall -DVERSION=\"1.22\" -+CFLAGS += `gtk11d-config --cflags` -I/usr/local/include -I. -DVERSION=\"1.22\" - GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.6 +-CFLAGS = `gtk-config --cflags` -I/usr/local/include -I. -O -Wall -DVERSION=\"1.23\" ++CFLAGS ?= -O2 ++CFLAGS += `gtk12-config --cflags` -I/usr/local/include -I. -Wall -DVERSION=\"1.23\" + GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.6 -I../gtkeditor-0.0.6/gtkeditor -LIBS = `gtk-config --libs` -+LIBS = `gtk11d-config --libs` ++LIBS = `gtk12-config --libs` OBJS = gxedit.o net.o utils.o GTKEDITOR_OBJS = ../gtkeditor-0.0.6/gtkeditor/gtkeditor.o ../gtkeditor-0.0.6/regex/regex.o -L../gtkeditor-0.0.6 -lgtkeditor -lregex -lguile -ldl -ltermcap - CC = gcc -@@ -23,7 +23,6 @@ +-CC = gcc ++CC ?= gcc + + all: + @echo "Use ./setup" +@@ -23,7 +24,6 @@ $(CC) $(CFLAGS) -c utils.c $(CC) $(CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(LIBS) @(rm -f ./.chk_config) @@ -20,7 +25,7 @@ (cd gtk-shell-src; make BIN_DIR=../; cd ..) gxe-with-gtkeditor: -@@ -32,7 +31,6 @@ +@@ -32,7 +32,6 @@ $(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c utils.c $(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(GTKEDITOR_OBJS) $(LIBS) @(rm -f ./.chk_config) @@ -28,14 +33,3 @@ (cd gtk-shell-src; make BIN_DIR=../; cd ..) say: ---- gtk-shell-src/Makefile.orig Sat Mar 6 14:01:00 1999 -+++ gtk-shell-src/Makefile Sat Mar 6 14:02:08 1999 -@@ -1,6 +1,6 @@ - BIN_DIR = --CFLAGS = `gtk-config --cflags` -O -I. -Wall --LIBS = `gtk-config --libs` -+CFLAGS += `gtk11d-config --cflags` -I. -+LIBS = `gtk11d-config --libs` - CC = gcc - - all: diff --git a/editors/gxedit/files/patch-ae b/editors/gxedit/files/patch-ae new file mode 100644 index 000000000000..c4d7e1ab3f3f --- /dev/null +++ b/editors/gxedit/files/patch-ae @@ -0,0 +1,14 @@ +--- gtk-shell-src/Makefile.orig Fri Mar 19 16:38:47 1999 ++++ gtk-shell-src/Makefile Mon Apr 5 17:08:12 1999 +@@ -1,7 +1,8 @@ + BIN_DIR = +-CFLAGS = `gtk-config --cflags` -O -I. -Wall +-LIBS = `gtk-config --libs` +-CC = gcc ++CFLAGS ?= -O2 ++CFLAGS += `gtk12-config --cflags` -I. -Wall ++LIBS = `gtk12-config --libs` ++CC ?= gcc + + all: + $(CC) $(CFLAGS) -o $(BIN_DIR)gtk-shell gtk-shell.c $(LIBS) diff --git a/editors/gxedit/pkg-plist b/editors/gxedit/pkg-plist index 9821f247cf7a..7a8cd217bc62 100644 --- a/editors/gxedit/pkg-plist +++ b/editors/gxedit/pkg-plist @@ -3,3 +3,15 @@ bin/ftp-put.sh bin/ftp.sh bin/gtk-shell bin/gxedit +share/gxedit/popmail.scr +share/gxedit/traceroute.scr +share/gxedit/userinfo.scr +share/gxedit/www.scr +share/doc/gxedit/COPYING +share/doc/gxedit/charmap.txt +share/doc/gxedit/manual.ps +share/doc/gxedit/manual.txt +share/doc/gxedit/quickref.ps +share/doc/gxedit/quickref.txt +@dirrm share/gxedit/ +@dirrm share/doc/gxedit/ |