From 91bb6fd7227748aa747d55f65bde01d079902e32 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Mon, 23 Nov 1998 18:20:07 +0000 Subject: Upgrade to 1.17. --- editors/gxedit/Makefile | 10 ++++++---- editors/gxedit/distinfo | 2 +- editors/gxedit/files/patch-aa | 30 ++++++++++++++++-------------- editors/gxedit/files/patch-ab | 24 ++++++++++-------------- editors/gxedit/files/patch-ac | 17 ++++------------- editors/gxedit/files/patch-ad | 16 ++++++++++++++++ editors/gxedit/pkg-plist | 2 ++ 7 files changed, 55 insertions(+), 46 deletions(-) create mode 100644 editors/gxedit/files/patch-ad (limited to 'editors/gxedit') diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile index 8c8d8178bf52..0b2aae3fa523 100644 --- a/editors/gxedit/Makefile +++ b/editors/gxedit/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gxedit -# Version required: 1.16 +# Version required: 1.17 # Date created: 01 Jul 1998 # Whom: Dom Mitchell # -# $Id: Makefile,v 1.14 1998/10/24 17:10:14 vanilla Exp $ +# $Id: Makefile,v 1.15 1998/11/04 08:56:21 vanilla Exp $ # -DISTNAME= GXedit1.16 -PKGNAME= gxedit-1.16 +DISTNAME= GXedit1.17 +PKGNAME= gxedit-1.17 CATEGORIES= editors MASTER_SITES= http://devplanet.fastethernet.net/ @@ -20,5 +20,7 @@ ALL_TARGET= gxedit do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gxedit ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/ftp.sh ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/ftp-ls.sh ${PREFIX}/bin .include diff --git a/editors/gxedit/distinfo b/editors/gxedit/distinfo index c7497f8b3bde..f4bcee0b932f 100644 --- a/editors/gxedit/distinfo +++ b/editors/gxedit/distinfo @@ -1 +1 @@ -MD5 (GXedit1.16.tar.gz) = 9a627ef5637e0d8cd3ca5ba256de0ad3 +MD5 (GXedit1.17.tar.gz) = fa4d1da89c99d764826d418c7e6eeb0d diff --git a/editors/gxedit/files/patch-aa b/editors/gxedit/files/patch-aa index a265d77cae2a..6f07623db910 100644 --- a/editors/gxedit/files/patch-aa +++ b/editors/gxedit/files/patch-aa @@ -1,22 +1,24 @@ ---- config.h.orig Fri Oct 30 20:36:26 1998 -+++ config.h Sun Nov 1 17:43:51 1998 -@@ -1,8 +1,8 @@ +--- config.h.orig Mon Nov 23 04:58:50 1998 ++++ config.h Tue Nov 24 00:54:58 1998 +@@ -1,7 +1,7 @@ /* 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 */ + #define GTK_1_1 /* Use GTK 1.1.x */ #undef GTKEDITOR_PATCH /* Use the GtkEditor patch */ - /* Highlighting styles */ -@@ -15,7 +15,7 @@ - /* proxy */ - #undef USE_SOCKS /* you need to add -lsocks5 to the makefile for this */ - --#undef INTERNATIONAL /* set locale */ -+#define INTERNATIONAL /* set locale */ - - /* mail path */ +@@ -44,9 +44,9 @@ + /* paths */ + #define NETSCAPE "/usr/local/bin/netscape -remote" +-#define EMACS "/usr/bin/emcas" +-#define DES "/bin/des" +-#define IDEA "/bin/idea" ++#define EMACS "/usr/local/bin/emcas" ++#define DES "/usr/local/bin/des" ++#define IDEA "/usr/local/bin/idea" + #define XTERM "/usr/X11R6/bin/xterm" + #define AWK "awk" + #define SED "sed" diff --git a/editors/gxedit/files/patch-ab b/editors/gxedit/files/patch-ab index 1821324fab6c..c3f9eb2d4a68 100644 --- a/editors/gxedit/files/patch-ab +++ b/editors/gxedit/files/patch-ab @@ -1,23 +1,19 @@ ---- Makefile.orig Fri Oct 30 20:02:16 1998 -+++ Makefile Sun Nov 1 17:45:10 1998 -@@ -1,13 +1,12 @@ +--- Makefile.orig Mon Nov 23 04:54:57 1998 ++++ Makefile Tue Nov 24 02:02:35 1998 +@@ -1,9 +1,9 @@ BIN_DIR = INSTALL_DIR = /usr/X11R6/bin/ -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 ++CFLAGS += `gtk11-config --cflags` -I/usr/local/include -I. + GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.3 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-1/gtkeditor.o ../gtkeditor-0.0.2-1/regex.o --CC = gcc - - all: - @echo "Use ./setup" -@@ -22,7 +21,7 @@ - $(CC) $(CFLAGS) -c bindings.c + OBJS = bindings.o gxedit.o net.o utils.o + GTKEDITOR_OBJS = ../gtkeditor-0.0.3/gtkeditor.o ../gtkeditor-0.0.3/regex.o -L../gtkeditor-0.0.3 -lgtkeditor -lregex +@@ -23,7 +23,7 @@ + $(CC) $(CFLAGS) -c utils.c $(CC) $(CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(LIBS) @(rm -f ./.chk_config) - (cd xproc-src; make BIN_DIR=../; cd ..) @@ -25,7 +21,7 @@ @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 @@ +@@ -58,7 +58,7 @@ install: cp $(BIN_DIR)gxedit $(INSTALL_DIR)gxedit diff --git a/editors/gxedit/files/patch-ac b/editors/gxedit/files/patch-ac index 364dc26f4e09..ff7b763c8711 100644 --- a/editors/gxedit/files/patch-ac +++ b/editors/gxedit/files/patch-ac @@ -1,15 +1,6 @@ ---- gxedit.c.orig Fri Oct 30 19:55:24 1998 -+++ gxedit.c Wed Nov 4 16:27:37 1998 -@@ -4482,7 +4482,7 @@ - } - fputs((char *)gtk_editable_get_chars(GTK_EDITABLE (text), 0, gtk_text_get_length(GTK_TEXT(text))),fd); - if(fd!=NULL) fclose(fd); -- sprintf(temp, "/usr/bin/emacs %s &", tmp_name); -+ sprintf(temp, "/usr/local/bin/emacs %s &", tmp_name); - system(temp); - } - -@@ -6765,6 +6765,7 @@ +--- gxedit.c.orig Mon Nov 23 04:30:47 1998 ++++ gxedit.c Tue Nov 24 00:58:23 1998 +@@ -6569,6 +6569,7 @@ if(tooltips) gtk_tooltips_set_tip(tips, menuitem, "HTML reference", ""); @@ -17,7 +8,7 @@ menuitem = gtk_menu_item_new_with_label("System information"); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_signal_connect_object(GTK_OBJECT(menuitem), "activate", -@@ -6772,6 +6773,7 @@ +@@ -6576,6 +6577,7 @@ gtk_widget_show(menuitem); if(tooltips) gtk_tooltips_set_tip(tips, menuitem, "Run Xproc", ""); diff --git a/editors/gxedit/files/patch-ad b/editors/gxedit/files/patch-ad new file mode 100644 index 000000000000..a298d10d3ef0 --- /dev/null +++ b/editors/gxedit/files/patch-ad @@ -0,0 +1,16 @@ +--- ftp-ls.sh.orig Tue Nov 24 02:02:51 1998 ++++ ftp-ls.sh Tue Nov 24 02:03:00 1998 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # ftp.sh output_file host directory user pass + ftp -n $2 > $1 2> $1 < $1 2> $1 <