port update, to let it build correctly.

PR:		6110

4 files changed, 57 insertions, 47 deletions

diff --git a/print/gp/Makefile b/print/gp/Makefile
index 5cf1103cf3ee..9e666b6d0686 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -3,20 +3,22 @@
 # Date created:		15 April 1997
 # Whom:			Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/02/18 06:59:36 asami Exp $
+# $Id: Makefile,v 1.4 1998/02/21 22:37:57 fenner Exp $
 #
 
 DISTNAME=	GP-2.5
-PKGNAME=	gp-2.5
+PKGNAME?=	gp-2.5
 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
 
-RUN_DEPENDS=	psbook:${PORTSDIR}/print/psutils \
-		gv:${PORTSDIR}/print/gv \
-		${WITH_DEPENDS}
+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
@@ -36,17 +38,19 @@ PORTDOCDIR=	${PREFIX}/share/doc/GP
 .if (${LANGUAGE} == "Japanese")
 DOCDIRNAME=	Doc.ja
 DOCEXT=		.euc
-WITH_DEPENDS=	wish4.2jp:${PORTSDIR}/japanese/tk42 \
-		a2ps-j:${PORTSDIR}/japanese/a2ps \
-		xdvi:${PORTSDIR}/japanese/vfxdvi \
-		nup:${PORTSDIR}/japanese/dvi2ps
+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
 .else
 DOCDIRNAME=	Doc
 DOCEXT=
-WITH_DEPENDS?=	wish4.2:${PORTSDIR}/x11/tk42 \
-		a2ps:${PORTSDIR}/print/a2ps \
-		xdvi:${PORTSDIR}/print/xdvi \
-		dvips:${PORTSDIR}/print/dvips
+WITH_LIB=	tcl76\\.1\\.:${PORTSDIR}/lang/tcl76
+WITH_RUN=	${PREFIX}/bin/wish4.2:${PORTSDIR}/x11/tk42 \
+		${PREFIX}/bin/a2ps:${PORTSDIR}/print/a2ps \
+		${X11BASE}/bin/xdvi:${PORTSDIR}/print/xdvi \
+		${PREFIX}/bin/dvips:${PORTSDIR}/print/dvips
 .endif
 
 post-install:
diff --git a/print/gp/files/patch-aa b/print/gp/files/patch-aa
index 7c8f0b5c1bf2..23de187c97ea 100644
--- a/print/gp/files/patch-aa
+++ b/print/gp/files/patch-aa
@@ -1,15 +1,16 @@
-*** Makefile~	Sun Feb  1 20:48:49 1998
---- Makefile	Mon Feb  2 16:47:20 1998
+*** Makefile.orig	Sun Feb  1 20:48:49 1998
+--- Makefile	Sun Feb 22 21:27:43 1998
 ***************
-*** 13,19 ****
+*** 13,20 ****
   BINDIR = $(PREFIX)/bin
   LIBDIR = $(PREFIX)/lib/GP
   
 ! FILTERS        = `ls filters`
-  FILTERS.SAMPLE = `ls filters.sample`
+! FILTERS.SAMPLE = `ls filters.sample`
   
   ICONS   = printer.xbm exit.xbm
---- 13,24 ----
+  
+--- 13,25 ----
   BINDIR = $(PREFIX)/bin
   LIBDIR = $(PREFIX)/lib/GP
   
@@ -19,6 +20,7 @@
 ! FILTERS	=a2ps dvips ImageMagick
 ! .endif
 ! 
-  FILTERS.SAMPLE = `ls filters.sample`
+! FILTERS.SAMPLE!=	ls filters.sample
   
   ICONS   = printer.xbm exit.xbm
+  
diff --git a/print/gp/scripts/configure b/print/gp/scripts/configure
index e96764f28b7a..9775e751ec2c 100644
--- a/print/gp/scripts/configure
+++ b/print/gp/scripts/configure
@@ -4,31 +4,3 @@ cd ${WRKSRC}
 
 ${MV} Makefile Makefile.bak
 ${SED} -e 's@^PREFIX[ 	]*=.*$@#&@' < Makefile.bak > Makefile
-
-${MV} GP GP.bak
-${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%%@' \
-	< GP.bak > GP
-${MV} GP GP.bak
-${SED} \
-	-e "s@%%PREFIX%%@${PREFIX}@g" \
-	< GP.bak > GP
-
-cd ${WRKSRC}/filters.sample
-
-if [ 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
-	done
-else
-	for f in a2ps dvips; do
-		${MV} ${f} ${f}.bak
-		${SED} -e 's@^\(NUMBER[ 	]*=\).*$@\1 1@' < ${f}.bak > ${f}
-		${RM} -f ${f}.bak
-	done
-fi
diff --git a/print/gp/scripts/post-build b/print/gp/scripts/post-build
new file mode 100644
index 000000000000..1b99cfe4a84a
--- /dev/null
+++ b/print/gp/scripts/post-build
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+cd ${WRKSRC}
+
+${MV} GP GP.bak
+${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@' \
+	< GP.bak > GP
+${MV} GP GP.bak
+${SED} \
+	-e "s@%%PREFIX%%@${PREFIX}@g" \
+	< GP.bak > GP
+
+cd ${WRKSRC}/filters
+
+if [ 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
+	done
+else
+	for f in a2ps dvips; do
+		${MV} ${f} ${f}.bak
+		${SED} -e 's@^\(NUMBER[ 	]*=\).*$@\1 1@' < ${f}.bak > ${f}
+		${RM} -f ${f}.bak
+	done
+fi