From 57dbb91d038919ecf8477fe904507b7b5209cefe Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Sat, 14 Jul 2007 19:51:29 +0000
Subject: Fix build with GCC 4.2.

Spotted by:	pointyhat
---
 japanese/dvi2dvi/files/patch-Makefile | 55 +++++++++++++++++++++++++++++++++++
 japanese/dvi2dvi/files/patch-aa       | 54 ----------------------------------
 japanese/dvi2dvi/files/patch-defs.h   | 14 +++++++--
 3 files changed, 66 insertions(+), 57 deletions(-)
 create mode 100644 japanese/dvi2dvi/files/patch-Makefile
 delete mode 100644 japanese/dvi2dvi/files/patch-aa

diff --git a/japanese/dvi2dvi/files/patch-Makefile b/japanese/dvi2dvi/files/patch-Makefile
new file mode 100644
index 000000000000..2f40255b5fe6
--- /dev/null
+++ b/japanese/dvi2dvi/files/patch-Makefile
@@ -0,0 +1,55 @@
+--- Makefile.orig	Fri Sep  3 22:01:59 1999
++++ Makefile	Sun Jul 15 04:45:41 2007
+@@ -2,10 +2,10 @@
+ # your site:
+ #
+ # where dvi2dvi is installed
+-BINAREA=/usr/local/bin
++BINAREA=${PREFIX}/bin
+ #
+ # directory for dvi2dvi: where the auxiliary files are installed
+-DVI2LIB=/usr/local/lib/dvi2dvi
++DVI2LIB=${PREFIX}/lib/dvi2dvi
+ #
+ # name of default fontdesc file in your site
+ FONTDESC=fontdesc
+@@ -13,16 +13,16 @@
+ DVI2PATH=.:${DVI2LIB}
+ 
+ # kpathsea
+-KPSEINCLUDE = -I/usr/local/include -DKPATHSEA
+-KPSELIB = -L/usr/local/lib -lkpathsea
++KPSEINCLUDE = -I${kpathsea_parent} -DKPATHSEA
++KPSELIB = -L${kpathsea_parent}/kpathsea/STATIC -lkpathsea
+ 
+ #
+-CC=gcc
++CC?=gcc
+ #
+-CCFLAGS = -g
++#CCFLAGS = -g
+ #CCFLAGS = -O		# SUN etc ...
+ #CCFLAGS = -O -traditional -DPOSIX	# 386bsd (gcc 1.X)
+-#CCFLAGS = -O -DPOSIX	# Netbsd (gcc 2.X), Linux
++CCFLAGS += -O -DPOSIX -DANSI	# Netbsd (gcc 2.X), Linux
+ #CCFLAGS = -O -bsd	# NeXT
+ #CCFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
+ #CCFLAGS = -O -DSYSV	# SysV
+@@ -74,7 +74,7 @@
+ 
+ newlib:
+ 	-mkdir lib
+-	cp -pr lib-dist/* lib
++	cp -r lib-dist/* lib
+ 
+ install: install-dvi2dvi
+ 
+@@ -83,7 +83,7 @@
+ 
+ install-lib:
+ 	-mkdir ${DVI2LIB}
+-	cp -pr lib/* ${DVI2LIB}
++	cp -r lib/* ${DVI2LIB}
+ 	chmod -R a+r ${DVI2LIB}
+ 
+ clean:	
diff --git a/japanese/dvi2dvi/files/patch-aa b/japanese/dvi2dvi/files/patch-aa
deleted file mode 100644
index 99a5f77b27c8..000000000000
--- a/japanese/dvi2dvi/files/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
---- Makefile.orig	Fri Sep  3 22:01:59 1999
-+++ Makefile	Thu Aug 26 01:24:25 2004
-@@ -2,10 +2,10 @@
- # your site:
- #
- # where dvi2dvi is installed
--BINAREA=/usr/local/bin
-+BINAREA=${PREFIX}/bin
- #
- # directory for dvi2dvi: where the auxiliary files are installed
--DVI2LIB=/usr/local/lib/dvi2dvi
-+DVI2LIB=${PREFIX}/lib/dvi2dvi
- #
- # name of default fontdesc file in your site
- FONTDESC=fontdesc
-@@ -13,16 +13,16 @@
- DVI2PATH=.:${DVI2LIB}
- 
- # kpathsea
--KPSEINCLUDE = -I/usr/local/include -DKPATHSEA
--KPSELIB = -L/usr/local/lib -lkpathsea
-+KPSEINCLUDE = -I${kpathsea_parent} -DKPATHSEA
-+KPSELIB = -L${kpathsea_parent}/kpathsea/STATIC -lkpathsea
- 
- #
- CC=gcc
- #
--CCFLAGS = -g
-+#CCFLAGS = -g
- #CCFLAGS = -O		# SUN etc ...
- #CCFLAGS = -O -traditional -DPOSIX	# 386bsd (gcc 1.X)
--#CCFLAGS = -O -DPOSIX	# Netbsd (gcc 2.X), Linux
-+CCFLAGS += -O -DPOSIX	# Netbsd (gcc 2.X), Linux
- #CCFLAGS = -O -bsd	# NeXT
- #CCFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
- #CCFLAGS = -O -DSYSV	# SysV
-@@ -74,7 +74,7 @@
- 
- newlib:
- 	-mkdir lib
--	cp -pr lib-dist/* lib
-+	cp -r lib-dist/* lib
- 
- install: install-dvi2dvi
- 
-@@ -83,7 +83,7 @@
- 
- install-lib:
- 	-mkdir ${DVI2LIB}
--	cp -pr lib/* ${DVI2LIB}
-+	cp -r lib/* ${DVI2LIB}
- 	chmod -R a+r ${DVI2LIB}
- 
- clean:	
diff --git a/japanese/dvi2dvi/files/patch-defs.h b/japanese/dvi2dvi/files/patch-defs.h
index 06e23b5dcad0..42b53cbb9cd6 100644
--- a/japanese/dvi2dvi/files/patch-defs.h
+++ b/japanese/dvi2dvi/files/patch-defs.h
@@ -1,6 +1,14 @@
---- defs.h.orig	Sat Aug 21 01:06:36 2004
-+++ defs.h	Sat Aug 21 01:07:14 2004
-@@ -35,21 +35,11 @@
+--- defs.h.orig	Fri Apr 17 04:41:28 1998
++++ defs.h	Sun Jul 15 04:47:17 2007
+@@ -27,6 +27,7 @@
+ #define	bcopy(s, d, n)	memcpy(d, s, n)
+ #define	bzero(p, n)	memset(p, 0, n)
+ #else
++#include	<string.h>
+ #include	<strings.h>
+ #endif
+ 
+@@ -35,21 +36,11 @@
  char *realloc();
  char *calloc();
  int free();
-- 
cgit