Upgrade to 1.14.

5 files changed, 62 insertions, 23 deletions

diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index 93ebfbde7e12..2ed084cba28f 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gxedit
-# Version required:     1.12
+# Version required:     1.14
 # Date created:		01 Jul 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id: Makefile,v 1.10 1998/08/07 23:56:17 asami Exp $
+# $Id: Makefile,v 1.11 1998/08/25 04:04:39 vanilla Exp $
 #
 
-DISTNAME=	GXedit1.12
-PKGNAME=	gxedit-1.12
+DISTNAME=	GXedit1.14
+PKGNAME=	gxedit-1.14
 CATEGORIES=	editors
 MASTER_SITES=	http://devplanet.fastethernet.net/
 
@@ -16,6 +16,7 @@ MAINTAINER=     dom@myrddin.demon.co.uk
 LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
 
 USE_X_PREFIX=	yes
+ALL_TARGET=	gxedit
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gxedit ${PREFIX}/bin
diff --git a/editors/gxedit/distinfo b/editors/gxedit/distinfo
index d7ccf4bc6cc0..24c397613902 100644
--- a/editors/gxedit/distinfo
+++ b/editors/gxedit/distinfo
@@ -1 +1 @@
-MD5 (GXedit1.12.tar.gz) = f9dcb8beb5e506bd66c39b20042d54a5
+MD5 (GXedit1.14.tar.gz) = 86f8845aa5b045b08a7c1f9f08c1e15e
diff --git a/editors/gxedit/files/patch-aa b/editors/gxedit/files/patch-aa
index 7b3821043a67..79c0e57eabe6 100644
--- a/editors/gxedit/files/patch-aa
+++ b/editors/gxedit/files/patch-aa
@@ -1,11 +1,13 @@
---- config.h.orig	Tue Aug 25 10:46:17 1998
-+++ config.h	Tue Aug 25 10:46:34 1998
-@@ -13,7 +13,7 @@
- 
- #undef BG_ON_START     /* go to the background on start */
- 
--#undef GTK_1_1         /* if you only have GTK 1.1 */
-+#define GTK_1_1         /* if you only have GTK 1.1 */
- 
- #undef GTKEDITOR_PATCH /* the GtkEditor patch has been applied */
- 
+--- config.h.orig	Sun Aug 30 08:16:29 1998
++++ config.h	Thu Sep 17 06:43:40 1998
+@@ -1,8 +1,8 @@
+ /* configuration file - precompile options */
+ 
+ #define USE_NET /* Use networking features */
+-#undef BG_ON_START /* Background on startup */
+-#undef GTK_1_1 /* Use GTK 1.1.x */
++#define BG_ON_START /* Background on startup */
++#define GTK_1_1 /* Use GTK 1.1.x */
+ #undef GTKEDITOR_PATCH /* Use the GtkEditor patch */
+ 
+ /* Highlighting styles */
diff --git a/editors/gxedit/files/patch-ab b/editors/gxedit/files/patch-ab
index f5b6ad654cbe..d729ead9176d 100644
--- a/editors/gxedit/files/patch-ab
+++ b/editors/gxedit/files/patch-ab
@@ -1,18 +1,36 @@
---- Makefile.orig	Sat Aug 22 05:50:16 1998
-+++ Makefile	Tue Aug 25 10:47:56 1998
+--- Makefile.orig	Sun Aug 30 07:43:50 1998
++++ Makefile	Thu Sep 17 07:18:51 1998
 @@ -1,13 +1,12 @@
  BIN_DIR =
  INSTALL_DIR = /usr/X11R6/bin/
--CFLAGS = `gtk-config --cflags` -I. -O -Wall
-+CFLAGS += `gtk11-config --cflags`
- GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.2
+-CFLAGS = `gtk-config --cflags` -I/usr/local/include -I. -O -Wall
++CFLAGS += `gtk11-config --cflags` -I/usr/local/include -I. -DX_LOCALE
+ GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.2-1
  GNOME_CFLAGS = -DUSE_GNOME
 -LIBS = `gtk-config --libs`
 +LIBS = `gtk11-config --libs`
  GNOME_LIBS = -lgnomesupport -lgnome -lgnomeui
  OBJS = bindings.o gxedit.o net.o
- GTKEDITOR_OBJS = ../gtkeditor-0.0.2/gtkeditor.o ../gtkeditor-0.0.2/regex.o
+ GTKEDITOR_OBJS = ../gtkeditor-0.0.2-1/gtkeditor.o ../gtkeditor-0.0.2-1/regex.o
 -CC = gcc
  
  all:
- 	$(CC) -o .chk_config chk_config.c
+ 	@echo "Use ./setup"
+@@ -22,7 +21,7 @@
+ 	$(CC) $(CFLAGS) -c bindings.c
+ 	$(CC) $(CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(LIBS)
+ 	@(rm -f ./.chk_config)
+-	(cd xproc-src; make BIN_DIR=../; cd ..)
++#	(cd xproc-src; make BIN_DIR=../; cd ..)
+ 	@echo "You should delete your ~/.gxedit file to allow GXedit to re-create it if you're upgrading GXedit."
+ 
+ gxe-with-gtkeditor:
+@@ -55,7 +54,7 @@
+ 
+ install:
+ 	cp $(BIN_DIR)gxedit $(INSTALL_DIR)gxedit
+-	cp $(BIN_DIR)xproc $(INSTALL_DIR)xproc
++#	cp $(BIN_DIR)xproc $(INSTALL_DIR)xproc
+ 
+ distro:
+ 	rm -f *.o $(BIN_DIR)gxedit $(BIN_DIR)say $(BIN_DIR)xproc *.log *.enc
diff --git a/editors/gxedit/files/patch-ac b/editors/gxedit/files/patch-ac
new file mode 100644
index 000000000000..8fb2be58fca8
--- /dev/null
+++ b/editors/gxedit/files/patch-ac
@@ -0,0 +1,18 @@
+--- gxedit.c.orig	Thu Sep 17 07:15:24 1998
++++ gxedit.c	Thu Sep 17 07:15:54 1998
+@@ -6599,6 +6599,7 @@
+  if(tooltips)
+   gtk_tooltips_set_tip(tips, menuitem, "HTML reference", "");
+ 
++ /*
+  menuitem = gtk_menu_item_new_with_label("System information");
+  gtk_menu_append(GTK_MENU(menu), menuitem);
+  gtk_signal_connect_object(GTK_OBJECT(menuitem), "activate",
+@@ -6606,6 +6607,7 @@
+  gtk_widget_show(menuitem);
+  if(tooltips)
+   gtk_tooltips_set_tip(tips, menuitem, "Run Xproc", "");
++  */
+ 
+  menuitem = gtk_menu_item_new_with_label("About GXedit");
+  gtk_menu_append(GTK_MENU(menu), menuitem);