4 files changed, 104 insertions, 29 deletions

diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile
index 18095f35be58..f42c5c6e43d5 100644
--- a/japanese/dvi2ps/Makefile
+++ b/japanese/dvi2ps/Makefile
@@ -12,10 +12,10 @@ CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
 DISTNAME=	${PORTNAME}-${PORTVERSION}j
 
-MAINTAINER=	mita@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI to PostScript converter Japanese version
 
-BUILD_DEPENDS=	${PREFIX}/lib/libkpathsea.a:${PORTSDIR}/japanese/ptex-base
+BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/japanese/ptex-base
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
 MAN1=		dvi2ps.1
@@ -23,10 +23,6 @@ MANLANG=	"" ja
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	@(cd ${WRKSRC}; make newlib)
 
diff --git a/japanese/dvi2ps/files/patch-Makefile b/japanese/dvi2ps/files/patch-Makefile
new file mode 100644
index 000000000000..0410907ee84e
--- /dev/null
+++ b/japanese/dvi2ps/files/patch-Makefile
@@ -0,0 +1,78 @@
+--- Makefile.orig	Mon Sep 11 18:16:11 2000
++++ Makefile	Tue May 18 03:21:53 2004
+@@ -2,7 +2,7 @@
+ # your site:
+ #
+ # BINAREA and DVI2LIB are relative to PREFIX
+-PREFIX=${DESTDIR}/usr/local
++PREFIX?=/usr/local
+ # where dvi2ps is installed
+ BINAREA=${PREFIX}/bin
+ #
+@@ -46,7 +46,7 @@
+ # FREETYPE -- FTLIB, FTINC
+ # VFLIB    -- FTLIB, FTINC, VFLIB, VFLIBINC
+ FTLIB = -L${PREFIX}/lib -lttf
+-FTINC = -I${PREFIX}/include/freetype
++FTINC = -I${PREFIX}/include/freetype1/freetype
+ VFLIB = -L${PREFIX}/lib -lVFlib2
+ VFLIBINC = -I${PREFIX}/include
+ 
+@@ -57,7 +57,7 @@
+ #
+ CC=gcc
+ #
+-CCFLAGS = -g -O -DPOSIX
++CCFLAGS = -g -O -DPOSIX -DHAVE_PROTOTYPES
+ #CCFLAGS = -O		# SUNOS 4.X etc ...
+ #CCFLAGS = -O -DPOSIX	# NetBSD FreeBSD (gcc 2.X), Linux
+ #CCFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
+@@ -74,7 +74,7 @@
+ # You don't have to change the definition variables in the folllowing.
+ #
+ FONTLIB = ${VFLIB} ${FTLIB}
+-CFLAGS = ${CCFLAGS} ${FONTF} ${KPSEINC}
++CFLAGS+= ${CCFLAGS} ${FONTF} ${KPSEINC}
+ CNFCFLAGS = ${CFLAGS} -DDVI2PATH=\"${DVI2PATH}\" \
+ 	    -DDVI2LIB=\"${DVI2LIB}\" -DFONTDESC=\"//${FONTDESC}\" \
+ 	    -DRESOLUTION=${RESOLUTION} -DMFMODE=\"${MFMODE}\" \
+@@ -151,32 +151,32 @@
+ 	${INSTALL} -c -s -m 755 dvi2ps ${BINAREA}/dvi2ps
+ 
+ install-header: ${PSHEADERS} lib/dvi2.ps
+-	-mkdir ${DVI2LIB}
+-	-mkdir ${DVI2HEADERS}
++	-mkdir -p ${DVI2LIB}
++	-mkdir -p ${DVI2HEADERS}
+ 	cp -p ${PSHEADERS} ${DVI2HEADERS}
+ 	cp -p lib/dvi2.ps ${DVI2LIB}
+ 	chmod -R a+r ${DVI2HEADERS} ${DVI2LIB}/dvi2.ps
+ 
+ install-lib: ${PSHEADERS}
+-	-mkdir ${DVI2LIB}
++	-mkdir -p ${DVI2LIB}
+ 	cp -pr lib/* ${DVI2LIB}
+ 	chmod -R a+r ${DVI2LIB}
+ 
+ lib/dvi2.ps: ${HDR}/dvi2.ps ${HDR}/special.ps
+ 	cat ${HDR}/dvi2.ps ${HDR}/special.ps > lib/dvi2.ps
+ ${HDR}/dvi2.ps: dvi2.psdoc
+-	-mkdir lib ${HDR}
++	-mkdir -p lib ${HDR}
+ 	./tools/psstrip < dvi2.psdoc | \
+ 	sed -e s/'##XCOORD##'/${LEFTMARGIN}/ -e s/'##YCOORD##'/${TOPMARGIN}/ \
+ 		> ${HDR}/dvi2.ps
+ ${HDR}/special.ps: special.psdoc
+-	-mkdir lib ${HDR}
++	-mkdir -p lib ${HDR}
+ 	./tools/psstrip < special.psdoc > ${HDR}/special.ps
+ ${HDR}/psifont.ps: psifont.psdoc
+-	-mkdir lib ${HDR}
++	-mkdir -p lib ${HDR}
+ 	./tools/psstrip < psifont.psdoc > ${HDR}/psifont.ps
+ ${HDR}/color.ps: color.psdoc
+-	-mkdir lib ${HDR}
++	-mkdir -p lib ${HDR}
+ 	./tools/psstrip < color.psdoc > ${HDR}/color.ps
+ 
+ install-man:
diff --git a/japanese/dvi2ps/files/patch-aa b/japanese/dvi2ps/files/patch-aa
deleted file mode 100644
index 5714433c04ad..000000000000
--- a/japanese/dvi2ps/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Mon Sep 11 12:16:11 2000
-+++ Makefile	Mon Mar 18 16:52:37 2002
-@@ -2,7 +2,7 @@
- # your site:
- #
- # BINAREA and DVI2LIB are relative to PREFIX
--PREFIX=${DESTDIR}/usr/local
-+PREFIX?=/usr/local
- # where dvi2ps is installed
- BINAREA=${PREFIX}/bin
- #
-@@ -46,7 +46,7 @@
- # FREETYPE -- FTLIB, FTINC
- # VFLIB    -- FTLIB, FTINC, VFLIB, VFLIBINC
- FTLIB = -L${PREFIX}/lib -lttf
--FTINC = -I${PREFIX}/include/freetype
-+FTINC = -I${PREFIX}/include/freetype1/freetype
- VFLIB = -L${PREFIX}/lib -lVFlib2
- VFLIBINC = -I${PREFIX}/include
- 
diff --git a/japanese/dvi2ps/files/patch-defs.h b/japanese/dvi2ps/files/patch-defs.h
new file mode 100644
index 000000000000..03ee42989821
--- /dev/null
+++ b/japanese/dvi2ps/files/patch-defs.h
@@ -0,0 +1,24 @@
+--- defs.h.orig	Tue May 18 03:17:26 2004
++++ defs.h	Tue May 18 03:15:26 2004
+@@ -51,21 +51,11 @@
+ char *realloc();
+ char *calloc();
+ int free();
+-#ifdef ANSI
+-char *sprintf(char *, const char *, ...);
+-#else
+-char *sprintf();
+-#endif
+ #else /* POSIX */
+ void *malloc();
+ void *realloc();
+ void *calloc();
+ void free();
+-#ifdef ANSI
+-int sprintf(char *, const char *, ...);
+-#else
+-int sprintf();
+-#endif
+ #endif
+ char *mktemp();
+ char *getenv();