Upgrade, 2.0Beta4 -> 2.0Gamma.

Submitted by:	mita@jp.freebsd.org
(Closing PR #2295.)

6 files changed, 59 insertions, 49 deletions

diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile
index 74523603394..924ba31eee2 100644
--- a/japanese/dvi2ps/Makefile
+++ b/japanese/dvi2ps/Makefile
@@ -1,21 +1,23 @@
 # New ports collection makefile for: jp-dvi2ps
-# Version required:	2.0beta4
+# Version required:	2.0gamma
 # Date created:		15 Sep 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1996/11/11 10:11:47 max Exp $
+# $Id: Makefile,v 1.3 1996/12/07 00:20:24 asami Exp $
 #
 
-DISTNAME=	dvi2ps-2.0j-beta4
-PKGNAME=	jp-dvi2ps-2.0b4
+DISTNAME=	dvi2ps-2.0j-gamma
+PKGNAME=	jp-dvi2ps-2.0g
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
-DISTFILES=	dvi2ps-2.0j-beta4.tar.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 LIB_DEPENDS=	VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
 
+MAN1=		dvi2ps.1 ../ja_JP.EUC/man1/dvi2ps.1
+
 post-patch:
 	@(cd ${WRKSRC}; make newlib)
 
@@ -28,6 +30,10 @@ post-install:
 	@(cd  ${WRKSRC}; \
 	make install-lib; \
 	${CP} -R doc ${PREFIX}/lib/dvi2ps/ ;\
+	mv ${PREFIX}/lib/dvi2ps/doc/dvi2ps.man ${PREFIX}/man/man1/dvi2ps.1 ;\
+	nkf -e ${PREFIX}/lib/dvi2ps/doc/dvi2ps.jman > \
+			${PREFIX}/man/ja_JP.EUC/man1/dvi2ps.1 ;\
+	${RM} -f ${PREFIX}/lib/dvi2ps/doc/dvi2ps.jman ;\
 	${INSTALL_SCRIPT} tools/lnfonts ${PREFIX}/lib/dvi2ps ;\
 	${INSTALL_PROGRAM} tools/nup ${PREFIX}/bin ;\
 	${INSTALL_PROGRAM} tools/texfix ${PREFIX}/bin ;\
diff --git a/japanese/dvi2ps/distinfo b/japanese/dvi2ps/distinfo
index 422afffff31..b32f6237ee1 100644
--- a/japanese/dvi2ps/distinfo
+++ b/japanese/dvi2ps/distinfo
@@ -1 +1 @@
-MD5 (dvi2ps-2.0j-beta4.tar.gz) = 2826a4525d6218a34e6e360775abde07
+MD5 (dvi2ps-2.0j-gamma.tar.gz) = ec19a27827d2edafb59390aef529aca7
diff --git a/japanese/dvi2ps/files/patch-aa b/japanese/dvi2ps/files/patch-aa
index 7dd01030abe..6594d301b49 100644
--- a/japanese/dvi2ps/files/patch-aa
+++ b/japanese/dvi2ps/files/patch-aa
@@ -1,61 +1,60 @@
-*** Makefile.orig	Fri Oct  4 12:01:36 1996
---- Makefile	Fri Nov  8 21:35:39 1996
+*** Makefile.orig	Thu Dec 26 19:37:51 1996
+--- Makefile	Thu Dec 26 19:39:54 1996
 ***************
-*** 1,11 ****
-  # The following file and directory specifications may need changing at
+*** 2,8 ****
   # your site:
   #
+  # BINAREA and DVI2LIB are relative to PREFIX
+! PREFIX=/usr/local
   # where dvi2ps is installed
-! BINAREA=/usr/local/bin
+  BINAREA=${PREFIX}/bin
   #
-  # directory for dvi2ps: where the auxiliary files are installed
-! DVI2LIB=/usr/local/lib/dvi2ps
-  #
-  # name of default fontdesc file in your site
-  FONTDESC=fontdesc
---- 1,12 ----
-  # The following file and directory specifications may need changing at
+--- 2,8 ----
   # your site:
   #
-+ PREFIX?=	/usr/local
+  # BINAREA and DVI2LIB are relative to PREFIX
+! PREFIX?=/usr/local
   # where dvi2ps is installed
-! BINAREA=${PREFIX}/bin
-  #
-  # directory for dvi2ps: where the auxiliary files are installed
-! DVI2LIB=${PREFIX}/lib/dvi2ps
+  BINAREA=${PREFIX}/bin
   #
-  # name of default fontdesc file in your site
-  FONTDESC=fontdesc
 ***************
-*** 36,50 ****
-  # optional font formats
-  FONTF = -DVFLIB
-  # VFlib library (comment out next line if -DFVLIB is not included)
-! VFLIB = VFlib.a
+*** 42,60 ****
+  # 1) libVFlib.a and VF.h are installed in the standard directory
+  #VFLIB = -lVFlib
+  # 2) libVFlib.a and VF.h are installed in the non-standard directory
+! #VFLIB = -L${PREFIX}/lib -lVFlib
+! #VFLIBINC = -I${PREFIX}/include
+  # 3) use VFlib.a and VF.h in the source directory of VFlib
+! VFLIBSRCDIR = ../VFlib-2.22/src
+! VFLIB = ${VFLIBSRCDIR}/VFlib.a
+! VFLIBINC = -I${VFLIBSRCDIR}
   
   #
   CC=cc
   #
 ! CCFLAGS = -g
-  #CCFLAGS = -O		# SUN etc ...
-  #CCFLAGS = -O -traditional -DPOSIX	# 386bsd (gcc 1.X)
+  #CCFLAGS = -O		# SUNOS 4.X etc ...
 ! #CCFLAGS = -O -DPOSIX	# NetBSD FreeBSD (gcc 2.X), Linux
-  #CCFLAGS = -O -bsd	# NeXT
   #CCFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
-  #CCFLAGS = -O -DSYSV	# SysV
---- 37,51 ----
-  # optional font formats
-  FONTF = -DVFLIB
-  # VFlib library (comment out next line if -DFVLIB is not included)
+  #CCFLAGS = -O -DANSI -DPOSIX -DSYSV -DSYSVIO	# Solaris 2.X (SUNWpro/bin/cc)
+  #CCFLAGS = -O -DSYSVIO		# Solaris 2.X (/usr/ucb/cc -- not recommended)
+--- 42,60 ----
+  # 1) libVFlib.a and VF.h are installed in the standard directory
+  #VFLIB = -lVFlib
+  # 2) libVFlib.a and VF.h are installed in the non-standard directory
 ! VFLIB = -L${PREFIX}/lib -lVFlib
+! VFLIBINC = -I${PREFIX}/include
+  # 3) use VFlib.a and VF.h in the source directory of VFlib
+! #VFLIBSRCDIR = ../VFlib-2.22/src
+! #VFLIB = ${VFLIBSRCDIR}/VFlib.a
+! #VFLIBINC = -I${VFLIBSRCDIR}
   
   #
   CC=cc
   #
 ! #CCFLAGS = -g
-  #CCFLAGS = -O		# SUN etc ...
-  #CCFLAGS = -O -traditional -DPOSIX	# 386bsd (gcc 1.X)
+  #CCFLAGS = -O		# SUNOS 4.X etc ...
 ! CCFLAGS = -O -DPOSIX -m486	# NetBSD FreeBSD (gcc 2.X), Linux
-  #CCFLAGS = -O -bsd	# NeXT
   #CCFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
-  #CCFLAGS = -O -DSYSV	# SysV
+  #CCFLAGS = -O -DANSI -DPOSIX -DSYSV -DSYSVIO	# Solaris 2.X (SUNWpro/bin/cc)
+  #CCFLAGS = -O -DSYSVIO		# Solaris 2.X (/usr/ucb/cc -- not recommended)
diff --git a/japanese/dvi2ps/files/patch-ab b/japanese/dvi2ps/files/patch-ab
index e98a066832b..422713f9759 100644
--- a/japanese/dvi2ps/files/patch-ab
+++ b/japanese/dvi2ps/files/patch-ab
@@ -10,7 +10,7 @@
 + 
 + # change resolution according to your site.
 + define	RESOLUTION	300
-+ resolution		300
++ resolution		$RESOLUTION
 + 
 + define	f		/usr/local/lib/fonts
 + define	af		/usr/local/share/tex/jfonts/jfms
diff --git a/japanese/dvi2ps/pkg-descr b/japanese/dvi2ps/pkg-descr
index a2a7128c210..e41608838ff 100644
--- a/japanese/dvi2ps/pkg-descr
+++ b/japanese/dvi2ps/pkg-descr
@@ -1,11 +1,12 @@
-dvi to postscrpt converter.
+dvi to PostScript converter.
 
-Sample font description file `/usr/local/lib/dvi2ps/fontdesc' is installed.
+A sample font description file `/usr/local/lib/dvi2ps/fontdesc' is installed.
 Those who want to print out English fonts by pkfont and Japanese by 
 printer builtin font can use it directly. 
 (Remember to add pkfonts by package or so.)
 
-Default resolution is set to 300dpi in fontdesc file, 
-modify it according to your site.
+Default resolution is set to 300dpi in fontdesc file. You can 
+modify it according to your site, or override it by command line option:
+dvi2ps -D RESOLUTION=(your resolution).
 
 See /usr/local/lib/dvi2ps/doc/* files for customize.
diff --git a/japanese/dvi2ps/pkg-plist b/japanese/dvi2ps/pkg-plist
index 39338b9dada..059aaab0b04 100644
--- a/japanese/dvi2ps/pkg-plist
+++ b/japanese/dvi2ps/pkg-plist
@@ -26,11 +26,13 @@ lib/dvi2ps/tombo.ps
 lib/dvi2ps/vflib
 lib/dvi2ps/vtexe
 lib/dvi2ps/wadalab
+lib/dvi2ps/doc/DOCS
+lib/dvi2ps/doc/dvi2ps.1
+lib/dvi2ps/doc/dvi2ps.1j
+lib/dvi2ps/doc/hints.doc
 lib/dvi2ps/doc/bugs.doc
 lib/dvi2ps/doc/changes.doc
 lib/dvi2ps/doc/dvi2ps.doc
-lib/dvi2ps/doc/dvi2ps.jman
-lib/dvi2ps/doc/dvi2ps.man
 lib/dvi2ps/doc/fontdesc.doc
 lib/dvi2ps/doc/history
 lib/dvi2ps/doc/install.doc
@@ -89,3 +91,5 @@ lib/dvi2ps/printer/LW16
 lib/dvi2ps/printer/LWII
 lib/dvi2ps/printer/RicohSP10
 lib/dvi2ps/printer/SPARC
+man/ja_JP.EUC/man1/dvi2ps.1.gz
+man/man1/dvi2ps.1.gz