Update to 2.5p2.

PR:		7690
Submitted by:	maintainer

5 files changed, 129 insertions, 91 deletions

diff --git a/print/gp/Makefile b/print/gp/Makefile
index 89c36dc49ab..934a55313bf 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -1,68 +1,67 @@
 # New ports collection makefile for: GP
-# Version required:	2.5
+# Version required:	2.5p1
 # Date created:		15 April 1997
 # Whom:			Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.6 1998/06/04 18:28:10 itojun Exp $
+# $Id: Makefile,v 1.7 1998/08/07 23:56:46 asami Exp $
 #
 
-DISTNAME=	GP-2.5
-PKGNAME?=	gp-2.5
-CATEGORIES+=	print tk42
+DISTNAME=	GP-2.5p2
+PKGNAME?=	gp-2.5p2
+CATEGORIES=	print tk42
 MASTER_SITES=	http://www.kamome.or.jp/hueda/GP/ \
 		ftp://www.neosoft.com/pub/tcl/sorted/print/GP-2.5/
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-LIB_DEPENDS=	${WITH_LIB}
-RUN_DEPENDS=	${PREFIX}/bin/psbook:${PORTSDIR}/print/psutils \
-		${X11BASE}/bin/gv:${PORTSDIR}/print/gv \
-		${PREFIX}/bin/convert:${PORTSDIR}/graphics/ImageMagick \
-		${WITH_RUN}
-
 PATCHDIR=	${.CURDIR}/../../print/gp/patches
 FILESDIR=	${.CURDIR}/../../print/gp/files
 SCRIPTDIR=	${.CURDIR}/../../print/gp/scripts
 
+RUN_DEPENDS=	${PREFIX}/bin/psbook:${PORTSDIR}/print/psutils \
+		${X11BASE}/bin/gv:${PORTSDIR}/print/gv \
+		${PREFIX}/bin/convert:${PORTSDIR}/graphics/ImageMagick
+
 LANGUAGE?=	English
 
-.if (${LANGUAGE} == "Japanese")
-ALL_TARGET=	ja filters
-.else
+.if (${LANGUAGE} == "English")
 ALL_TARGET=	filters
-.endif
-MAKE_ENV=	LANGUAGE=${LANGUAGE}
-SCRIPTS_ENV=	MV=${MV} RM=${RM} SED=${SED} LANGUAGE=${LANGUAGE}
-
-PORTDOCDIR=	${PREFIX}/share/doc/GP
-.if (${LANGUAGE} == "Japanese")
+LIB_DEPENDS=	tcl76\\.1\\.:${PORTSDIR}/lang/tcl76
+RUN_DEPENDS+=	${PREFIX}/bin/wish4.2:${PORTSDIR}/x11-toolkits/tk42
+LANGEXT=	en
+DOCDIRNAME=	Doc
+DOCEXT=
+.elif (${LANGUAGE} == "Japanese")
+ALL_TARGET=	ja filters
+LIB_DEPENDS=	tcl76jp\\.1\\.:${PORTSDIR}/japanese/tcl76
+RUN_DEPENDS+=	${PREFIX}/bin/wish4.2jp:${PORTSDIR}/japanese/tk42
+LANGEXT=	ja
 DOCDIRNAME=	Doc.ja
 DOCEXT=		.euc
-WITH_LIB=	tcl76jp\\.1\\.:${PORTSDIR}/japanese/tcl76
-WITH_RUN=	${PREFIX}/bin/wish4.2jp:${PORTSDIR}/japanese/tk42 \
-		${PREFIX}/bin/a2ps-j:${PORTSDIR}/japanese/a2ps \
-		${X11BASE}/bin/xdvi:${PORTSDIR}/japanese/vfxdvi \
-		${PREFIX}/bin/dvi2ps:${PORTSDIR}/japanese/dvi2ps
+.endif
+MAKE_ENV=	LANGUAGE=${LANGUAGE} LANGEXT=${LANGEXT}
+SCRIPTS_ENV=	MV=${MV} RM=${RM} SED=${SED} LANGUAGE=${LANGUAGE} LANGEXT=${LANGEXT}
+
+.if (${LANGEXT} == "en")
+PORTDOCDIR=	${PREFIX}/share/doc/GP/
 .else
-DOCDIRNAME=	Doc
-DOCEXT=
-WITH_LIB=	tcl76\\.1\\.:${PORTSDIR}/lang/tcl76
-WITH_RUN=	${PREFIX}/bin/wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
-		${PREFIX}/bin/a2ps:${PORTSDIR}/print/a2ps \
-		${X11BASE}/bin/xdvi:${PORTSDIR}/print/xdvi \
-		${PREFIX}/bin/dvips:${PORTSDIR}/print/dvips
+PORTDOCDIR=	${PREFIX}/share/doc/GP/${LANGEXT}/
 .endif
 
 post-install:
+	if [ -h ${PREFIX}/bin/GP ]; then \
+		${MV} ${PREFIX}/bin/GP ${PREFIX}/bin/GP.previous; \
+	fi
+	${LN} -sf GP${LANGEXT} ${PREFIX}/bin/GP
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PORTDOCDIR}/Manual/${LANGUAGE}/image
+	@${MKDIR} ${PORTDOCDIR}Manual/image
 	@(cd ${WRKSRC}; \
 	${INSTALL_DATA} ${DOCDIRNAME}/*${DOCEXT} ${PORTDOCDIR}; \
 	)
 	@(cd ${WRKSRC}/Manual; \
-	${INSTALL_DATA} GP.gif README${DOCEXT} index.html ${PORTDOCDIR}/Manual; \
-	${INSTALL_DATA} ${LANGUAGE}/*.html  ${PORTDOCDIR}/Manual/${LANGUAGE}; \
-	${INSTALL_DATA} ${LANGUAGE}/image/*.gif  ${PORTDOCDIR}/Manual/${LANGUAGE}/image; \
+	${INSTALL_DATA} GP.gif README${DOCEXT} index.html ${PORTDOCDIR}Manual; \
+	${INSTALL_DATA} ${LANGUAGE}/*.html  ${PORTDOCDIR}Manual; \
+	${INSTALL_DATA} ${LANGUAGE}/image/*.gif  ${PORTDOCDIR}Manual/image; \
 	)
 .endif
 
diff --git a/print/gp/distinfo b/print/gp/distinfo
index 50cb000a91a..c4959b3812f 100644
--- a/print/gp/distinfo
+++ b/print/gp/distinfo
@@ -1 +1 @@
-MD5 (GP-2.5.tar.gz) = 8dad10aed6e8b6c7ea0563dbaeeb42c9
+MD5 (GP-2.5p2.tar.gz) = 81804422fd678fb01e18e4586ca901a2
diff --git a/print/gp/files/patch-aa b/print/gp/files/patch-aa
index 23de187c97e..54eabf46e7a 100644
--- a/print/gp/files/patch-aa
+++ b/print/gp/files/patch-aa
@@ -1,26 +1,57 @@
-*** Makefile.orig	Sun Feb  1 20:48:49 1998
---- Makefile	Sun Feb 22 21:27:43 1998
-***************
-*** 13,20 ****
-  BINDIR = $(PREFIX)/bin
-  LIBDIR = $(PREFIX)/lib/GP
-  
-! FILTERS        = `ls filters`
-! FILTERS.SAMPLE = `ls filters.sample`
-  
-  ICONS   = printer.xbm exit.xbm
-  
---- 13,25 ----
-  BINDIR = $(PREFIX)/bin
-  LIBDIR = $(PREFIX)/lib/GP
-  
-! .if (${LANGUAGE} == "Japanese")
-! FILTERS	=a2ps-j dvi2ps-j ImageMagick
-! .else
-! FILTERS	=a2ps dvips ImageMagick
-! .endif
-! 
-! FILTERS.SAMPLE!=	ls filters.sample
-  
-  ICONS   = printer.xbm exit.xbm
-  
+--- Makefile.orig	Tue May  5 11:57:38 1998
++++ Makefile	Wed Aug 19 22:59:49 1998
+@@ -8,12 +8,18 @@
+ MKDIR   = /bin/mkdir
+ 
+ 
+-PREFIX = /usr/local/
++#PREFIX = /usr/local/
+ BINDIR = $(PREFIX)/bin
+-LIBDIR = $(PREFIX)/lib/GP
++LIBDIR = $(PREFIX)/lib/GP/${LANGEXT}/
+ 
+-FILTERS        = `ls filters`
+-FILTERS.SAMPLE = `ls filters.sample`
++.if (${LANGUAGE} == "English")
++LIBDIR = $(PREFIX)/lib/GP/
++FILTERS=	a2ps dvips ImageMagick
++.elif (${LANGUAGE} == "Japanese")
++FILTERS=	a2ps-j dvi2ps-j ImageMagick
++.endif
++
++FILTERS.SAMPLE!=	ls filters.sample
+ 
+ ICONS   = printer.xbm exit.xbm
+ 
+@@ -45,25 +51,25 @@
+ 
+ install.bin:
+ 	@$(MKDIR) -p $(BINDIR)
+-	@$(INSTALL) -m 755 GP  $(BINDIR)/GP
++	@$(INSTALL) -m 755 GP  $(BINDIR)/GP${LANGEXT}
+ 	@echo Installing GP in $(BINDIR)
+ 
+ install.lib:
+-	@$(MKDIR) -p $(LIBDIR)/filters
+-	@$(MKDIR) -p $(LIBDIR)/icons
++	@$(MKDIR) -p $(LIBDIR)filters
++	@$(MKDIR) -p $(LIBDIR)icons
+ 	@$(INSTALL) -m 644 lib/filetype  $(LIBDIR)
+ 	@$(INSTALL) -m 644 lib/printer   $(LIBDIR)
+ 	@for i in $(ICONS); do \
+-		$(INSTALL) -m 644 icons/$$i $(LIBDIR)/icons; \
++		$(INSTALL) -m 644 icons/$$i $(LIBDIR)icons; \
+ 	done
+ 	@echo Installing GP Configuration files in $(LIBDIR)
+ 
+ install.filters:
+ 	@echo  
+-	@echo Filter Configuration files are now installing in $(LIBDIR)/filters...
++	@echo Filter Configuration files are now installing in $(LIBDIR)filters...
+ 	@for i in $(FILTERS); do \
+ 		echo Installing $$i; \
+-		$(INSTALL) -m 644 filters/$$i $(LIBDIR)/filters; \
++		$(INSTALL) -m 644 filters/$$i $(LIBDIR)filters; \
+ 	done
+ 
+ ja:
diff --git a/print/gp/pkg-plist b/print/gp/pkg-plist
index bf9d48ea6ef..99da43e976d 100644
--- a/print/gp/pkg-plist
+++ b/print/gp/pkg-plist
@@ -1,4 +1,6 @@
-bin/GP
+bin/GPen
+@exec cd %B;if [ -h GP ]; then mv GP GP.previous; fi;ln -sf %f GP
+@unexec cd %B;ls -l GP GP.previous 2>/dev/null|awk -v f=%f '$11==f{cmd="rm -f " $9; system(cmd)}';if [ -h GP.previous ]; then mv GP.previous GP; fi
 lib/GP/filters/ImageMagick
 lib/GP/filters/a2ps
 lib/GP/filters/dvips
@@ -15,23 +17,20 @@ share/doc/GP/Install
 share/doc/GP/Manual/GP.gif
 share/doc/GP/Manual/index.html
 share/doc/GP/Manual/README
-share/doc/GP/Manual/English/bug_info.html
-share/doc/GP/Manual/English/future.html
-share/doc/GP/Manual/English/intro.html
-share/doc/GP/Manual/English/option.html
-share/doc/GP/Manual/English/print.html
-share/doc/GP/Manual/English/queue.html
-share/doc/GP/Manual/English/queue_remove.html
-share/doc/GP/Manual/English/start.html
-share/doc/GP/Manual/English/image/Remove.gif
-share/doc/GP/Manual/English/image/Queue.gif
-share/doc/GP/Manual/English/image/Print.gif
-share/doc/GP/Manual/English/image/Option.gif
-share/doc/GP/Manual/English/image/GPicon.gif
+share/doc/GP/Manual/bug_info.html
+share/doc/GP/Manual/future.html
+share/doc/GP/Manual/intro.html
+share/doc/GP/Manual/option.html
+share/doc/GP/Manual/print.html
+share/doc/GP/Manual/queue.html
+share/doc/GP/Manual/queue_remove.html
+share/doc/GP/Manual/start.html
+share/doc/GP/Manual/image/Remove.gif
+share/doc/GP/Manual/image/Queue.gif
+share/doc/GP/Manual/image/Print.gif
+share/doc/GP/Manual/image/Option.gif
+share/doc/GP/Manual/image/GPicon.gif
 @dirrm lib/GP/filters
 @dirrm lib/GP/icons
-@dirrm lib/GP
-@dirrm share/doc/GP/Manual/English/image
-@dirrm share/doc/GP/Manual/English
+@dirrm share/doc/GP/Manual/image
 @dirrm share/doc/GP/Manual
-@dirrm share/doc/GP
diff --git a/print/gp/scripts/post-build b/print/gp/scripts/post-build
index 1b99cfe4a84..b1d19955577 100644
--- a/print/gp/scripts/post-build
+++ b/print/gp/scripts/post-build
@@ -3,28 +3,37 @@
 cd ${WRKSRC}
 
 ${MV} GP GP.bak
+if [ X"${LANGUAGE}" = "XEnglish" ]; then
 ${SED} \
-	-e '/^set[ 	]*PRINTER_LIST[ 	]/s@/usr/local@%%PREFIX%%@' \
-	-e '/^set[ 	]*FILETYPE_LIST[ 	]/s@/usr/local@%%PREFIX%%@' \
-	-e '/^set[ 	]*FILTERS_DIR[ 	]/s@/usr/local@%%PREFIX%%@' \
-	-e '/^set[ 	]*ICONS_PATH[ 	]/s@/usr/local@%%PREFIX%%@' \
-	-e '/^set[ 	]*PS_PREVIEWER[ 	]/s@ghostview@gv@' \
+-e 's@^\(set[ 	]*PRINTER_LIST[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/printer"\2@' \
+-e 's@^\(set[ 	]*FILETYPE_LIST[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/filetype"\2@' \
+-e 's@^\(set[ 	]*FILTERS_DIR[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/filters"\2@' \
+-e 's@^\(set[ 	]*ICONS_PATH[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/icons"\2@' \
 	< GP.bak > GP
+elif [ X"${LANGUAGE}" = "XJapanese" ]; then
+${SED} \
+-e 's@^\(set[ 	]*PRINTER_LIST[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/printer"\2@' \
+-e 's@^\(set[ 	]*FILETYPE_LIST[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/filetype"\2@' \
+-e 's@^\(set[ 	]*FILTERS_DIR[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/filters"\2@' \
+-e 's@^\(set[ 	]*ICONS_PATH[ 	]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/icons"\2@' \
+	< GP.bak > GP
+fi
 ${MV} GP GP.bak
 ${SED} \
-	-e "s@%%PREFIX%%@${PREFIX}@g" \
+    -e "s@%%PREFIX%%@${PREFIX}@g" \
+    -e 's@^\(set[ 	]*PS_PREVIEWER[ 	]*\)"[^"]*"\(.*\)$@\1"/usr/X11R6/bin/gv"\2@' \
 	< GP.bak > GP
 
 cd ${WRKSRC}/filters
 
-if [ X"${LANGUAGE}" = "XJapanese" ]; then
-	for f in a2ps-j dvi2ps-j; do
+if [ X"${LANGUAGE}" = "XEnglish" ]; then
+	for f in a2ps dvips; do
 		${MV} ${f} ${f}.bak
 		${SED} -e 's@^\(NUMBER[ 	]*=\).*$@\1 1@' < ${f}.bak > ${f}
 		${RM} -f ${f}.bak
 	done
-else
-	for f in a2ps dvips; do
+elif [ X"${LANGUAGE}" = "XJapanese" ]; then
+	for f in a2ps-j dvi2ps-j; do
 		${MV} ${f} ${f}.bak
 		${SED} -e 's@^\(NUMBER[ 	]*=\).*$@\1 1@' < ${f}.bak > ${f}
 		${RM} -f ${f}.bak