Date: Mon, 11 Aug 1997 01:00:29 -0400 (EDT) From: bmc@WillsCreek.COM To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: bmc@WillsCreek.COM Subject: ports/4269: Fix for tgif port Message-ID: <199708110500.BAA03969@current.willscreek.com> Resent-Message-ID: <199708110510.WAA11964@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 4269
>Category: ports
>Synopsis: Fix for tgif port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 10 22:10:00 PDT 1997
>Last-Modified:
>Originator: Brian Clapper
>Organization:
Wills Creek Associates
>Release: FreeBSD 2.2.2-RELEASE i386
>Environment:
>Description:
Tgif port doesn't build because it's based on an outdated
version of the base software.
>How-To-Repeat:
>Fix:
The below diff should update the port so it'll work with the latest
version of tgif. If not, please contact me.
diff -uNr tgif.old/Makefile tgif/Makefile
--- tgif.old/Makefile Mon Nov 18 04:53:40 1996
+++ tgif/Makefile Mon Aug 11 00:56:08 1997
@@ -1,16 +1,16 @@
# New ports collection makefile for: tgif
-# Version required: 3.0-p9
-# Date created: 10 Oct 1996
+# Version required: 3.0-p13
+# Date created: 10 Aug 1997
# Whom: bmc@WillsCreek.COM
#
# $Id: Makefile,v 1.3 1996/11/18 09:53:40 asami Exp $
#
-DISTNAME= tgif-3.0-p9
-PKGNAME= tgif-3.0.9
-CATEGORIES= graphics x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications/tgif
+DISTNAME= tgif-3.0-p13
+PKGNAME= tgif-3.0.p13
+CATEGORIES+= graphics x11
+MASTER_SITES= ftp://bourbon.cs.columbia.edu/pub/tgif/ \
+ ftp://ftp.crl.research.digital.com/pub/X11/contrib/applications/tgif/
MAINTAINER= bmc@WillsCreek.COM
@@ -22,5 +22,7 @@
xpmtoppm:${PORTSDIR}/graphics/netpbm
USE_IMAKE= yes
+
+post-install:
.include <bsd.port.mk>
diff -uNr tgif.old/files/md5 tgif/files/md5
--- tgif.old/files/md5 Tue Dec 3 06:19:11 1996
+++ tgif/files/md5 Mon Aug 11 00:25:22 1997
@@ -1 +1 @@
-MD5 (tgif-3.0-p9.tar.gz) = ffbf86f69c6a10b2f2e174a56d28d988
+MD5 (tgif-3.0-p13.tar.gz) = d862c6bdf9c4e0f3852fdfe8646e50fc
diff -uNr tgif.old/patches/patch-aa tgif/patches/patch-aa
--- tgif.old/patches/patch-aa Fri Oct 18 22:20:28 1996
+++ tgif/patches/patch-aa Thu Mar 13 12:32:34 1997
@@ -1,11 +1,11 @@
-*** Imakefile.orig Thu Oct 3 17:34:23 1996
---- Imakefile Thu Oct 3 17:34:58 1996
+*** Imakefile.orig Thu Mar 13 12:19:25 1997
+--- Imakefile Thu Mar 13 12:20:39 1997
***************
*** 48,56 ****
PROGRAMS = tgif prtgif XCOMM frontend11.o testdrive
XCOMM CDEBUGFLAGS= -g
XCOMM INSTPGMFLAGS= -s
-! XCOMM BINDIR = /u/halfmoon/$(MACHINE)/bin
+! XCOMM BINDIR = /u/halfmoon/bin
! XCOMM MANPATH = /u/halfmoon/man
! XCOMM TGIFDIR = /u/halfmoon/lib/X11/tgif
TGIFDIR = $(LIBDIR)/tgif
@@ -15,9 +15,26 @@
PROGRAMS = tgif prtgif XCOMM frontend11.o testdrive
XCOMM CDEBUGFLAGS= -g
XCOMM INSTPGMFLAGS= -s
-! BINDIR = /usr/X11R6/bin
-! MANPATH = /usr/X11R6/man
-! TGIFDIR = /usr/X11R6/lib/X11/tgif
+! XCOMM BINDIR = /usr/X11R6/bin
+! XCOMM MANPATH = /usr/X11R6/man
+! XCOMM TGIFDIR = /usr/X11R6/lib/X11/tgif
TGIFDIR = $(LIBDIR)/tgif
DEFINES = -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\
-DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\
+***************
+*** 73,79 ****
+ XCOMM FreeBSD:
+ XCOMM SCO: -D_NO_EXTERN -DPRINT_CMD=\""lp -o raw -o nobanner"\"
+
+! LOCAL_LIBRARIES = $(XLIB)
+ XCOMM LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB)
+ DEPLIBS = $(DEPXLIB)
+ SYS_LIBRARIES = -lm
+--- 73,79 ----
+ XCOMM FreeBSD:
+ XCOMM SCO: -D_NO_EXTERN -DPRINT_CMD=\""lp -o raw -o nobanner"\"
+
+! LOCAL_LIBRARIES = $(XLIB) -lcompat
+ XCOMM LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB)
+ DEPLIBS = $(DEPXLIB)
+ SYS_LIBRARIES = -lm
diff -uNr tgif.old/patches/patch-ab tgif/patches/patch-ab
--- tgif.old/patches/patch-ab Sat Oct 19 17:55:29 1996
+++ tgif/patches/patch-ab Wed Dec 31 19:00:00 1969
@@ -1,39 +0,0 @@
-For some reason, "file.c" uses the obsolete cfree() function instead of
-free(). This patch makes it use free(), eliminating the need for GNU
-malloc or libcompat.
-
-Index: file.c
---- file.c.orig Sun Sep 15 07:51:53 1996
-+++ file.c Sat Oct 19 14:00:57 1996
-@@ -2693,11 +2693,11 @@
- {
- myFileBgPixel = myFileFgPixel = INVALID;
- if (myFileFgColorStr != NULL) {
-- cfree(myFileFgColorStr);
-+ free(myFileFgColorStr);
- myFileFgColorStr = NULL;
- }
- if (myFileBgColorStr != NULL) {
-- cfree(myFileBgColorStr);
-+ free(myFileBgColorStr);
- myFileBgColorStr = NULL;
- XSetWindowBackground(mainDisplay, drawWindow, myBgPixel);
- if (nRedraw) {
-@@ -2715,7 +2715,7 @@
- int changed=FALSE;
-
- if (myFileBgGifURL != NULL) {
-- cfree(myFileBgGifURL);
-+ free(myFileBgGifURL);
- myFileBgGifURL = NULL;
- changed = TRUE;
- }
-@@ -2901,7 +2901,7 @@
- if (myFileBgPixmap != None) XFreePixmap(mainDisplay, myFileBgPixmap);
- myFileBgPixmap = None;
- myFileBgPixmapW = myFileBgPixmapH = (-1);
-- if (myFileBgGifURL != NULL) cfree(myFileBgGifURL);
-+ if (myFileBgGifURL != NULL) free(myFileBgGifURL);
- myFileBgGifURL = UtilStrDup(attr_ptr->attr_value.s);
- if (myFileBgGifURL == NULL) FailAllocMessage();
- if (SetFileBgPixmap()) {
diff -uNr tgif.old/pkg/COMMENT tgif/pkg/COMMENT
--- tgif.old/pkg/COMMENT Fri Oct 18 22:20:30 1996
+++ tgif/pkg/COMMENT Wed Jan 31 06:12:00 1996
@@ -1 +1 @@
-Tgif is an Xlib-based two-dimensional drawing facility.
+An Xlib-based two-dimensional drawing facility.
diff -uNr tgif.old/pkg/DESCR tgif/pkg/DESCR
--- tgif.old/pkg/DESCR Fri Oct 18 22:20:33 1996
+++ tgif/pkg/DESCR Mon Aug 11 00:57:00 1997
@@ -1,4 +1,4 @@
-Tgif 3.0-p9
+Tgif 3.0-p13
Tgif is an X-based interactive drawing tool that allows the user to draw
and manipulate objects; as of version 2.16, it is also a "hyper-structured-
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199708110500.BAA03969>