6 files changed, 28 insertions, 59 deletions

diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index d1bc3b8712a4..bed9d82f31c0 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    tgif
-# Version required:     2.16-p12
-# Date created:         19 Jan 1996
+# Version required:     3.0-p9
+# Date created:         10 Oct 1996
 # Whom:                 bmc@WillsCreek.COM
 #
 # $Id$
 #
 
-DISTNAME=       tgif-2.16-p12
-PKGNAME=	tgif-2.16.12
+DISTNAME=	tgif-3.0-p9
+PKGNAME=	tgif-3.0.9
 CATEGORIES+=	graphics x11
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/tgif/ \
-	ftp://ftp.crl.research.digital.com/pub/X11/contrib/applications/tgif/ \
-	ftp://ftp.cs.columbia.edu/archives/X11R6/contrib/applications/tgif/
+		ftp://ftp.cs.ucla.edu/pub/tgif/ \
+		ftp://bourbon.cs.columbia.edu/pub/tgif/
 
 MAINTAINER=	bmc@WillsCreek.COM
 
@@ -24,6 +24,4 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 
 USE_IMAKE=      yes
 
-post-install:
-
 .include <bsd.port.mk>
diff --git a/graphics/tgif/distinfo b/graphics/tgif/distinfo
index 1f8990a84ce5..79f320b51129 100644
--- a/graphics/tgif/distinfo
+++ b/graphics/tgif/distinfo
@@ -1 +1 @@
-MD5 (tgif-2.16-p12.tar.gz) = f6eae5e52fd1a9772d2e33bbd6425308
+]2;odo:/usr/ports/distfilesMD5 (tgif-3.0-p9.tar.gz) = ffbf86f69c6a10b2f2e174a56d28d988
diff --git a/graphics/tgif/files/patch-aa b/graphics/tgif/files/patch-aa
index 82c6133640bf..ba90f22a5eec 100644
--- a/graphics/tgif/files/patch-aa
+++ b/graphics/tgif/files/patch-aa
@@ -1,58 +1,23 @@
-*** Imakefile.orig	Mon Jul 10 21:09:00 1995
---- Imakefile	Sat Mar  9 20:33:14 1996
+*** Imakefile.orig	Thu Oct  3 17:34:23 1996
+--- Imakefile	Thu Oct  3 17:34:58 1996
 ***************
-*** 44,52 ****
+*** 48,56 ****
   PROGRAMS	= tgif prtgif XCOMM frontend11.o testdrive
   XCOMM CDEBUGFLAGS= -g
   XCOMM INSTPGMFLAGS= -s
-! XCOMM BINDIR	= /u/multimedia/$(MACHINE)/bin
-! XCOMM MANPATH	= /u/multimedia/man
-! XCOMM TGIFDIR	= /u/multimedia/lib/X11/tgif
+! XCOMM BINDIR	= /u/halfmoon/$(MACHINE)/bin
+! XCOMM MANPATH	= /u/halfmoon/man
+! XCOMM TGIFDIR	= /u/halfmoon/lib/X11/tgif
   TGIFDIR		= $(LIBDIR)/tgif
   DEFINES		= -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\
                     -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\
---- 44,52 ----
+--- 48,56 ----
   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
+! BINDIR	= /usr/X11R6/bin
+! MANPATH	= /usr/X11R6/man
+! TGIFDIR	= /usr/X11R6/lib/X11/tgif
   TGIFDIR		= $(LIBDIR)/tgif
   DEFINES		= -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\
                     -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \@@\
-***************
-*** 54,60 ****
-                    -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\
-                    -DTEXT_FILE_EXT=\"txt\" \@@\
-                    -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\
-!                   -DLAUNCH_ATTR=\"launch=\" -DEXEC_ATTR=\"exec=\"
-  
-  XCOMM Things to try to add to the DEFINES line above:
-  XCOMM
---- 54,61 ----
-                    -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\
-                    -DTEXT_FILE_EXT=\"txt\" \@@\
-                    -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\
-!                   -DLAUNCH_ATTR=\"launch=\" -DEXEC_ATTR=\"exec=\" -D_BSD \@@\
-! 		  -D_USE_XDRAWPOINT_TO_PUT_A_POINT
-  
-  XCOMM Things to try to add to the DEFINES line above:
-  XCOMM
-***************
-*** 66,72 ****
-  XCOMM    VMS:     -D_NO_GETTIMEOFDAY
-  XCOMM    Linux:   -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT
-  
-! LOCAL_LIBRARIES	= $(XLIB)
-  XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
-  DEPLIBS		= $(DEPXLIB)
-  SYS_LIBRARIES	= -lm
---- 67,73 ----
-  XCOMM    VMS:     -D_NO_GETTIMEOFDAY
-  XCOMM    Linux:   -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT
-  
-! LOCAL_LIBRARIES	= $(XLIB) -lcompat
-  XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
-  DEPLIBS		= $(DEPXLIB)
-  SYS_LIBRARIES	= -lm
diff --git a/graphics/tgif/pkg-comment b/graphics/tgif/pkg-comment
index 1677dec2ed25..4e447d990419 100644
--- a/graphics/tgif/pkg-comment
+++ b/graphics/tgif/pkg-comment
@@ -1 +1 @@
-An Xlib-based two-dimensional drawing facility.
+Tgif is an Xlib-based two-dimensional drawing facility.
diff --git a/graphics/tgif/pkg-descr b/graphics/tgif/pkg-descr
index bb94b24005de..0a37488de1ad 100644
--- a/graphics/tgif/pkg-descr
+++ b/graphics/tgif/pkg-descr
@@ -1,6 +1,11 @@
+Tgif 3.0-p9
+
 Tgif is an X-based interactive drawing tool that allows the user to draw
-and manipulate objects.  The drawings can be converted to a variety of
-formats, including GIF, encapsulated PostScript and XBM.  Tgif depends on
-the `netpbm' package, available from the `ports' collection.
+and manipulate objects; as of version 2.16, it is also a "hyper-structured-
+graphics (or hyper-graphics) editor/browser on the World-Wide-Web".  Tgif
+drawings can be converted to a variety of formats, including GIF,
+encapsulated PostScript and XBM.  Tgif depends on the `netpbm' package,
+available from the `ports' collection.
 
-Tgif was written by William Chia-Wei Cheng (william@cs.ucla.edu)
+Tgif was written and is maintained and enhanced by
+William Chia-Wei Cheng (william@cs.ucla.edu)
diff --git a/graphics/tgif/pkg-plist b/graphics/tgif/pkg-plist
index 1b4732076aec..8f30dc437fe5 100644
--- a/graphics/tgif/pkg-plist
+++ b/graphics/tgif/pkg-plist
@@ -1,3 +1,4 @@
+@cwd /usr/X11R6
 bin/tgif
 bin/prtgif
 man/man1/tgif.1.gz