Upgrade to version 2.5.

PR:		5744
Submitted by:	maintainer

3 files changed, 63 insertions, 66 deletions

diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile
index 5746cf20d9e9..6d48381779d0 100644
--- a/japanese/gp/Makefile
+++ b/japanese/gp/Makefile
@@ -1,49 +1,14 @@
-# New ports collection makefile for: GP-jp
-# Version required:	2.01jp
+# New ports collection makefile for: GP + Japanese treatment
+# Version required:	2.5
 # Date created:		15 April 1997
 # Whom:			Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.4 1997/09/14 21:34:38 max Exp $
+# $Id: Makefile,v 1.5 1997/11/10 12:05:12 asami Exp $
 #
 
-DISTNAME=	GP-2.01jp
-PKGNAME=	ja-gp-2.01
-CATEGORIES=	japanese print
-MASTER_SITES=	http://www.kamome.or.jp/hueda/GP/ \
-		ftp://green.arailab.dnj.ynu.ac.jp/pub/AraiLab/GP/
+PKGNAME=	ja-gp-2.5
+CATEGORIES=	print japanese
 
-MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
+LANGUAGE=	Japanese
 
-RUN_DEPENDS=	wish4.2jp:${PORTSDIR}/japanese/tk42 \
-		nup:${PORTSDIR}/japanese/dvi2ps \
-		a2ps-j:${PORTSDIR}/japanese/a2ps \
-		ghostview:${PORTSDIR}/print/ghostview
-
-NO_BUILD=	yes
-
-DOCDIR=		${PREFIX}/share/doc/GP-jp
-
-pre-patch:
-	@${MKDIR} ${PATCHDIR}
-	@${SETENV} FILESDIR=${FILESDIR} PATCHDIR=${PATCHDIR} \
-		PREFIX=${PREFIX} SED=${SED} X11BASE=${X11BASE} \
-		${SH} ${FILESDIR}/pr-setup.sh
-
-do-install:
-	@${MKDIR} ${PREFIX}/etc/GP-jp
-	@${INSTALL_SCRIPT} ${WRKSRC}/GP ${PREFIX}/bin/GP-j
-	@${INSTALL_DATA} ${FILESDIR}/printer ${FILESDIR}/filetype  \
-		${PREFIX}/etc/GP-jp
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Doc/README ${WRKSRC}/Doc/Variables \
-		 ${DOCDIR}
-.endif
-
-pre-clean:
-	@${RM} -f ${FILESDIR}/filetype ${FILESDIR}/printer ${PATCHDIR}/patch-aa
-	-@${RMDIR} ${PATCHDIR}
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../print/gp/Makefile"
diff --git a/japanese/gp/pkg-descr b/japanese/gp/pkg-descr
index 9fcd710e0658..8c13ae816aee 100644
--- a/japanese/gp/pkg-descr
+++ b/japanese/gp/pkg-descr
@@ -1,17 +1,18 @@
-GP (GUI Printer) is a printing tool on X-Window with Tcl/Tk
-interactively without any attention to the filetypes or the
-printernames in the printcap. 
-
-  Using a PostScript printer on GP, you have to name the printer "ps" 
-in the printcap.
-
-To change the printer information or the associated printer with
-filetypes, edit the following two files:
-
-	/usr/local/etc/GP/printer
-	/usr/local/etc/GP/filetype
-
-  For more information, see the files in the "/usr/local/share/doc/GP" 
-directory.
-
-  Written by UEDA Hiroyuki (hueda@kamome.or.jp), Mitsubishi Corp.
+GP (GUI Printer) is a printing tool on X-Window with Tcl/Tk  
+interactively without any attention to the filetypes or the  
+printernames in the printcap.                                
+                                                             
+  Using a PostScript printer on GP, you have to name the     
+printer "ps" in the printcap.                                
+                                                             
+To change the printer information or the associated printer  
+with filetypes, edit the following two files:                
+                                                             
+        /usr/local/lib/GP/printer                            
+        /usr/local/lib/GP/filetype                           
+                                                             
+  For more information, see the files in the                 
+"/usr/local/share/doc/GP"  directory.                        
+                                                             
+  Written by UEDA Hiroyuki (hueda@kamome.or.jp),             
+                                 KAMOME Internet, JAPAN      
diff --git a/japanese/gp/pkg-plist b/japanese/gp/pkg-plist
index 844503636b8d..4965ff9ddc0c 100644
--- a/japanese/gp/pkg-plist
+++ b/japanese/gp/pkg-plist
@@ -1,7 +1,38 @@
-bin/GP-j
-etc/GP-jp/printer
-etc/GP-jp/filetype
-share/doc/GP-jp/README
-share/doc/GP-jp/Variables
-@dirrm etc/GP-jp
-@dirrm share/doc/GP-jp
+bin/GP
+lib/GP/filters/ImageMagick
+lib/GP/filters/a2ps-j
+lib/GP/filters/dvi2ps-j
+lib/GP/icons/printer.xbm
+lib/GP/icons/exit.xbm
+lib/GP/filetype
+lib/GP/printer
+share/doc/GP/README.euc
+share/doc/GP/COPYING.euc
+share/doc/GP/Changes.euc
+share/doc/GP/Config.euc
+share/doc/GP/Filters_conf.euc
+share/doc/GP/History.euc
+share/doc/GP/Install.euc
+share/doc/GP/Manual/GP.gif
+share/doc/GP/Manual/index.html
+share/doc/GP/Manual/README.euc
+share/doc/GP/Manual/Japanese/bug_info-j.html
+share/doc/GP/Manual/Japanese/future-j.html
+share/doc/GP/Manual/Japanese/intro-j.html
+share/doc/GP/Manual/Japanese/option-j.html
+share/doc/GP/Manual/Japanese/print-j.html
+share/doc/GP/Manual/Japanese/queue-j.html
+share/doc/GP/Manual/Japanese/queue_remove-j.html
+share/doc/GP/Manual/Japanese/start-j.html
+share/doc/GP/Manual/Japanese/image/Remove.gif
+share/doc/GP/Manual/Japanese/image/Queue.gif
+share/doc/GP/Manual/Japanese/image/Print.gif
+share/doc/GP/Manual/Japanese/image/Option.gif
+share/doc/GP/Manual/Japanese/image/GPicon.gif
+@dirrm lib/GP/filters
+@dirrm lib/GP/icons
+@dirrm lib/GP
+@dirrm share/doc/GP/Manual/Japanese/image
+@dirrm share/doc/GP/Manual/Japanese
+@dirrm share/doc/GP/Manual
+@dirrm share/doc/GP