Update to ver 4.1.26

PR:		16241
Submitted by:	maintainer

5 files changed, 62 insertions, 69 deletions

diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 118f9271fd9d..e167109b4caa 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    tgif-nls
-# Version required:     4.1.16
+# Version required:     4.1.26
 # Date created:         3 May 1999
 # Whom:                 one@netlab.is.tsukuba.ac.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tgif-4.1.16
-PKGNAME=	tgif-nls-4.1.16
+DISTNAME=	tgif-4.1.26
+PKGNAME=	tgif-nls-4.1.26
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.cs.umd.edu/pub/tgif/ \
 		ftp://ftp.cs.ucla.edu/pub/tgif/
@@ -15,27 +15,37 @@ MASTER_SITES=	ftp://bourbon.cs.umd.edu/pub/tgif/ \
 MAINTAINER=	one@netlab.is.tsukuba.ac.jp
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
+		pnmtopng:${PORTSDIR}/graphics/pnmtopng
 
 USE_IMAKE=	yes
 XMKMF=		LOCALBASE=${LOCALBASE} xmkmf -a
-
 MAN1=		tgif.1
-
-pre-patch:
-		@cd ${WRKSRC}; ${RM} -f Tgif.tmpl; \
-		${CP} Tgif.tmpl-freebsd Tgif.tmpl
-
-post-patch:
-		@cd ${WRKSRC}; \
-		${MV} tgif.Xdefaults tgif.Xdefaults.org; \
-		${SED} -e "s#/usr/local#${PREFIX}#" \
-			-e "s#/usr/share/lib#${PREFIX}/share/locale#" \
-			tgif.Xdefaults.org > tgif.Xdefaults
+TGIFDOC=	${PREFIX}/share/doc/tgif
+TGIFDEMO=	${PREFIX}/share/examples/tgif
+DEMO_FILES=	an-sr-flip-flop.obj launch-demo-1.obj \
+		fonts.obj launch-demo.obj keys.obj slide-demo.obj example.tex
+READMES=	Copyright HISTORY README
+
+post-extract:
+		${RM} -f ${WRKDIR}/${DISTNAME}/Tgif.tmpl
+		${CP} ${WRKDIR}/${DISTNAME}/Tgif.tmpl-freebsd \
+		      ${WRKDIR}/${DISTNAME}/Tgif.tmpl
+
+pre-install:
+		(cd ${WRKSRC} ;\
+		  ${MV} tgif.Xdefaults tgif.Xdefaults.org; \
+		  ${SED} -e "s#/usr/local#${PREFIX}#" \
+		         -e "s#/usr/share/lib#${PREFIX}/share/locale#" \
+		         tgif.Xdefaults.org > tgif.Xdefaults ;\
+		)
 
 post-install:
-		${MKDIR} ${PREFIX}/lib/X11/ja_JP.EUC/app-defaults
-		${INSTALL_DATA} ${FILESDIR}/tgif.Xdefaults.ja \
-			${PREFIX}/lib/X11/ja_JP.EUC/app-defaults/Tgif
+		${MKDIR} ${TGIFDOC}; ${MKDIR} ${TGIFDEMO}
+		(cd ${WRKSRC} ;\
+		  ${INSTALL_DATA} ${DEMO_FILES} ${TGIFDEMO} ;\
+		  ${INSTALL_DATA} ${READMES} ${TGIFDOC} ;\
+		)
+		(cd ${PREFIX}/bin; ${RM} -f tgif-nls; ${LN} -s tgif tgif-nls )
 
 .include <bsd.port.mk>
diff --git a/graphics/tgif-nls/distinfo b/graphics/tgif-nls/distinfo
index 10b24c9009f4..92a455585d15 100644
--- a/graphics/tgif-nls/distinfo
+++ b/graphics/tgif-nls/distinfo
@@ -1 +1 @@
-MD5 (tgif-4.1.16.tar.gz) = 305b77a905bb6333741a7f14dcc33aa4
+MD5 (tgif-4.1.26.tar.gz) = d0688e0e0bd01af1e8d195549fd9906b
diff --git a/graphics/tgif-nls/files/patch-aa b/graphics/tgif-nls/files/patch-aa
index ce944b954874..b233fd30dc6e 100644
--- a/graphics/tgif-nls/files/patch-aa
+++ b/graphics/tgif-nls/files/patch-aa
@@ -1,11 +1,11 @@
---- tgif.man.orig	Sat Jun 12 04:14:47 1999
-+++ tgif.man	Sat Jun 12 04:16:48 1999
+--- tgif.man.orig	Mon Sep  6 03:41:31 1999
++++ tgif.man	Sat Sep 25 22:23:22 1999
 @@ -8,7 +8,7 @@
  .\"
  .\"
  .\"
--.TH tgif n "Version 4.1 Patchlevel 16 and Above" "Tgif"
-+.TH tgif 1L "Version 4.1 Patchlevel 16 and Above" "Tgif"
+-.TH tgif n "Version 4.1 Patchlevel 26 and Above" "Tgif"
++.TH tgif 1L "Version 4.1 Patchlevel 26 and Above" "Tgif"
  .\"
  .SH NAME
  .\"
diff --git a/graphics/tgif-nls/files/patch-ab b/graphics/tgif-nls/files/patch-ab
index c56dc010db3b..6b03c823895a 100644
--- a/graphics/tgif-nls/files/patch-ab
+++ b/graphics/tgif-nls/files/patch-ab
@@ -1,34 +1,18 @@
---- Tgif.tmpl.orig	Sun May 30 05:32:54 1999
-+++ Tgif.tmpl	Sun May 30 05:33:12 1999
-@@ -41,6 +41,15 @@
- XIMPDEFINES      =
- #endif
- 
-+#define IHaveSubdirs
-+
-+SUBDIRS = po
-+
-+#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-+
-+MakeSubdirs($(SUBDIRS))
-+DependSubdirs($(SUBDIRS))
-+
- PROGRAMS	= tgif XCOMM prtgif frontend11.o testdrive
- XCOMM CDEBUGFLAGS= -g -Wall
- XCOMM INSTPGMFLAGS= -s
-@@ -48,7 +57,7 @@
+--- Tgif.tmpl.orig	Thu Jan 20 12:56:09 2000
++++ Tgif.tmpl	Thu Jan 20 12:59:33 2000
+@@ -48,7 +48,7 @@
+ XCOMM BINDIR	= /u/halfmoon/bin
  XCOMM MANPATH	= /u/halfmoon/man
  XCOMM TGIFDIR	= /u/halfmoon/lib/X11/tgif
- TGIFDIR		= $(LIBDIR)/tgif
 -LOCALEDIR	= /usr/share/locale
 +LOCALEDIR	= $(PREFIX)/share/locale
  DIRDEFINES	= -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\
                    -DLOCALEDIR=\"$(LOCALEDIR)\" \@@\
                    -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\
-@@ -58,14 +67,16 @@
-                   -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\
+@@ -59,14 +59,16 @@
                    -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\"
- MISCDEFINES	= -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT
+ MISCDEFINES	= -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT \@@\
+                   -D_USE_PS_ADOBE_STRING=\"3.0/3.0\"
 -MOREDEFINES	=
 +MOREDEFINES	= -DUSE_XT_INITIALIZE -D_ENABLE_NLS
  
@@ -38,21 +22,9 @@
  
  DEPLIBS		= $(DEPXLIB)
 -LOCAL_LIBRARIES	= $(XLIB)
--XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
-+XCOMM LOCAL_LIBRARIES	= $(XLIB)
-+LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
++LOCAL_LIBRARIES	= $(XLIB) $(XTOOLLIB) $(XLIB)
+ XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
  XCOMM SYS_LIBRARIES	= -ldl -lm
--SYS_LIBRARIES	= -lm
-+SYS_LIBRARIES	= -lm -lcompat
+ SYS_LIBRARIES	= -lm
 +EXTRA_INCLUDES	+= -I$(LOCALBASE)/include
 +EXTRA_LIBRARIES	+= -L$(LOCALBASE)/lib -lintl
-
---- po/Po.tmpl.orig	Sun Apr  4 03:27:53 1999
-+++ po/Po.tmpl	Sun May 30 05:33:12 1999
-@@ -8,5 +8,5 @@
- MKINSTALLDIRS	= install -d
- 
- DESTDIR		=
--SYSNLSDIR	= /usr/share/locale
-+SYSNLSDIR	= $(PREFIX)/share/locale
- NLSDIR		= $(DESTDIR)$(SYSNLSDIR)
diff --git a/graphics/tgif-nls/pkg-plist b/graphics/tgif-nls/pkg-plist
index 7538af46f28d..a92d8d8b1260 100644
--- a/graphics/tgif-nls/pkg-plist
+++ b/graphics/tgif-nls/pkg-plist
@@ -1,15 +1,26 @@
 bin/tgif
-lib/X11/app-defaults/Tgif
-lib/X11/ja_JP.EUC/app-defaults/Tgif
-lib/X11/tgif/eq4-2x.sym
-lib/X11/tgif/eq4-ps2epsi.sym
-lib/X11/tgif/eq4-epstool.sym
-lib/X11/tgif/eq4.sym
+bin/tgif-nls
+lib/X11/tgif/tgif.Xdefaults
 lib/X11/tgif/tgificon.eps
 lib/X11/tgif/tgificon.obj
 lib/X11/tgif/tgificon.xbm
 lib/X11/tgif/tgificon.xpm
 lib/X11/tgif/tangram.sym
+lib/X11/tgif/eq4.sym
+lib/X11/tgif/eq4-2x.sym
+lib/X11/tgif/eq4-ps2epsi.sym
+lib/X11/tgif/eq4-epstool.sym
 lib/X11/tgif/keys.obj
-share/locale/ja/LC_MESSAGES/tgif.mo
+share/doc/tgif/Copyright
+share/doc/tgif/HISTORY
+share/doc/tgif/README
+share/examples/tgif/an-sr-flip-flop.obj
+share/examples/tgif/example.tex
+share/examples/tgif/fonts.obj
+share/examples/tgif/keys.obj
+share/examples/tgif/launch-demo.obj
+share/examples/tgif/launch-demo-1.obj
+share/examples/tgif/slide-demo.obj
+@dirrm share/doc/tgif
+@dirrm share/examples/tgif
 @dirrm lib/X11/tgif