8 files changed, 414 insertions, 162 deletions

diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 90d3f0cbc217..76e76647ea92 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for: Japanese Aladdin ghostscript + vector font library
+# 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.14 1997/11/16 19:58:36 max Exp $
+# $Id: Makefile,v 1.15 1998/01/23 00:44:37 itojun Exp $
 #
 
 DISTNAME=	ghostscript-5.10
@@ -19,6 +19,8 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
 		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/ \
 		http://ldl-www.jaist.ac.jp:8080/~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/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
@@ -40,6 +42,8 @@ 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.1.tar.gz
+GS_DRIVERS+=	gs5.10-jpdf-0.1.tar.gz
+GS_DRIVERS+=	gs5.10-VFlibBM.diff.gz
 GS_DRIVERS+=	gdevlips4-1.2.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
 GS_DRIVERS+=	gdevrpdl.tar.gz
@@ -53,11 +57,23 @@ GS_DRIVERS+=	gdevnpdl-1.4.tar.gz
 GS_FONTS_STD=	ghostscript-fonts-std-4.0.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-4.40.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.1.tar.gz )
-	@(cd ${WRKDIR} ; \
-	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.1/gs5.10-vflib-1.1.diff >/dev/null 2>&1; \
-	)
+	(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-vflib-1.1.tar.gz )
+	(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-jpdf-0.1.tar.gz )
+	(cd ${WRKDIR} ; \
+	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.1/gs5.10-vflib-1.1.diff \
+		>/dev/null 2>&1)
+	(cd ${WRKDIR} ; \
+	  ${PATCH} -p < ${WRKSRC}/gs5.10-jpdf-0.1/gs5.10-jpdf.diff \
+		>/dev/null 2>&1)
+	(cd ${WRKDIR} ;  zcat ${DISTDIR}/gs5.10-VFlibBM.diff.gz | ${PATCH} -p \
+		>/dev/null 2>&1)
 
 post-patch:
 	@( ${MKDIR} ${PRINTER} ; \
@@ -104,6 +120,7 @@ post-install:
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/README.CID ${DOC_DIR}/README.CID.gs5.10-vflib ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
+	  ${CP} ${WRKSRC}/gs5.10-jpdf-0.1/README ${DOC_DIR}/README.gs5.10-jpdf ; \
 	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevep82/gdevep82.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevlips4-1.2.0/Readme ${DOC_DIR}/gdevlips4.euc ; \
@@ -116,5 +133,15 @@ post-install:
 	  ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_DIR} ; \
 	)
+.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>
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index 990358988365..f503e9442ca3 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -2,6 +2,8 @@ MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
 MD5 (jpegsrc.v6a.tar.gz) = 5360e0aa47b415daa44623196f7e6160
 MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
 MD5 (gs5.10-vflib-1.1.tar.gz) = 856599571b5c9845595d830ad2b31b5f
+MD5 (gs5.10-jpdf-0.1.tar.gz) = 97bf3185c6c40f09504722c6e94d9a23
+MD5 (gs5.10-VFlibBM.diff.gz) = a6cacd4aa71d9514977ce50c24960092
 MD5 (gdevlips4-1.2.0.tar.gz) = 55d1d9d507701a3d176e352dae74b0bf
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
 MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
@@ -10,3 +12,4 @@ MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (gdevnpdl-1.4.tar.gz) = 1b3e62370d10e76a10fdc663e54e3b28
 MD5 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
 MD5 (ghostscript-fonts-other-4.40.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
+MD5 (pdf_sec.ps) = 33b855032c90a0e0e6d5a460be82c749
diff --git a/japanese/vfghostscript5/files/patch-aa b/japanese/vfghostscript5/files/patch-aa
index 6db25a28d959..bf7ed35c4589 100644
--- a/japanese/vfghostscript5/files/patch-aa
+++ b/japanese/vfghostscript5/files/patch-aa
@@ -1,75 +1,163 @@
---- unix-gcc.mak.orig	Tue Nov 25 18:41:44 1997
-+++ unix-gcc.mak	Tue Nov 25 18:41:46 1997
-@@ -213,7 +213,7 @@
- # XLDFLAGS can be set from the command line.
- XLDFLAGS=
- 
--LDFLAGS=$(XLDFLAGS)
-+LDFLAGS=$(XLDFLAGS) -L/usr/local/lib
- 
- # Define any extra libraries to link into the executable.
- # ISC Unix 2.2 wants -linet.
-@@ -221,7 +221,7 @@
- # SVR4 may need -lnsl.
- # (Libraries required by individual drivers are handled automatically.)
- 
--EXTRALIBS=
-+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,8 +3679,8 @@
- 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
-+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,7 +3761,7 @@
- zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
- 	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
- 
--zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
-+zlibe_=
- zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
- 	$(SETMOD) zlibe_0 $(zlibe_)
- 	$(ADDMOD) zlibe_0 -include zlibc
-@@ -3808,11 +3808,11 @@
- 
- 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
-+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,9 +4799,6 @@
- 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 ------------ ###
-@@ -5474,6 +5471,7 @@
- 	$(ADDMOD) kfvflib -lib VFlib
- 
- zkfvflib.$(OBJ): zkfvflib.c 
-+	${CC} ${CFLAGS} -I${PREFIX}/include/ -c zkfvflib.c
- 
- #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
- # 
+*** unix-gcc.mak.orig	Fri Feb 13 20:37:31 1998
+--- unix-gcc.mak	Fri Feb 13 20:38:22 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
+  
+  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    
+  
+  zkfvflib.$(OBJ): zkfvflib.c 
++ 	${CC} ${CFLAGS} -I${PREFIX}/include/ -c zkfvflib.c
+  
+  #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
+  # 
diff --git a/japanese/vfghostscript5/pkg-plist b/japanese/vfghostscript5/pkg-plist
index 97389c3bab44..a5cf05396071 100644
--- a/japanese/vfghostscript5/pkg-plist
+++ b/japanese/vfghostscript5/pkg-plist
@@ -265,6 +265,7 @@ share/ghostscript/5.10vflib/doc/kfvflib.sj
 share/ghostscript/5.10vflib/doc/djgpp.sj
 share/ghostscript/5.10vflib/doc/gs261j.jis
 share/ghostscript/5.10vflib/doc/gs261j.doc
+share/ghostscript/5.10vflib/doc/README.gs5.10-jpdf
 share/ghostscript/5.10vflib/doc/gdev10v.jis
 share/ghostscript/5.10vflib/doc/gdevep82.jis
 share/ghostscript/5.10vflib/doc/gdevlips4.euc
@@ -372,15 +373,22 @@ share/ghostscript/5.10vflib/kanji/allkanji.ps
 share/ghostscript/5.10vflib/kanji/article9.ps
 share/ghostscript/5.10vflib/kanji/fmaptype.ps
 share/ghostscript/5.10vflib/kanji/hankaku.ps
+share/ghostscript/5.10vflib/kanji/jcidcmap.ps
+share/ghostscript/5.10vflib/kanji/jcidemu.ps
+share/ghostscript/5.10vflib/kanji/jcidinit.ps
+share/ghostscript/5.10vflib/kanji/jcidjp1.ps
 share/ghostscript/5.10vflib/kanji/kbase.ps
 share/ghostscript/5.10vflib/kanji/kcomp.ps
 share/ghostscript/5.10vflib/kanji/kconfig.ps
+share/ghostscript/5.10vflib/kanji/kfcid.ps
 share/ghostscript/5.10vflib/kanji/kfvflib.ps
 share/ghostscript/5.10vflib/kanji/kinit.ps
 share/ghostscript/5.10vflib/kanji/kmapping.ps
 share/ghostscript/5.10vflib/kanji/koutline.ps
 share/ghostscript/5.10vflib/kanji/metrics2.ps
 share/ghostscript/5.10vflib/kanji/vchars.ps
+share/ghostscript/5.10vflib/kanji/kbitmap.ps
+share/ghostscript/5.10vflib/kanji/kfvfbm.ps
 share/ghostscript/5.10vflib/dmp_init.ps
 share/ghostscript/5.10vflib/dmp_site.ps
 share/ghostscript/5.10vflib/escp_24.src
diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 90d3f0cbc217..76e76647ea92 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for: Japanese Aladdin ghostscript + vector font library
+# 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.14 1997/11/16 19:58:36 max Exp $
+# $Id: Makefile,v 1.15 1998/01/23 00:44:37 itojun Exp $
 #
 
 DISTNAME=	ghostscript-5.10
@@ -19,6 +19,8 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
 		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/ \
 		http://ldl-www.jaist.ac.jp:8080/~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/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
@@ -40,6 +42,8 @@ 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.1.tar.gz
+GS_DRIVERS+=	gs5.10-jpdf-0.1.tar.gz
+GS_DRIVERS+=	gs5.10-VFlibBM.diff.gz
 GS_DRIVERS+=	gdevlips4-1.2.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
 GS_DRIVERS+=	gdevrpdl.tar.gz
@@ -53,11 +57,23 @@ GS_DRIVERS+=	gdevnpdl-1.4.tar.gz
 GS_FONTS_STD=	ghostscript-fonts-std-4.0.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-4.40.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.1.tar.gz )
-	@(cd ${WRKDIR} ; \
-	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.1/gs5.10-vflib-1.1.diff >/dev/null 2>&1; \
-	)
+	(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-vflib-1.1.tar.gz )
+	(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-jpdf-0.1.tar.gz )
+	(cd ${WRKDIR} ; \
+	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.1/gs5.10-vflib-1.1.diff \
+		>/dev/null 2>&1)
+	(cd ${WRKDIR} ; \
+	  ${PATCH} -p < ${WRKSRC}/gs5.10-jpdf-0.1/gs5.10-jpdf.diff \
+		>/dev/null 2>&1)
+	(cd ${WRKDIR} ;  zcat ${DISTDIR}/gs5.10-VFlibBM.diff.gz | ${PATCH} -p \
+		>/dev/null 2>&1)
 
 post-patch:
 	@( ${MKDIR} ${PRINTER} ; \
@@ -104,6 +120,7 @@ post-install:
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/README.CID ${DOC_DIR}/README.CID.gs5.10-vflib ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
+	  ${CP} ${WRKSRC}/gs5.10-jpdf-0.1/README ${DOC_DIR}/README.gs5.10-jpdf ; \
 	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevep82/gdevep82.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevlips4-1.2.0/Readme ${DOC_DIR}/gdevlips4.euc ; \
@@ -116,5 +133,15 @@ post-install:
 	  ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_DIR} ; \
 	)
+.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>
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index 990358988365..f503e9442ca3 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -2,6 +2,8 @@ MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
 MD5 (jpegsrc.v6a.tar.gz) = 5360e0aa47b415daa44623196f7e6160
 MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
 MD5 (gs5.10-vflib-1.1.tar.gz) = 856599571b5c9845595d830ad2b31b5f
+MD5 (gs5.10-jpdf-0.1.tar.gz) = 97bf3185c6c40f09504722c6e94d9a23
+MD5 (gs5.10-VFlibBM.diff.gz) = a6cacd4aa71d9514977ce50c24960092
 MD5 (gdevlips4-1.2.0.tar.gz) = 55d1d9d507701a3d176e352dae74b0bf
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
 MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
@@ -10,3 +12,4 @@ MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (gdevnpdl-1.4.tar.gz) = 1b3e62370d10e76a10fdc663e54e3b28
 MD5 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
 MD5 (ghostscript-fonts-other-4.40.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
+MD5 (pdf_sec.ps) = 33b855032c90a0e0e6d5a460be82c749
diff --git a/japanese/vfghostscript55/files/patch-aa b/japanese/vfghostscript55/files/patch-aa
index 6db25a28d959..bf7ed35c4589 100644
--- a/japanese/vfghostscript55/files/patch-aa
+++ b/japanese/vfghostscript55/files/patch-aa
@@ -1,75 +1,163 @@
---- unix-gcc.mak.orig	Tue Nov 25 18:41:44 1997
-+++ unix-gcc.mak	Tue Nov 25 18:41:46 1997
-@@ -213,7 +213,7 @@
- # XLDFLAGS can be set from the command line.
- XLDFLAGS=
- 
--LDFLAGS=$(XLDFLAGS)
-+LDFLAGS=$(XLDFLAGS) -L/usr/local/lib
- 
- # Define any extra libraries to link into the executable.
- # ISC Unix 2.2 wants -linet.
-@@ -221,7 +221,7 @@
- # SVR4 may need -lnsl.
- # (Libraries required by individual drivers are handled automatically.)
- 
--EXTRALIBS=
-+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,8 +3679,8 @@
- 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
-+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,7 +3761,7 @@
- zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
- 	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
- 
--zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
-+zlibe_=
- zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
- 	$(SETMOD) zlibe_0 $(zlibe_)
- 	$(ADDMOD) zlibe_0 -include zlibc
-@@ -3808,11 +3808,11 @@
- 
- 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
-+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,9 +4799,6 @@
- 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 ------------ ###
-@@ -5474,6 +5471,7 @@
- 	$(ADDMOD) kfvflib -lib VFlib
- 
- zkfvflib.$(OBJ): zkfvflib.c 
-+	${CC} ${CFLAGS} -I${PREFIX}/include/ -c zkfvflib.c
- 
- #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
- # 
+*** unix-gcc.mak.orig	Fri Feb 13 20:37:31 1998
+--- unix-gcc.mak	Fri Feb 13 20:38:22 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
+  
+  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    
+  
+  zkfvflib.$(OBJ): zkfvflib.c 
++ 	${CC} ${CFLAGS} -I${PREFIX}/include/ -c zkfvflib.c
+  
+  #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
+  # 
diff --git a/japanese/vfghostscript55/pkg-plist b/japanese/vfghostscript55/pkg-plist
index 97389c3bab44..a5cf05396071 100644
--- a/japanese/vfghostscript55/pkg-plist
+++ b/japanese/vfghostscript55/pkg-plist
@@ -265,6 +265,7 @@ share/ghostscript/5.10vflib/doc/kfvflib.sj
 share/ghostscript/5.10vflib/doc/djgpp.sj
 share/ghostscript/5.10vflib/doc/gs261j.jis
 share/ghostscript/5.10vflib/doc/gs261j.doc
+share/ghostscript/5.10vflib/doc/README.gs5.10-jpdf
 share/ghostscript/5.10vflib/doc/gdev10v.jis
 share/ghostscript/5.10vflib/doc/gdevep82.jis
 share/ghostscript/5.10vflib/doc/gdevlips4.euc
@@ -372,15 +373,22 @@ share/ghostscript/5.10vflib/kanji/allkanji.ps
 share/ghostscript/5.10vflib/kanji/article9.ps
 share/ghostscript/5.10vflib/kanji/fmaptype.ps
 share/ghostscript/5.10vflib/kanji/hankaku.ps
+share/ghostscript/5.10vflib/kanji/jcidcmap.ps
+share/ghostscript/5.10vflib/kanji/jcidemu.ps
+share/ghostscript/5.10vflib/kanji/jcidinit.ps
+share/ghostscript/5.10vflib/kanji/jcidjp1.ps
 share/ghostscript/5.10vflib/kanji/kbase.ps
 share/ghostscript/5.10vflib/kanji/kcomp.ps
 share/ghostscript/5.10vflib/kanji/kconfig.ps
+share/ghostscript/5.10vflib/kanji/kfcid.ps
 share/ghostscript/5.10vflib/kanji/kfvflib.ps
 share/ghostscript/5.10vflib/kanji/kinit.ps
 share/ghostscript/5.10vflib/kanji/kmapping.ps
 share/ghostscript/5.10vflib/kanji/koutline.ps
 share/ghostscript/5.10vflib/kanji/metrics2.ps
 share/ghostscript/5.10vflib/kanji/vchars.ps
+share/ghostscript/5.10vflib/kanji/kbitmap.ps
+share/ghostscript/5.10vflib/kanji/kfvfbm.ps
 share/ghostscript/5.10vflib/dmp_init.ps
 share/ghostscript/5.10vflib/dmp_site.ps
 share/ghostscript/5.10vflib/escp_24.src