7 files changed, 67 insertions, 58 deletions

diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index f5c576fc6605..50c4601be056 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,14 +1,13 @@
 # New ports collection makefile for:    tgif
 # Version required:     3.0-p17
-# Date created:         10 Oct 1996
+# Date created:         10 Aug 1997
 # Whom:                 bmc@WillsCreek.COM
 #
-# $Id: Makefile,v 1.6 1998/10/05 03:13:36 steve Exp $
+# $Id: Makefile,v 1.7 1998/12/11 11:38:24 obrien Exp $
 #
 
-DISTNAME=	tgif-3.0.18
-PKGNAME=	tgif-3.0p18
-CATEGORIES=	graphics
+DISTNAME=	tgif-4.0.2
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://bourbon.cs.umd.edu/pub/tgif/ \
 		ftp://ftp.cs.ucla.edu/pub/tgif/
 
@@ -21,7 +20,12 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		xbmtopbm:${PORTSDIR}/graphics/netpbm \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
 
-USE_IMAKE=      yes
-MAN1=		prtgif.1 tgif.1
+USE_IMAKE=	yes
+MAN1=		tgif.1
+
+post-extract:
+		${RM} -f ${WRKDIR}/${DISTNAME}/Tgif.tmpl
+		${CP} ${WRKDIR}/${DISTNAME}/Tgif.tmpl-freebsd \
+		      ${WRKDIR}/${DISTNAME}/Tgif.tmpl
 
 .include <bsd.port.mk>
diff --git a/graphics/tgif/distinfo b/graphics/tgif/distinfo
index 046cc43721b4..9903ca107b41 100644
--- a/graphics/tgif/distinfo
+++ b/graphics/tgif/distinfo
@@ -1 +1 @@
-MD5 (tgif-3.0.18.tar.gz) = 75f18a1287efc456ab9605ae13cfebfa
+MD5 (tgif-4.0.2.tar.gz) = 564628da038f3fab0284fcf68b7318fd
diff --git a/graphics/tgif/files/patch-aa b/graphics/tgif/files/patch-aa
index ec322b8bebd1..3cc8eb5e2639 100644
--- a/graphics/tgif/files/patch-aa
+++ b/graphics/tgif/files/patch-aa
@@ -1,40 +1,19 @@
-*** Imakefile.orig	Thu Mar 13 12:19:25 1997
---- Imakefile	Thu Mar 13 12:20:39 1997
+*** xprtfltr.c.orig	Fri Jan  8 17:58:37 1999
+--- xprtfltr.c	Fri Jan  8 17:58:50 1999
 ***************
-*** 48,56 ****
-  PROGRAMS	= tgif prtgif XCOMM frontend11.o testdrive
-  XCOMM CDEBUGFLAGS= -g
-  XCOMM INSTPGMFLAGS= -s
-! XCOMM BINDIR	= /u/halfmoon/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\" \@@\
---- 48,56 ----
-  PROGRAMS	= tgif prtgif XCOMM frontend11.o testdrive
-  XCOMM CDEBUGFLAGS= -g
-  XCOMM INSTPGMFLAGS= -s
-! XCOMM BINDIR	= $(X11BASE)
-! XCOMM MANPATH	= $(X11BASE)
-! XCOMM TGIFDIR	= $(X11BASE)
-  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
+*** 187,193 ****
+        return FALSE;
+     }
+     pTgEFInfo->pSharedLibHandle = OPEN_DL(pszSharedLibPath,
+!          RTLD_NOW|RTLD_GLOBAL);
+     if (pTgEFInfo->pSharedLibHandle == NULL) {
+        sprintf(gszMsgBox, "Fail to load shared lib '%s'.", pszSharedLibPath);
+        MsgBox(gszMsgBox, TOOL_NAME, INFO_MB);
+--- 187,193 ----
+        return FALSE;
+     }
+     pTgEFInfo->pSharedLibHandle = OPEN_DL(pszSharedLibPath,
+!          RTLD_NOW);
+     if (pTgEFInfo->pSharedLibHandle == NULL) {
+        sprintf(gszMsgBox, "Fail to load shared lib '%s'.", pszSharedLibPath);
+        MsgBox(gszMsgBox, TOOL_NAME, INFO_MB);
diff --git a/graphics/tgif/files/patch-ab b/graphics/tgif/files/patch-ab
new file mode 100644
index 000000000000..5362b737c685
--- /dev/null
+++ b/graphics/tgif/files/patch-ab
@@ -0,0 +1,19 @@
+*** tgif.man.orig	Fri Jan  8 18:54:23 1999
+--- tgif.man	Fri Jan  8 18:54:36 1999
+***************
+*** 8,14 ****
+  .\"
+  .\"
+  .\"
+! .TH TGIF n "Version 4.0 Patchlevel 2 and Above" "Tgif"
+  .\"
+  .SH NAME
+  .\"
+--- 8,14 ----
+  .\"
+  .\"
+  .\"
+! .TH TGIF 1L "Version 4.0 Patchlevel 2 and Above" "Tgif"
+  .\"
+  .SH NAME
+  .\"
diff --git a/graphics/tgif/pkg-comment b/graphics/tgif/pkg-comment
index 1677dec2ed25..284bb9f06ef6 100644
--- a/graphics/tgif/pkg-comment
+++ b/graphics/tgif/pkg-comment
@@ -1 +1 @@
-An Xlib-based two-dimensional drawing facility.
+An Xlib-based two-dimensional drawing tool and hyper-object browser.
diff --git a/graphics/tgif/pkg-descr b/graphics/tgif/pkg-descr
index 9cbc4df01d7e..3344b7ab5a51 100644
--- a/graphics/tgif/pkg-descr
+++ b/graphics/tgif/pkg-descr
@@ -1,11 +1,19 @@
-Tgif 3.0-p17
+Tgif 4.0.2
 
-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-
-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 is an interactive drawing tool that allows the user to draw and
+manipulate objects in the X Window System. It's also a hyper-graphics (or
+hyper-structured-graphics) browser on the World-Wide-Web. Its hyper-text
+home page is http://bourbon.cs.umd.edu:8001/tgif/ and its hyper-graphics
+home page is http://bourbon.cs.umd.edu:8001/tgif/index.obj.
 
-Tgif was written and is maintained and enhanced by
-William Chia-Wei Cheng (william@cs.ucla.edu)
+Tgif drawings can be converted to a variety of formats, including GIF,
+encapsulated PostScript and XBM.
+
+Version 4 has a completely revamped 3-D user interface, as well as a host
+of new features.
+
+Tgif depends on the `netpbm' package, available from the `ports'
+collection.
+
+Tgif is written, maintained and enhanced by
+William Chia-Wei Cheng (william@cs.umd.edu)
diff --git a/graphics/tgif/pkg-plist b/graphics/tgif/pkg-plist
index 31a138410b64..6535e5114fe4 100644
--- a/graphics/tgif/pkg-plist
+++ b/graphics/tgif/pkg-plist
@@ -1,5 +1,4 @@
 bin/tgif
-bin/prtgif
 lib/X11/tgif/tgif.Xdefaults
 lib/X11/tgif/tgificon.eps
 lib/X11/tgif/tgificon.obj