Index: head/japanese/vfghostscript5/Makefile
===================================================================
--- head/japanese/vfghostscript5/Makefile	(revision 11991)
+++ head/japanese/vfghostscript5/Makefile	(revision 11992)
@@ -1,158 +1,158 @@
 # New ports collection makefile for: Japanese Aladdin ghostscript + vector font library(FreeType)
 # Version required:	5.10
 # Date created:		26 Aug 1997
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.20 1998/05/10 23:50:31 steve Exp $
+# $Id: Makefile,v 1.21 1998/05/24 03:45:26 steve Exp $
 #
 
 DISTNAME=	ghostscript-5.10
 PKGNAME=	ja-vfghostscript-5.10
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		ftp://ftp.uu.net/graphics/png/src/ \
 		ftp://ftp.uu.net/graphics/jpeg/ \
 		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
 		${MASTER_SITE_LOCAL} \
 		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/ \
 		http://www.ldl.jaist.ac.jp/~akr/nonresearch/free-software/ghostscript/ \
 		http://www.jaist.ac.jp/~daisuke/Linux/gs/gs5/Original-sources/OLD/ \
 		http://www.rd.nacsis.ac.jp/~katayama/homepage/ghostscript/jpdf/ \
 		http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
 		http://www.bpe.es.osaka-u.ac.jp/~watanabe/ \
 		ftp://ftp.iijnet.or.jp/humbleSoft/pub/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-LIB_DEPENDS=	VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
+LIB_DEPENDS=	VFlib2\\.23\\.:${PORTSDIR}/japanese/vflib
 
 EXTRACT_ONLY=	ghostscript-5.10.tar.gz jpegsrc.v6a.tar.gz libpng-0.96.tgz
 WRKSRC=		${WRKDIR}/gs5.10
 MAKEFILE=	unix-gcc.mak
 MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
 MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 pdf2dsc.1
 
 CFLAGS+=	-DA4
 GSINST_DIR=	${PREFIX}/share/ghostscript/5.10vflib
 DOC_DIR=	${GSINST_DIR}/doc
 PRINTER=	${WRKSRC}/jp-printers
 GS_SOURCES=	ghostscript-5.10.tar.gz
 GS_SOURCES+=	jpegsrc.v6a.tar.gz
 GS_SOURCES+=	libpng-0.96.tgz
 GS_DRIVERS=	gs5.10-vflib-1.2.tar.gz
 GS_DRIVERS+=	gs5.10-jpdf-0.2.tar.gz
 GS_DRIVERS+=	gs5.10-VFlibBM-PL2.diff.gz
 GS_DRIVERS+=	gdevlips4-1.2.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
 GS_DRIVERS+=	gdevrpdl.tar.gz
 GS_DRIVERS+=	gdev10v.tar.gz
 GS_DRIVERS+=	dmprt-2.01.tar.gz
 GS_DRIVERS+=	gdevnpdl-1.4.tar.gz
 GS_DRIVERS+=	epag-3.01.tar.gz
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
 #  unless the files really change.
 GS_FONTS_STD=	ghostscript-fonts-std-5.10.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
 pre-fetch:
 .if !defined(PDFENCRYPT)
 	@${ECHO_MSG} "NOTE: You can have encrypted PDF support by adding "
 	@${ECHO_MSG} "\"PDFENCRYPT=yes\" to argument of make."
 .endif
 
 pre-patch:
 	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-vflib-1.2.tar.gz )
 	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-jpdf-0.2.tar.gz )
 	@(cd ${WRKDIR} ; \
 	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.2/gs5.10-vflib-1.2.diff \
 		>/dev/null 2>&1)
 	@(cd ${WRKDIR} ; \
 	  ${PATCH} -p < ${WRKSRC}/gs5.10-jpdf-0.2/gs5.10-jpdf-0.2.diff \
 		>/dev/null 2>&1)
 	@(cd ${WRKDIR} ;  zcat ${DISTDIR}/gs5.10-VFlibBM-PL2.diff.gz | \
 		${PATCH} -p >/dev/null 2>&1)
 
 post-patch:
 	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
 	  tar xzf ${DISTDIR}/gdevlips4-1.2.0.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdev10v.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
 	  tar -C gdevdmpr -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevnpdl ; \
 	  tar -C gdevnpdl -xzf ${DISTDIR}/gdevnpdl-1.4.tar.gz ; \
 	  tar xzf ${DISTDIR}/epag-3.01.tar.gz ; \
 	  ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \
 	  ${CP} gdevmjc-0.7/gdevmjc.c gdevmjc-0.7/mjc.dev ${WRKSRC}; \
 	  ${CP} gdevlips4-1.2.0/gdevlips4.c gdevlips4-1.2.0/gdevlips4.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/gdevdmpr.c gdevdmpr/gdevdmpr.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h   ${WRKSRC}; \
 	  ${CP} epag-3.01/gdevepag.c epag-3.01/gdevepag.mak ${WRKSRC}; \
 	  ${CP} gdevrpdl/gdevrpdl.c gdevrpdl/gdevrpdl.mak ${WRKSRC}; \
 	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevlips4.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/unix-gcc.mak
 
 post-build:
 	@(cd ${PRINTER}/epag-3.01 ;  ${MAKE})
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
 	@tar -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
 	@tar -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${INSTALL_PROGRAM} ${PRINTER}/epag-3.01/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README ${DOC_DIR}/README.gs5.10-vflib ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README.CID ${DOC_DIR}/README.CID.gs5.10-vflib ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-jpdf-0.2/README ${DOC_DIR}/README.gs5.10-jpdf ; \
 	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevlips4-1.2.0/Readme ${DOC_DIR}/gdevlips4.euc ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/README.jis ${DOC_DIR}/gdevmjc.jis ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/MJ700V2C.FAQ ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/gdevdmpr.sj ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevnpdl/gdevnpdl.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_init.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_site.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_DIR} ; \
 	  ${MKDIR} ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/FILES ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/*.txt ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/adjust.ps ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/gsepagif.sh ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/psprint ${DOC_DIR}/epag-3.01 ; \
 	)
 .if defined(PDFENCRYPT)
 	@${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
 .endif
 
 # encrypted PDF support.  can't be packaged due to export control issues.
 .if defined(PDFENCRYPT)
 MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES+=	pdf_sec.ps
 RESTRICTED=	"Crypto; export controlled, RC4 in PostScript code included"
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/japanese/vfghostscript5/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/japanese/vfghostscript5/distinfo
===================================================================
--- head/japanese/vfghostscript5/distinfo	(revision 11991)
+++ head/japanese/vfghostscript5/distinfo	(revision 11992)
@@ -1,16 +1,16 @@
 MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
 MD5 (jpegsrc.v6a.tar.gz) = 5360e0aa47b415daa44623196f7e6160
 MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
 MD5 (gs5.10-vflib-1.2.tar.gz) = 98a36048a0e1b79ed21dc03e43d8fb5e
 MD5 (gs5.10-jpdf-0.2.tar.gz) = 36f6d346014dba3cede7fbd3bdb723a8
 MD5 (gs5.10-VFlibBM-PL2.diff.gz) = c933555772177092fe3e96bf3f28dad9
 MD5 (gdevlips4-1.2.0.tar.gz) = 55d1d9d507701a3d176e352dae74b0bf
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
 MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
 MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (gdevnpdl-1.4.tar.gz) = 1b3e62370d10e76a10fdc663e54e3b28
 MD5 (epag-3.01.tar.gz) = 5c204438866ee28c82b4f4d2027bf3d0
-MD5 (ghostscript-fonts-std-5.10.tar.gz) = 1e0fe2149affd80deaaae144227049b9
-MD5 (ghostscript-fonts-other-5.10.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
+MD5 (ghostscript-fonts-std-5.10.tar.gz) = 8462a429e2672d332a510da076dca6d2
+MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
 MD5 (pdf_sec.ps) = 33b855032c90a0e0e6d5a460be82c749

Property changes on: head/japanese/vfghostscript5/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/japanese/vfghostscript5/files/patch-aa
===================================================================
--- head/japanese/vfghostscript5/files/patch-aa	(revision 11991)
+++ head/japanese/vfghostscript5/files/patch-aa	(revision 11992)
@@ -1,163 +1,163 @@
-*** unix-gcc.mak.orig	Fri Feb 13 20:37:31 1998
---- unix-gcc.mak	Fri Feb 13 20:38:22 1998
+*** unix-gcc.mak.orig	Wed Jul 15 21:55:59 1998
+--- unix-gcc.mak	Wed Jul 15 21:57:23 1998
 ***************
 *** 213,219 ****
   # XLDFLAGS can be set from the command line.
   XLDFLAGS=
   
 ! LDFLAGS=$(XLDFLAGS)
   
   # Define any extra libraries to link into the executable.
   # ISC Unix 2.2 wants -linet.
 --- 213,219 ----
   # XLDFLAGS can be set from the command line.
   XLDFLAGS=
   
 ! LDFLAGS=$(XLDFLAGS) -L/usr/local/lib
   
   # Define any extra libraries to link into the executable.
   # ISC Unix 2.2 wants -linet.
 ***************
 *** 221,227 ****
   # SVR4 may need -lnsl.
   # (Libraries required by individual drivers are handled automatically.)
   
 ! EXTRALIBS=
   
   # Define the include switch(es) for the X11 header files.
   # This can be null if handled in some other way (e.g., the files are
 --- 221,227 ----
   # SVR4 may need -lnsl.
   # (Libraries required by individual drivers are handled automatically.)
   
 ! EXTRALIBS=-lz
   
   # Define the include switch(es) for the X11 header files.
   # This can be null if handled in some other way (e.g., the files are
 ***************
 *** 3679,3686 ****
   libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
   	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
   
 ! libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
 ! 	$(SETMOD) libpng96 pngwio.$(OBJ) -include crc32
   #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 
   # This file is part of Aladdin Ghostscript.
 --- 3679,3686 ----
   libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
   	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
   
 ! libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) # crc32.dev
 ! 	$(SETMOD) libpng96 pngwio.$(OBJ) # -include crc32
   #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 
   # This file is part of Aladdin Ghostscript.
 ***************
 *** 3761,3767 ****
   zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
   	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
   
 ! zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
   zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
   	$(SETMOD) zlibe_0 $(zlibe_)
   	$(ADDMOD) zlibe_0 -include zlibc
 --- 3761,3767 ----
   zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
   	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
   
 ! zlibe_=
   zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
   	$(SETMOD) zlibe_0 $(zlibe_)
   	$(ADDMOD) zlibe_0 -include zlibc
 ***************
 *** 3808,3818 ****
   
   zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
   zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
 ! zlibd_ = $(zlibd1_) $(zlibd2_)
 ! zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibd_)
 ! 	$(SETMOD) zlibd_0 $(zlibd1_)
 ! 	$(ADDMOD) zlibd_0 -obj $(zlibd2_)
 ! 	$(ADDMOD) zlibd_0 -include zlibc
   
   infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
   	$(CP_) $(ZSRC)infblock.c .
 --- 3808,3818 ----
   
   zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
   zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
 ! zlibd_=
 ! zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev
 ! 	$(SETMOD) zlibd_0
 ! 	$(ADDMOD) zlibd_0
 ! 	$(ADDMOD) zlibd_0
   
   infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
   	$(CP_) $(ZSRC)infblock.c .
 ***************
 *** 4799,4807 ****
   lbp8.dev: $(lbp8_) page.dev
   	$(SETPDEV) lbp8 $(lbp8_)
   
 - lips3.dev: $(lbp8_) page.dev
 - 	$(SETPDEV) lips3 $(lbp8_)
 - 
   gdevlbp8.$(OBJ): gdevlbp8.c $(PDEVH)
   
   ### ----------- The DEC LN03/LA50/LA70/LA75 printer devices ------------ ###
 --- 4799,4804 ----
 ***************
 *** 5458,5468 ****
   
   # ---------------- Kanji Font Utility ---------------- #
   
 ! kanji_=kfutil.$(OBJ)
   kanji.dev: $(kanji_)
   	$(SETMOD) kanji $(kanji_)
   
   kfutil.$(OBJ): kfutil.c $(OP) $(gsmatrix_h)
   
   # ---------------- Kanji Font(VFlib) ---------------- #
   
 --- 5455,5468 ----
   
   # ---------------- Kanji Font Utility ---------------- #
   
 ! kanji_=kfutil.$(OBJ) zkfimpath.$(OBJ)
   kanji.dev: $(kanji_)
   	$(SETMOD) kanji $(kanji_)
 + 	$(ADDMOD) kanji -oper zkfimagepath
   
   kfutil.$(OBJ): kfutil.c $(OP) $(gsmatrix_h)
 + zkfimpath.$(OBJ): zkfimpath.c $(OP) $(gsmatrix_h) $(gspath_h) \
 + 					$(igstate_h) $(store_h)
   
   # ---------------- Kanji Font(VFlib) ---------------- #
   
 ***************
 *** 5470,5479 ****
   kfvflib.dev: $(kfvflib_) kanji.dev
   	$(SETMOD) kfvflib $(kfvflib_)
   	$(ADDMOD) kfvflib -oper zkfVFlib
 ! 	$(ADDMOD) kfvflib -ps kfvflib
-  	$(ADDMOD) kfvflib -lib VFlib
+! 	$(ADDMOD) kfvflib -lib VFlib
   
   zkfvflib.$(OBJ): zkfvflib.c 
   
   #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 
 --- 5470,5482 ----
   kfvflib.dev: $(kfvflib_) kanji.dev
   	$(SETMOD) kfvflib $(kfvflib_)
   	$(ADDMOD) kfvflib -oper zkfVFlib
 ! 	$(ADDMOD) kfvflib -ps kfvflib kfvfbm
-  	$(ADDMOD) kfvflib -lib VFlib
-+ ## VFlib without freetype
-+ #	$(ADDMOD) kfvflib -lib ttf    
+! 	$(ADDMOD) kfvflib -lib VFlib2
+! ## VFlib without freetype
+! 	$(ADDMOD) kfvflib -lib ttf    
   
   zkfvflib.$(OBJ): zkfvflib.c 
 + 	${CC} ${CFLAGS} -I${PREFIX}/include/ -c zkfvflib.c
   
   #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 

Property changes on: head/japanese/vfghostscript5/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/japanese/vfghostscript55/Makefile
===================================================================
--- head/japanese/vfghostscript55/Makefile	(revision 11991)
+++ head/japanese/vfghostscript55/Makefile	(revision 11992)
@@ -1,158 +1,158 @@
 # New ports collection makefile for: Japanese Aladdin ghostscript + vector font library(FreeType)
 # Version required:	5.10
 # Date created:		26 Aug 1997
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.20 1998/05/10 23:50:31 steve Exp $
+# $Id: Makefile,v 1.21 1998/05/24 03:45:26 steve Exp $
 #
 
 DISTNAME=	ghostscript-5.10
 PKGNAME=	ja-vfghostscript-5.10
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		ftp://ftp.uu.net/graphics/png/src/ \
 		ftp://ftp.uu.net/graphics/jpeg/ \
 		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
 		${MASTER_SITE_LOCAL} \
 		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/ \
 		http://www.ldl.jaist.ac.jp/~akr/nonresearch/free-software/ghostscript/ \
 		http://www.jaist.ac.jp/~daisuke/Linux/gs/gs5/Original-sources/OLD/ \
 		http://www.rd.nacsis.ac.jp/~katayama/homepage/ghostscript/jpdf/ \
 		http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
 		http://www.bpe.es.osaka-u.ac.jp/~watanabe/ \
 		ftp://ftp.iijnet.or.jp/humbleSoft/pub/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-LIB_DEPENDS=	VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
+LIB_DEPENDS=	VFlib2\\.23\\.:${PORTSDIR}/japanese/vflib
 
 EXTRACT_ONLY=	ghostscript-5.10.tar.gz jpegsrc.v6a.tar.gz libpng-0.96.tgz
 WRKSRC=		${WRKDIR}/gs5.10
 MAKEFILE=	unix-gcc.mak
 MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
 MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 pdf2dsc.1
 
 CFLAGS+=	-DA4
 GSINST_DIR=	${PREFIX}/share/ghostscript/5.10vflib
 DOC_DIR=	${GSINST_DIR}/doc
 PRINTER=	${WRKSRC}/jp-printers
 GS_SOURCES=	ghostscript-5.10.tar.gz
 GS_SOURCES+=	jpegsrc.v6a.tar.gz
 GS_SOURCES+=	libpng-0.96.tgz
 GS_DRIVERS=	gs5.10-vflib-1.2.tar.gz
 GS_DRIVERS+=	gs5.10-jpdf-0.2.tar.gz
 GS_DRIVERS+=	gs5.10-VFlibBM-PL2.diff.gz
 GS_DRIVERS+=	gdevlips4-1.2.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
 GS_DRIVERS+=	gdevrpdl.tar.gz
 GS_DRIVERS+=	gdev10v.tar.gz
 GS_DRIVERS+=	dmprt-2.01.tar.gz
 GS_DRIVERS+=	gdevnpdl-1.4.tar.gz
 GS_DRIVERS+=	epag-3.01.tar.gz
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
 #  unless the files really change.
 GS_FONTS_STD=	ghostscript-fonts-std-5.10.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
 pre-fetch:
 .if !defined(PDFENCRYPT)
 	@${ECHO_MSG} "NOTE: You can have encrypted PDF support by adding "
 	@${ECHO_MSG} "\"PDFENCRYPT=yes\" to argument of make."
 .endif
 
 pre-patch:
 	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-vflib-1.2.tar.gz )
 	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-jpdf-0.2.tar.gz )
 	@(cd ${WRKDIR} ; \
 	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.2/gs5.10-vflib-1.2.diff \
 		>/dev/null 2>&1)
 	@(cd ${WRKDIR} ; \
 	  ${PATCH} -p < ${WRKSRC}/gs5.10-jpdf-0.2/gs5.10-jpdf-0.2.diff \
 		>/dev/null 2>&1)
 	@(cd ${WRKDIR} ;  zcat ${DISTDIR}/gs5.10-VFlibBM-PL2.diff.gz | \
 		${PATCH} -p >/dev/null 2>&1)
 
 post-patch:
 	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
 	  tar xzf ${DISTDIR}/gdevlips4-1.2.0.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdev10v.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
 	  tar -C gdevdmpr -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevnpdl ; \
 	  tar -C gdevnpdl -xzf ${DISTDIR}/gdevnpdl-1.4.tar.gz ; \
 	  tar xzf ${DISTDIR}/epag-3.01.tar.gz ; \
 	  ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \
 	  ${CP} gdevmjc-0.7/gdevmjc.c gdevmjc-0.7/mjc.dev ${WRKSRC}; \
 	  ${CP} gdevlips4-1.2.0/gdevlips4.c gdevlips4-1.2.0/gdevlips4.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/gdevdmpr.c gdevdmpr/gdevdmpr.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h   ${WRKSRC}; \
 	  ${CP} epag-3.01/gdevepag.c epag-3.01/gdevepag.mak ${WRKSRC}; \
 	  ${CP} gdevrpdl/gdevrpdl.c gdevrpdl/gdevrpdl.mak ${WRKSRC}; \
 	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevlips4.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/unix-gcc.mak
 
 post-build:
 	@(cd ${PRINTER}/epag-3.01 ;  ${MAKE})
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
 	@tar -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
 	@tar -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${INSTALL_PROGRAM} ${PRINTER}/epag-3.01/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README ${DOC_DIR}/README.gs5.10-vflib ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README.CID ${DOC_DIR}/README.CID.gs5.10-vflib ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-jpdf-0.2/README ${DOC_DIR}/README.gs5.10-jpdf ; \
 	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevlips4-1.2.0/Readme ${DOC_DIR}/gdevlips4.euc ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/README.jis ${DOC_DIR}/gdevmjc.jis ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/MJ700V2C.FAQ ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/gdevdmpr.sj ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevnpdl/gdevnpdl.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_init.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_site.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_DIR} ; \
 	  ${MKDIR} ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/FILES ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/*.txt ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/adjust.ps ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/gsepagif.sh ${DOC_DIR}/epag-3.01 ; \
 	  ${CP} ${PRINTER}/epag-3.01/psprint ${DOC_DIR}/epag-3.01 ; \
 	)
 .if defined(PDFENCRYPT)
 	@${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
 .endif
 
 # encrypted PDF support.  can't be packaged due to export control issues.
 .if defined(PDFENCRYPT)
 MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES+=	pdf_sec.ps
 RESTRICTED=	"Crypto; export controlled, RC4 in PostScript code included"
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/japanese/vfghostscript55/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/japanese/vfghostscript55/distinfo
===================================================================
--- head/japanese/vfghostscript55/distinfo	(revision 11991)
+++ head/japanese/vfghostscript55/distinfo	(revision 11992)
@@ -1,16 +1,16 @@
 MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
 MD5 (jpegsrc.v6a.tar.gz) = 5360e0aa47b415daa44623196f7e6160
 MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
 MD5 (gs5.10-vflib-1.2.tar.gz) = 98a36048a0e1b79ed21dc03e43d8fb5e
 MD5 (gs5.10-jpdf-0.2.tar.gz) = 36f6d346014dba3cede7fbd3bdb723a8
 MD5 (gs5.10-VFlibBM-PL2.diff.gz) = c933555772177092fe3e96bf3f28dad9
 MD5 (gdevlips4-1.2.0.tar.gz) = 55d1d9d507701a3d176e352dae74b0bf
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
 MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
 MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (gdevnpdl-1.4.tar.gz) = 1b3e62370d10e76a10fdc663e54e3b28
 MD5 (epag-3.01.tar.gz) = 5c204438866ee28c82b4f4d2027bf3d0
-MD5 (ghostscript-fonts-std-5.10.tar.gz) = 1e0fe2149affd80deaaae144227049b9
-MD5 (ghostscript-fonts-other-5.10.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
+MD5 (ghostscript-fonts-std-5.10.tar.gz) = 8462a429e2672d332a510da076dca6d2
+MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
 MD5 (pdf_sec.ps) = 33b855032c90a0e0e6d5a460be82c749

Property changes on: head/japanese/vfghostscript55/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/japanese/vfghostscript55/files/patch-aa
===================================================================
--- head/japanese/vfghostscript55/files/patch-aa	(revision 11991)
+++ head/japanese/vfghostscript55/files/patch-aa	(revision 11992)
@@ -1,163 +1,163 @@
-*** unix-gcc.mak.orig	Fri Feb 13 20:37:31 1998
---- unix-gcc.mak	Fri Feb 13 20:38:22 1998
+*** unix-gcc.mak.orig	Wed Jul 15 21:55:59 1998
+--- unix-gcc.mak	Wed Jul 15 21:57:23 1998
 ***************
 *** 213,219 ****
   # XLDFLAGS can be set from the command line.
   XLDFLAGS=
   
 ! LDFLAGS=$(XLDFLAGS)
   
   # Define any extra libraries to link into the executable.
   # ISC Unix 2.2 wants -linet.
 --- 213,219 ----
   # XLDFLAGS can be set from the command line.
   XLDFLAGS=
   
 ! LDFLAGS=$(XLDFLAGS) -L/usr/local/lib
   
   # Define any extra libraries to link into the executable.
   # ISC Unix 2.2 wants -linet.
 ***************
 *** 221,227 ****
   # SVR4 may need -lnsl.
   # (Libraries required by individual drivers are handled automatically.)
   
 ! EXTRALIBS=
   
   # Define the include switch(es) for the X11 header files.
   # This can be null if handled in some other way (e.g., the files are
 --- 221,227 ----
   # SVR4 may need -lnsl.
   # (Libraries required by individual drivers are handled automatically.)
   
 ! EXTRALIBS=-lz
   
   # Define the include switch(es) for the X11 header files.
   # This can be null if handled in some other way (e.g., the files are
 ***************
 *** 3679,3686 ****
   libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
   	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
   
 ! libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
 ! 	$(SETMOD) libpng96 pngwio.$(OBJ) -include crc32
   #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 
   # This file is part of Aladdin Ghostscript.
 --- 3679,3686 ----
   libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
   	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
   
 ! libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) # crc32.dev
 ! 	$(SETMOD) libpng96 pngwio.$(OBJ) # -include crc32
   #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 
   # This file is part of Aladdin Ghostscript.
 ***************
 *** 3761,3767 ****
   zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
   	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
   
 ! zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
   zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
   	$(SETMOD) zlibe_0 $(zlibe_)
   	$(ADDMOD) zlibe_0 -include zlibc
 --- 3761,3767 ----
   zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
   	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
   
 ! zlibe_=
   zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
   	$(SETMOD) zlibe_0 $(zlibe_)
   	$(ADDMOD) zlibe_0 -include zlibc
 ***************
 *** 3808,3818 ****
   
   zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
   zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
 ! zlibd_ = $(zlibd1_) $(zlibd2_)
 ! zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibd_)
 ! 	$(SETMOD) zlibd_0 $(zlibd1_)
 ! 	$(ADDMOD) zlibd_0 -obj $(zlibd2_)
 ! 	$(ADDMOD) zlibd_0 -include zlibc
   
   infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
   	$(CP_) $(ZSRC)infblock.c .
 --- 3808,3818 ----
   
   zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
   zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
 ! zlibd_=
 ! zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev
 ! 	$(SETMOD) zlibd_0
 ! 	$(ADDMOD) zlibd_0
 ! 	$(ADDMOD) zlibd_0
   
   infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
   	$(CP_) $(ZSRC)infblock.c .
 ***************
 *** 4799,4807 ****
   lbp8.dev: $(lbp8_) page.dev
   	$(SETPDEV) lbp8 $(lbp8_)
   
 - lips3.dev: $(lbp8_) page.dev
 - 	$(SETPDEV) lips3 $(lbp8_)
 - 
   gdevlbp8.$(OBJ): gdevlbp8.c $(PDEVH)
   
   ### ----------- The DEC LN03/LA50/LA70/LA75 printer devices ------------ ###
 --- 4799,4804 ----
 ***************
 *** 5458,5468 ****
   
   # ---------------- Kanji Font Utility ---------------- #
   
 ! kanji_=kfutil.$(OBJ)
   kanji.dev: $(kanji_)
   	$(SETMOD) kanji $(kanji_)
   
   kfutil.$(OBJ): kfutil.c $(OP) $(gsmatrix_h)
   
   # ---------------- Kanji Font(VFlib) ---------------- #
   
 --- 5455,5468 ----
   
   # ---------------- Kanji Font Utility ---------------- #
   
 ! kanji_=kfutil.$(OBJ) zkfimpath.$(OBJ)
   kanji.dev: $(kanji_)
   	$(SETMOD) kanji $(kanji_)
 + 	$(ADDMOD) kanji -oper zkfimagepath
   
   kfutil.$(OBJ): kfutil.c $(OP) $(gsmatrix_h)
 + zkfimpath.$(OBJ): zkfimpath.c $(OP) $(gsmatrix_h) $(gspath_h) \
 + 					$(igstate_h) $(store_h)
   
   # ---------------- Kanji Font(VFlib) ---------------- #
   
 ***************
 *** 5470,5479 ****
   kfvflib.dev: $(kfvflib_) kanji.dev
   	$(SETMOD) kfvflib $(kfvflib_)
   	$(ADDMOD) kfvflib -oper zkfVFlib
 ! 	$(ADDMOD) kfvflib -ps kfvflib
-  	$(ADDMOD) kfvflib -lib VFlib
+! 	$(ADDMOD) kfvflib -lib VFlib
   
   zkfvflib.$(OBJ): zkfvflib.c 
   
   #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 
 --- 5470,5482 ----
   kfvflib.dev: $(kfvflib_) kanji.dev
   	$(SETMOD) kfvflib $(kfvflib_)
   	$(ADDMOD) kfvflib -oper zkfVFlib
 ! 	$(ADDMOD) kfvflib -ps kfvflib kfvfbm
-  	$(ADDMOD) kfvflib -lib VFlib
-+ ## VFlib without freetype
-+ #	$(ADDMOD) kfvflib -lib ttf    
+! 	$(ADDMOD) kfvflib -lib VFlib2
+! ## VFlib without freetype
+! 	$(ADDMOD) kfvflib -lib ttf    
   
   zkfvflib.$(OBJ): zkfvflib.c 
 + 	${CC} ${CFLAGS} -I${PREFIX}/include/ -c zkfvflib.c
   
   #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
   # 

Property changes on: head/japanese/vfghostscript55/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property