1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Upgrade to 1.19.

This commit is contained in:
Vanilla I. Shu 1999-01-17 20:06:52 +00:00
parent 0e18da54e6
commit 795903174b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=16115
7 changed files with 69 additions and 50 deletions

View File

@ -1,26 +1,28 @@
# New ports collection makefile for: gxedit
# Version required: 1.17
# Version required: 1.19
# Date created: 01 Jul 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $Id: Makefile,v 1.15 1998/11/04 08:56:21 vanilla Exp $
# $Id: Makefile,v 1.16 1998/11/23 18:20:06 vanilla Exp $
#
DISTNAME= GXedit1.17
PKGNAME= gxedit-1.17
DISTNAME= GXedit1.19
PKGNAME= gxedit-1.19
CATEGORIES= editors
MASTER_SITES= http://devplanet.fastethernet.net/
MAINTAINER= dom@myrddin.demon.co.uk
MAINTAINER= dom@myrddin.demon.co.uk
LIB_DEPENDS= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
LIB_DEPENDS= gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel
USE_X_PREFIX= yes
ALL_TARGET= gxedit
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gtk-shell ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/gxedit ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/ftp.sh ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/ftp-ls.sh ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/ftp-put.sh ${PREFIX}/bin
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (GXedit1.17.tar.gz) = fa4d1da89c99d764826d418c7e6eeb0d
MD5 (GXedit1.19.tar.gz) = 011aa5dd3bb68004b266abe384c1b0bc

View File

@ -1,22 +1,21 @@
--- config.h.orig Mon Nov 23 04:58:50 1998
+++ config.h Tue Nov 24 00:54:58 1998
@@ -1,7 +1,7 @@
--- config.h.orig Thu Dec 31 22:48:16 1998
+++ config.h Mon Jan 18 02:18:32 1999
@@ -1,6 +1,6 @@
/* configuration file - precompile options */
#define USE_NET
-#undef BG_ON_START
+#define BG_ON_START
#define GTK_1_1
#undef GTKEDITOR_PATCH
#define USE_NET /* Use networking features */
-#undef BG_ON_START /* Background on startup */
+#define BG_ON_START /* Background on startup */
#define GTK_1_1 /* Use GTK 1.1.x */
#undef GTKEDITOR_PATCH /* Use the GtkEditor patch */
@@ -44,9 +44,9 @@
@@ -62,9 +62,9 @@
/* paths */
#define NETSCAPE "/usr/local/bin/netscape -remote"
-#define EMACS "/usr/bin/emcas"
-#define EMACS "/usr/bin/emacs"
-#define DES "/bin/des"
-#define IDEA "/bin/idea"
+#define EMACS "/usr/local/bin/emcas"
+#define EMACS "/usr/local/bin/emacs"
+#define DES "/usr/local/bin/des"
+#define IDEA "/usr/local/bin/idea"
#define XTERM "/usr/X11R6/bin/xterm"

View File

@ -1,32 +1,40 @@
--- Makefile.orig Mon Nov 23 04:54:57 1998
+++ Makefile Tue Nov 24 02:02:35 1998
@@ -1,9 +1,9 @@
--- Makefile.orig Mon Jan 18 02:19:50 1999
+++ Makefile Mon Jan 18 02:20:38 1999
@@ -1,8 +1,8 @@
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.
GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.3
GNOME_CFLAGS = -DUSE_GNOME
-CFLAGS = `gtk-config --cflags` -I/usr/local/include -I. -O -Wall -DVERSION=\"1.19\"
+CFLAGS += `gtk11d-config --cflags` -I/usr/local/include -I. -DVERSION=\"1.19\"
GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.4
-LIBS = `gtk-config --libs`
+LIBS = `gtk11-config --libs`
GNOME_LIBS = -lgnomesupport -lgnome -lgnomeui
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 @@
+LIBS = `gtk11d-config --libs`
OBJS = gxedit.o net.o utils.o
GTKEDITOR_OBJS = ../gtkeditor-0.0.4/gtkeditor/gtkeditor.o ../gtkeditor-0.0.4/regex/regex.o -L../gtkeditor-0.0.4 -lgtkeditor -lregex
CC = gcc
@@ -20,7 +20,6 @@
$(CC) $(CFLAGS) -c utils.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 ..)
(cd gtk-shell-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:
@@ -58,7 +58,7 @@
@@ -30,7 +29,6 @@
$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c utils.c
$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(GTKEDITOR_OBJS) $(LIBS)
@(rm -f ./.chk_config)
- (cd xproc-src; make BIN_DIR=../; cd ..)
(cd gtk-shell-src; make BIN_DIR=../; cd ..)
@echo "You should delete your ~/.gxedit file to allow GXedit to re-create it if you're upgrading GXedit."
install:
cp $(BIN_DIR)gxedit $(INSTALL_DIR)gxedit
- cp $(BIN_DIR)xproc $(INSTALL_DIR)xproc
+# cp $(BIN_DIR)xproc $(INSTALL_DIR)xproc
cp ftp.sh $(INSTALL_DIR)ftp.sh
cp ftp-ls.sh $(INSTALL_DIR)ftp-ls.sh
--- gtk-shell-src/Makefile.orig Wed Nov 25 07:10:44 1998
+++ gtk-shell-src/Makefile Mon Jan 18 02:25: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:

View File

@ -1,18 +1,18 @@
--- gxedit.c.orig Mon Nov 23 04:30:47 1998
+++ gxedit.c Tue Nov 24 00:58:23 1998
@@ -6569,6 +6569,7 @@
--- gxedit.c.orig Mon Jan 18 02:21:03 1999
+++ gxedit.c Mon Jan 18 02:21:42 1999
@@ -7097,6 +7097,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",
@@ -6576,6 +6577,7 @@
@@ -7104,6 +7105,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);

View File

@ -1,13 +1,21 @@
--- ftp-ls.sh.orig Tue Nov 24 02:02:51 1998
+++ ftp-ls.sh Tue Nov 24 02:03:00 1998
--- ftp-ls.sh.orig Mon Jan 18 02:22:16 1999
+++ ftp-ls.sh Mon Jan 18 02:22:27 1999
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# ftp.sh output_file host directory user pass
ftp -n $2 > $1 2> $1 <<EOC
user $4 $5
--- ftp.sh.orig Tue Nov 24 02:02:48 1998
+++ ftp.sh Tue Nov 24 02:02:56 1998
--- ftp-put.sh.orig Mon Jan 18 02:22:19 1999
+++ ftp-put.sh Mon Jan 18 02:22:33 1999
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# ftp-put.sh output_file host directory remote_file local_file user pass
ftp -n $2 > $1 2> $1 <<EOC
user $6 $7
--- ftp.sh.orig Mon Jan 18 02:22:22 1999
+++ ftp.sh Mon Jan 18 02:22:38 1999
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh

View File

@ -1,3 +1,5 @@
bin/ftp-ls.sh
bin/ftp-put.sh
bin/ftp.sh
bin/gtk-shell
bin/gxedit