1 files changed, 35 insertions, 36 deletions

diff --git a/print/gp/Makefile b/print/gp/Makefile
index 89c36dc49ab3..934a55313bf0 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