Fix build for ELF.

PR:		10726
Submitted by:	maintainer

6 files changed, 197 insertions, 58 deletions

diff --git a/korean/ghostscript55httf/Makefile b/korean/ghostscript55httf/Makefile
index 89a65b6..5fc5209 100644
--- a/korean/ghostscript55httf/Makefile
+++ b/korean/ghostscript55httf/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	freetype-ghostscript
 # Version required:	5.10ft
 # Date created:		Fri Mar 27 10:32:46 KST 1998
-# Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
+# Whom:			CHOI Junho <cjh@kr.freebsd.org>
 #
-# $Id: Makefile,v 1.5 1998/12/22 08:12:20 asami Exp $
+# $Id: Makefile,v 1.6 1999/02/13 00:34:44 asami Exp $
 #
 # based on print/ghostscript5 and japanese/vfghostscript5
 # use Adobe's CID-keyed font sameple(korean) because there are no
@@ -13,8 +13,9 @@
 DISTNAME=	ko-ftghostscript-5.10
 CATEGORIES=	korean print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
-		http://freefall.freebsd.org/~andreas/download/ \
+		ftp://bonk.ethz.ch/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
+		http://freefall.freebsd.org/~andreas/download/ \
 		http://www.ldl.jaist.ac.jp/~akr/nonresearch/free-software/ghostscript/ \
 		http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
 		ftp://jazz.snu.ac.kr/pub/unix/gs-ko/ \
@@ -25,10 +26,8 @@ DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${KFFTYPE_PATCH} ${HFFTYPE} ${GS_CID_PATCH} \
 		${CID_FONTS_KO} ${CID_CMAP_KO}
 
-MAINTAINER=	junker@jazz.snu.ac.kr
-
+MAINTAINER=	cjh@kr.freebsd.org
 
-BROKEN_ELF=	yes
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract \
@@ -52,7 +51,7 @@ GS_FONTS_STD=	ghostscript-fonts-std-5.50.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
 # Additional driver HP 850, see http://bonk.ethz.ch/hp850/hp850.html
-HP850_DRV=	hp850-1.2.zip
+HP850_DRV=	hp8xxs13.zip
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
@@ -79,15 +78,17 @@ CID_FONTS_KO=	Munhwa-Regular MunhwaGothic-Regular
 CID_CMAP_KO=	ak11.tar.Z
 
 # in Korea, A4 paper is default
-.if !defined(NOA4)
+.if defined(NOA4)
+CFLAGS+=
+.else
 CFLAGS+=	-DA4
 .endif
 
 pre-fetch:
 .if !defined(NOA4)
-	@${ECHO_MSG} "Type \"make NOA4=yes\" if you don't want A4 size default."
+	@${ECHO_MSG} "Type \"make NOA4=yes\" if you don't want -DA4 for compilation."
 .else
-	@${ECHO_MSG} "Default paper size is A4."
+	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 .if !defined(PDFENCRYPT)
 	@${ECHO_MSG} "NOTE: You can have encrypted PDF support by adding "
@@ -101,9 +102,9 @@ post-extract:
 	${TOUCH} ${WRKSRC}/adler32.o
 	${TOUCH} ${WRKSRC}/deflate.o
 	${TOUCH} ${WRKSRC}/trees.o
-	ln -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6* ${WRKSRC}/jpeg-6a
+	ln -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6* ${WRKSRC}/jpeg-6b
 	ln -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.* ${WRKSRC}/libpng
-	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
+	cd ${WRKSRC} && unzip -Loa ${DISTDIR}/${HP850_DRV}
 	cd ${WRKSRC} && tar -xzf ${DISTDIR}/${CID_CMAP_KO}
 
 pre-patch:
diff --git a/korean/ghostscript55httf/distinfo b/korean/ghostscript55httf/distinfo
index 2bb8938..b2d9f17 100644
--- a/korean/ghostscript55httf/distinfo
+++ b/korean/ghostscript55httf/distinfo
@@ -2,7 +2,7 @@ MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
 MD5 (ghostscript-5.10gnu.tar.gz) = 6706117129a5f63dff3a5a2bf4258630
 MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
 MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
-MD5 (hp850-1.2.zip) = e37477210305e027c45f82d04d1613d1
+MD5 (hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (gs5.10-vflib-1.1.tar.gz) = 856599571b5c9845595d830ad2b31b5f
 MD5 (gs5-kfftype.tar.gz) = 960047c6530e3678ee340d62adfbc3a8
diff --git a/korean/ghostscript55httf/files/patch-aa b/korean/ghostscript55httf/files/patch-aa
index 9a791f8..9fa96bf 100644
--- a/korean/ghostscript55httf/files/patch-aa
+++ b/korean/ghostscript55httf/files/patch-aa
@@ -1,5 +1,174 @@
-diff -uNr gs5.10-ori/cdj850.dev cdj850.dev
---- gs5.10-ori/cdj850.dev	Thu Jan  1 09:00:00 1970
-+++ cdj850.dev	Mon Mar 30 19:18:02 1998
-@@ -0,0 +1 @@
-+-dev cdj850 -include page -obj gdevcd8.o gdevpcl.o
+--- unix-gcc.mak.orig	Sun Oct 11 23:43:16 1998
++++ unix-gcc.mak	Sun Oct 11 23:46:51 1998
+@@ -135,7 +135,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+ 
+-JSRCDIR=jpeg-6a
++JSRCDIR=jpeg-6b
+ JVERSION=6
+ 
+ # Define the directory where the PNG library sources are stored,
+@@ -156,7 +156,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+ 
+-ZSRCDIR=zlib
++ZSRCDIR=.
+ 
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -181,7 +181,7 @@
+ 
+ # Define the name of the C compiler.
+ 
+-CC=gcc
++CC=cc
+ 
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -206,14 +206,14 @@
+ # We don't include -ansi, because this gets in the way of the platform-
+ #   specific stuff that <math.h> typically needs; nevertheless, we expect
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+-XCFLAGS=
++XCFLAGS= -I$(prefix)/include
+ 
+ CFLAGS=-O $(GCFLAGS) $(XCFLAGS)
+ 
+ # Define platform flags for ld.
+ # SunOS 4.n may need -Bstatic.
+ # XLDFLAGS can be set from the command line.
+-XLDFLAGS=
++XLDFLAGS= -L$(prefix)/lib
+ 
+ LDFLAGS=$(XLDFLAGS)
+ 
+@@ -223,7 +223,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
+@@ -233,7 +233,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/include
+ 
+ # Define the directory/ies and library names for the X11 library files.
+ # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
+@@ -248,8 +248,8 @@
+ #XLIBS=Xt SM ICE Xext X11
+ 
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
+-XLIBDIR=
++XLIBDIRS=-L/usr/X11R6/lib
++XLIBDIR=/usr/X11R6/lib
+ XLIBS=Xt Xext X11
+ 
+ # Define whether this platform has floating point hardware:
+@@ -292,22 +292,22 @@
+ 
+ # Choose the device(s) to include.  See devs.mak for details.
+ 
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=uniprint.dev
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
++#DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
++#DEVICE_DEVS1=
++#DEVICE_DEVS2=
++#DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
++#DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
++#DEVICE_DEVS5=uniprint.dev
++#DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
++#DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
++#DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
++#DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
++#DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
++#DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
++#DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
++#DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
++#DEVICE_DEVS14=jpeg.dev jpeggray.dev
++#DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+ 
+ # ---------------------------- End of options --------------------------- #
+ 
+@@ -3681,8 +3681,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)
++	$(SETMOD) libpng96 pngwio.$(OBJ)
+ #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
+ # 
+ # This file is part of Aladdin Ghostscript.
+@@ -3763,7 +3763,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
+@@ -3810,11 +3810,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 .
+@@ -4589,8 +4589,22 @@
+ 
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+ 
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ 	$(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj670.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj670 $(cdeskjet8_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj850 $(cdeskjet8_)
++
++cdj890.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj890 $(cdeskjet8_)
++
++cdj1600.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj1600 $(cdeskjet8_)
+ 
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ 	$(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/korean/ghostscript55httf/files/patch-ab b/korean/ghostscript55httf/files/patch-ab
index 7724250..aee04b3 100644
--- a/korean/ghostscript55httf/files/patch-ab
+++ b/korean/ghostscript55httf/files/patch-ab
@@ -1,17 +1,10 @@
-diff -uNr gs5.10-ori/devs.mak devs.mak
---- gs5.10-ori/devs.mak	Mon Mar 30 19:08:35 1998
-+++ devs.mak	Mon Mar 30 19:18:43 1998
-@@ -742,8 +742,13 @@
+--- gs_init.ps.orig	Thu Jan  2 19:23:13 1997
++++ gs_init.ps	Thu Jan  2 19:24:46 1997
+@@ -1363,3 +1363,7 @@
+ (END GC) VMDEBUG
  
- cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
- 
-+cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
-+
- cdeskjet.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdeskjet $(cdeskjet_)
+ % The interpreter will run the initial procedure (start).
 +
-+cdj850.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj850 $(cdeskjet8_)
- 
- cdjcolor.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdjcolor $(cdeskjet_)
++% unofficial patch:
++% make it possible to print from within acroread pdf viewer
++/Default currenthalftone /Halftone defineresource pop
diff --git a/korean/ghostscript55httf/files/patch-ac b/korean/ghostscript55httf/files/patch-ac
deleted file mode 100644
index 5acce6e..0000000
--- a/korean/ghostscript55httf/files/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr gs5.10-ori/gs_init.ps gs_init.ps
---- gs5.10-ori/gs_init.ps       Mon Mar 30 19:08:48 1998
-+++ gs_init.ps  Mon Mar 30 19:17:42 1998
-@@ -1465,3 +1465,20 @@
- (END GC) VMDEBUG
- 
- % The interpreter will run the initial procedure (start).
-+
-+% unofficial patch:
-+% make it possible to print from within acroread pdf viewer
-+/Default currenthalftone /Halftone defineresource pop
-+
-+% load initial CID-keyed fonts(Korean. KSC-EUC-H).
-+% It should be in Fontmap, but to avoid loading two or more time.
-+% (it can stop the interpreter - /rangecheck error)
-+%
-+QUIET not { (Loading CID(Korean) Fonts: ) print } if
-+% font loading start
-+(Munhwa-Regular-KSC-EUC-H.gsf) runlibfile
-+QUIET not { (Munhwa-Regular-KSC-EUC-H ) print } if
-+(MunhwaGothic-Regular-KSC-EUC-H.gsf) runlibfile
-+QUIET not { (MunhwaGothic-Regular-KSC-EUC-H ) print } if
-+% end of font loading
-+QUIET not { (\n) print } if
diff --git a/korean/ghostscript55httf/pkg-descr b/korean/ghostscript55httf/pkg-descr
index 55ffd66..c0a9950 100644
--- a/korean/ghostscript55httf/pkg-descr
+++ b/korean/ghostscript55httf/pkg-descr
@@ -18,4 +18,4 @@ GS with Korean Web page:
 	http://jazz.snu.ac.kr/~junker/work/gs-ko/
 
 --
-Ports by CHOI Junho <junker@jazz.snu.ac.kr>
+Ports by CHOI Junho <cjh@kr.freebsd.org>