Fix SCO OpenServer 5.0.7/3.2 build.

3 files changed, 28 insertions, 8 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 6963943f6a6..729d5ae45f2 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/18 09:28:17 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2014/07/18 08:56:37 ryoon Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-gpl/}
@@ -88,6 +88,11 @@ CONFIGURE_ENV+=	LPLIBDIR=${PREFIX}/lib
 # On OpenBSD 5.3, libxcb is required libXt.
 LDFLAGS.OpenBSD+=	-lxcb
 
+.if ${OS_VARIANT} == "SCOOSR5"
+# SCO OpenServer 5.0.7/3.2 has windows.h, and configure expacts it for MS Windows.
+CONFIGURE_ENV+=		ac_cv_header_windows_h=no
+.endif
+
 .include "options.mk"
 
 post-extract:
@@ -96,7 +101,10 @@ post-extract:
 #	${RM} -rf ${WRKSRC}/jasper
 	${RM} -rf ${WRKSRC}/libpng
 #	${RM} -rf ${WRKSRC}/tiff
-#	${RM} -rf ${WRKSRC}/zlib
+# UX:i386ld: ERROR: symbol: 'deflate_copyright' defined in two shared objects: libgs.so: size = 53, libz.so.1: size = 68
+.if ${OS_VARIANT} == "SCOOSR5"
+	${RM} -rf ${WRKSRC}/zlib
+.endif
 	${RM} -rf ${WRKSRC}/freetype
 #
 #  To allow outside customization, rename cidfmap
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index add9c2c450f..21ea4c08d9e 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2014/05/01 04:11:01 richard Exp $
+$NetBSD: distinfo,v 1.6 2014/07/18 08:56:37 ryoon Exp $
 
 SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
 Size (ghostscript-9.06.tar.bz2) = 29246039 bytes
 SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
 SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
-SHA1 (patch-ah) = cd401578b89ca1fa2cfb46405268980e14e2d21d
+SHA1 (patch-ah) = c8ca372123b98e054e460550b820479ba1f943b0
 SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
diff --git a/print/ghostscript-gpl/patches/patch-ah b/print/ghostscript-gpl/patches/patch-ah
index f5acc1d28ad..cee8d0a6b5f 100644
--- a/print/ghostscript-gpl/patches/patch-ah
+++ b/print/ghostscript-gpl/patches/patch-ah
@@ -1,14 +1,16 @@
-$NetBSD: patch-ah,v 1.4 2014/05/01 04:11:01 richard Exp $
+$NetBSD: patch-ah,v 1.5 2014/07/18 08:56:37 ryoon Exp $
 
 (1) First chunk to fix the X11_TYPE=native problem, which
     freetype2 in /usr/X11R7/ is way old, and work around to 
     use ghostscript-provided freetype2.
     This part is not necessary for NetBSD 6.0, 6.1.
 
-(2) Second chunk for X11_TYPE=native, will have following problem without 
+(2) Second chunk for X11_TYPE=native, will have following problem without
     this patch:
     |  Shared object "libpaper.so.1" not found
 
+(3) SCO_SV chunk for SCO OpenServer 5.0.7/3.2's linker.
+
 --- configure.orig	2012-08-08 08:04:57.000000000 +0000
 +++ configure
 @@ -3756,7 +3756,7 @@ $as_echo "$as_me: WARNING: disabling con
@@ -36,7 +38,17 @@ $NetBSD: patch-ah,v 1.4 2014/05/01 04:11:01 richard Exp $
              CC_DBG_FLAGS_TO_TRY="-g -O0"
          fi
          SET_DT_SONAME=""
-@@ -5331,7 +5331,7 @@ fi
+@@ -3806,6 +3806,9 @@ case `uname` in
+         fi
+         CC_DBG_FLAGS_TO_TRY="-g -O0"
+         ;;
++	SCO_SV)
++	SET_DT_SONAME="-h,"
++	;;
+ esac
+ 
+ 
+@@ -5331,7 +5334,7 @@ fi
  fi
  
  if test x$with_libpaper != xno; then
@@ -45,7 +57,7 @@ $NetBSD: patch-ah,v 1.4 2014/05/01 04:11:01 richard Exp $
  
  $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
  
-@@ -6474,7 +6474,7 @@ done
+@@ -6474,7 +6477,7 @@ done
                  LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
                  LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
                  if ( test x$with_pdftoraster != xno ); then