Tue Feb 24 08:21:07 2015 UTC ()
Allow cups>=2.0


(markd)
diff -r1.7 -r1.8 pkgsrc/print/ghostscript-gpl/distinfo
diff -r1.5 -r1.6 pkgsrc/print/ghostscript-gpl/patches/patch-ah
cvs diff -r1.7 -r1.8 pkgsrc/print/ghostscript-gpl/distinfo (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-gpl/distinfo 2014/12/30 07:52:41 1.7
+++ pkgsrc/print/ghostscript-gpl/distinfo 2015/02/24 08:21:07 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.7 2014/12/30 07:52:41 dholland Exp $ 1$NetBSD: distinfo,v 1.8 2015/02/24 08:21:07 markd Exp $
2 2
3SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238 3SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
4RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d 4RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
5Size (ghostscript-9.06.tar.bz2) = 29246039 bytes 5Size (ghostscript-9.06.tar.bz2) = 29246039 bytes
6SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca 6SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
7SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a 7SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a
8SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de 8SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
9SHA1 (patch-ah) = c8ca372123b98e054e460550b820479ba1f943b0 9SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52
10SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65 10SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
11SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c 11SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
12SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9 12SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
13SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2 13SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
14SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57 14SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57
15SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f 15SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
16SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae 16SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
17SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737 17SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737
cvs diff -r1.5 -r1.6 pkgsrc/print/ghostscript-gpl/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-gpl/patches/patch-ah 2014/07/18 08:56:37 1.5
+++ pkgsrc/print/ghostscript-gpl/patches/patch-ah 2015/02/24 08:21:07 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ah,v 1.5 2014/07/18 08:56:37 ryoon Exp $ 1$NetBSD: patch-ah,v 1.6 2015/02/24 08:21:07 markd Exp $
2 2
3(1) First chunk to fix the X11_TYPE=native problem, which 3(1) First chunk to fix the X11_TYPE=native problem, which
4 freetype2 in /usr/X11R7/ is way old, and work around to  4 freetype2 in /usr/X11R7/ is way old, and work around to
5 use ghostscript-provided freetype2. 5 use ghostscript-provided freetype2.
6 This part is not necessary for NetBSD 6.0, 6.1. 6 This part is not necessary for NetBSD 6.0, 6.1.
7 7
8(2) Second chunk for X11_TYPE=native, will have following problem without 8(2) Second chunk for X11_TYPE=native, will have following problem without
9 this patch: 9 this patch:
10 | Shared object "libpaper.so.1" not found 10 | Shared object "libpaper.so.1" not found
11 11
12(3) SCO_SV chunk for SCO OpenServer 5.0.7/3.2's linker. 12(3) SCO_SV chunk for SCO OpenServer 5.0.7/3.2's linker.
13 13
14--- configure.orig 2012-08-08 08:04:57.000000000 +0000 14--- configure.orig 2012-08-08 08:04:57.000000000 +0000
@@ -47,22 +47,24 @@ $NetBSD: patch-ah,v 1.5 2014/07/18 08:56 @@ -47,22 +47,24 @@ $NetBSD: patch-ah,v 1.5 2014/07/18 08:56
47+ ;; 47+ ;;
48 esac 48 esac
49  49
50  50
51@@ -5331,7 +5334,7 @@ fi 51@@ -5331,7 +5334,7 @@ fi
52 fi 52 fi
53  53
54 if test x$with_libpaper != xno; then 54 if test x$with_libpaper != xno; then
55- LIBS="$LIBS -lpaper" 55- LIBS="$LIBS -lpaper"
56+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper" 56+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
57  57
58 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h 58 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
59  59
60@@ -6474,7 +6477,7 @@ done 60@@ -6474,7 +6477,9 @@ done
61 LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak" 61 LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
62 LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak" 62 LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
63 if ( test x$with_pdftoraster != xno ); then 63 if ( test x$with_pdftoraster != xno ); then
64- if test "$CUPSVERSION" ">" "1.2"; then 64- if test "$CUPSVERSION" ">" "1.2"; then
65+ if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then 65+ if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then
 66+ CUPSPDFTORASTER="1"
 67+ elif echo "$CUPSVERSION" | grep -q '^[2-9]\.[0-9]'; then
66 CUPSPDFTORASTER="1" 68 CUPSPDFTORASTER="1"
67 fi 69 fi
68 fi 70 fi