3 files changed, 14 insertions, 18 deletions

diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 153a6ecf0cde..945c6c5de0a8 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.7 1997/04/30 03:18:03 asami Exp $
+# $Id: Makefile,v 1.8 1997/04/30 16:02:58 max Exp $
 #
 
 DISTNAME=	ghostscript-4.03
@@ -20,17 +20,19 @@ MAINTAINER=	mita@jp.FreeBSD.org
 
 LIB_DEPENDS=	VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
 
-EXTRACT_ONLY=	ghostscript-4.03.tar.gz
+EXTRACT_ONLY=	ghostscript-4.03.tar.gz jpegsrc.v6a.tar.gz libpng-0.89c.tar.gz
 WRKSRC=		${WRKDIR}/gs4.03
 MAKEFILE=	unix-gcc.mak
 MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
 MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1
 
 CFLAGS+=	-DA4
-DOC_DIR=	${PREFIX}/share/ghostscript/4.03vflib/doc 
+DOC_DIR=	${PREFIX}/share/ghostscript/4.03vflib/doc
 PRINTER=	${WRKSRC}/jp-printers
 GS_SOURCES=	ghostscript-4.03.tar.gz
 GS_SOURCES+=	ghostscript-4.03gnu.tar.gz
+GS_SOURCES+=	jpegsrc.v6a.tar.gz
+GS_SOURCES+=	libpng-0.89c.tar.gz
 GS_DRIVERS=	gs4.03-vflib.tar.gz
 GS_DRIVERS+=	gdevlips4-1.2.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
@@ -43,18 +45,14 @@ GS_DRIVERS+=	gdev10v.tar.gz
 GS_FONTS_STD=	ghostscript-fonts-std-4.0.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-3.0.tar.gz
 
-pre-extract:
-	@(cd ${PORTSDIR}/graphics/jpeg ; ${MAKE} extract)
-	@(cd ${PORTSDIR}/graphics/png  ; ${MAKE} extract)
-
 pre-patch:
-	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs4.03-vflib.tar.gz ) 
+	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs4.03-vflib.tar.gz )
 	@(cd ${WRKDIR} ; \
 	  ${PATCH} -p < ${WRKSRC}/gs4.03-vflib/gs4.03-vflib.diff >/dev/null 2>&1; \
 	)
 
 post-patch:
-	@( mkdir ${PRINTER} ; \
+	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
 	  ${PATCH} -p0 < ${FILESDIR}/gdevep82.patch >/dev/null 2>&1 ; \
 	  tar xzf ${DISTDIR}/gdevlips4-1.2.0.tar.gz ; \
@@ -77,7 +75,7 @@ post-patch:
 	@${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/unix-gcc.mak
 
 pre-install:
-	@mkdir -p ${PREFIX}/share/ghostscript
+	@${MKDIR} -p ${PREFIX}/share/ghostscript
 	@tar -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
 	@tar -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
@@ -91,8 +89,4 @@ post-install:
 	  ${CP} ${PRINTER}/gdevmjc-0.7/MJ700V2C.FAQ ${DOC_DIR} ; \
 	)
 
-pre-clean:
-	@(cd ${PORTSDIR}/graphics/jpeg ; ${MAKE} clean)
-	@(cd ${PORTSDIR}/graphics/png  ; ${MAKE} clean)
-
 .include <bsd.port.mk>
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index 7015a9942544..120388f7ddb8 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -1,5 +1,7 @@
 MD5 (ghostscript-4.03.tar.gz) = 6a466ffdb3414e741da471a53a85dcab
 MD5 (ghostscript-4.03gnu.tar.gz) = 269c51c3054d9945b5acc145cb412c22
+MD5 (libpng-0.89c.tar.gz) = 4c5fb3df9c8dfc0fd70732e4ce914122
+MD5 (jpegsrc.v6a.tar.gz) = 5360e0aa47b415daa44623196f7e6160
 MD5 (gs4.03-vflib.tar.gz) = 9935e711db0a4ffaa68407fef704a3d7
 MD5 (gdevlips4-1.2.0.tar.gz) = 55d1d9d507701a3d176e352dae74b0bf
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure
index 3fc775877f44..061844b393bf 100644
--- a/japanese/vfghostscript55/scripts/configure
+++ b/japanese/vfghostscript55/scripts/configure
@@ -8,8 +8,8 @@ PRINTER_JAPAN=' epag300.dev epag600.dev mjc180.dev mjc360.dev mjc720.dev mj500c.
 
 sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
     -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
-    -e "s;JSRCDIR=jpeg-6a;JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
-    -e "s;PSRCDIR=libpng;PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
+    -e "s;JSRCDIR=jpeg-6a;JSRCDIR=${WRKDIR}/jpeg-6a;" \
+    -e "s;PSRCDIR=libpng;PSRCDIR=${WRKDIR}/libpng-0.89c;" \
     -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
     -e "s;CC=gcc;CC=cc;" \
     -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev ${PRINTER_JAPAN};" \
@@ -23,8 +23,8 @@ else
 # This can be null if these files are in the default linker search path.
 sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
     -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
-    -e "s;JSRCDIR=jpeg-6a;JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
-    -e "s;PSRCDIR=libpng;PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
+    -e "s;JSRCDIR=jpeg-6a;JSRCDIR=${WRKDIR}/jpeg-6a;" \
+    -e "s;PSRCDIR=libpng;PSRCDIR=${WRKDIR}/libpng-0.89c;" \
     -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
     -e "s;CC=gcc;CC=cc;" \
     -e "s;^DEVICE_DEVS=.*;;" \