Thu May 1 04:11:01 2014 UTC ()
reapply lost patch:
'cups' option needs to ensure BUILD_TARGET 'cups' is added.
configure adjusted to correctly accept CUPSVERSION and, while we're at it,
add missing space between '!' and parens in test for contrib directory.


(richard)
diff -r1.4 -r1.5 pkgsrc/print/ghostscript-gpl/distinfo
diff -r1.4 -r1.5 pkgsrc/print/ghostscript-gpl/options.mk
diff -r1.3 -r1.4 pkgsrc/print/ghostscript-gpl/patches/patch-ah
cvs diff -r1.4 -r1.5 pkgsrc/print/ghostscript-gpl/distinfo (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-gpl/distinfo 2014/04/26 13:51:40 1.4
+++ pkgsrc/print/ghostscript-gpl/distinfo 2014/05/01 04:11:01 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.4 2014/04/26 13:51:40 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2014/05/01 04:11:01 richard 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-af) = 79af4d253001f879f1b5d3ef93584ae7300361de 7SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
8SHA1 (patch-ah) = bfa744e18bdebdc60d2f51fe47750782b75ffbce 8SHA1 (patch-ah) = cd401578b89ca1fa2cfb46405268980e14e2d21d
9SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65 9SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
10SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c 10SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
11SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9 11SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
12SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2 12SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
13SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57 13SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57
14SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f 14SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
15SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae 15SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
16SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737 16SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737
cvs diff -r1.4 -r1.5 pkgsrc/print/ghostscript-gpl/options.mk (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-gpl/options.mk 2014/04/26 13:51:40 1.4
+++ pkgsrc/print/ghostscript-gpl/options.mk 2014/05/01 04:11:01 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.4 2014/04/26 13:51:40 wiz Exp $ 1# $NetBSD: options.mk,v 1.5 2014/05/01 04:11:01 richard Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript 3PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript
4PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits utf8 4PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits utf8
5PKG_SUGGESTED_OPTIONS= x11 fontconfig utf8 5PKG_SUGGESTED_OPTIONS= x11 fontconfig utf8
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9# (no_cidfmap) when --disable-compile-inits selected, 9# (no_cidfmap) when --disable-compile-inits selected,
10# cidfmap is renamed to cidfmap.dist 10# cidfmap is renamed to cidfmap.dist
11PLIST_VARS+= no_cidfmap 11PLIST_VARS+= no_cidfmap
12 12
13.if !empty(PKG_OPTIONS:Mx11) 13.if !empty(PKG_OPTIONS:Mx11)
14CONFIGURE_ARGS+= --with-x 14CONFIGURE_ARGS+= --with-x
@@ -19,26 +19,27 @@ CONFIGURE_ARGS+= --with-x @@ -19,26 +19,27 @@ CONFIGURE_ARGS+= --with-x
19. if !empty(X11_TYPE:Mnative) 19. if !empty(X11_TYPE:Mnative)
20. include "../../x11/libxcb/buildlink3.mk" 20. include "../../x11/libxcb/buildlink3.mk"
21. include "../../graphics/freetype2/buildlink3.mk" 21. include "../../graphics/freetype2/buildlink3.mk"
22. endif 22. endif
23.else 23.else
24CONFIGURE_ARGS+= --without-x 24CONFIGURE_ARGS+= --without-x
25CONFIGURE_ARGS+= --disable-freetype 25CONFIGURE_ARGS+= --disable-freetype
26.endif 26.endif
27 27
28PLIST_VARS+= cups 28PLIST_VARS+= cups
29.if !empty(PKG_OPTIONS:Mcups) 29.if !empty(PKG_OPTIONS:Mcups)
30CONFIGURE_ARGS+= --enable-cups 30CONFIGURE_ARGS+= --enable-cups
31PLIST.cups= yes 31PLIST.cups= yes
 32BUILD_TARGET+= cups
32INSTALL_TARGET+= install-cups 33INSTALL_TARGET+= install-cups
33 34
34CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups 35CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups
35CUPS_EGDIR= ${PREFIX}/share/examples/cups 36CUPS_EGDIR= ${PREFIX}/share/examples/cups
36CONF_FILES+= ${CUPS_EGDIR}/gstoraster.convs ${CUPS_CONFDIR}/gstoraster.convs 37CONF_FILES+= ${CUPS_EGDIR}/gstoraster.convs ${CUPS_CONFDIR}/gstoraster.convs
37 38
38SUBST_CLASSES+= cupsetc 39SUBST_CLASSES+= cupsetc
39SUBST_STAGE.cupsetc= post-extract 40SUBST_STAGE.cupsetc= post-extract
40SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example 41SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example
41SUBST_FILES.cupsetc= cups/cups.mak 42SUBST_FILES.cupsetc= cups/cups.mak
42SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g' 43SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
43 44
44.include "../../print/cups/buildlink3.mk" 45.include "../../print/cups/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/print/ghostscript-gpl/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-gpl/patches/patch-ah 2014/04/26 13:51:40 1.3
+++ pkgsrc/print/ghostscript-gpl/patches/patch-ah 2014/05/01 04:11:01 1.4
@@ -1,38 +1,56 @@ @@ -1,38 +1,56 @@
1$NetBSD: patch-ah,v 1.3 2014/04/26 13:51:40 wiz Exp $ 1$NetBSD: patch-ah,v 1.4 2014/05/01 04:11:01 richard 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--- configure.orig 2012-08-08 17:04:57.000000000 +0900 12--- configure.orig 2012-08-08 08:04:57.000000000 +0000
13+++ configure 13+++ configure
14@@ -3786,13 +3786,13 @@ 14@@ -3756,7 +3756,7 @@ $as_echo "$as_me: WARNING: disabling con
 15 ;;
 16 *)
 17 # This is just an arbitrary file in contrib to check
 18- if !(test -f contrib/gdevbjc_.c); then
 19+ if ! (test -f contrib/gdevbjc_.c); then
 20 enable_contrib=no
 21 fi
 22 ;;
 23@@ -3786,13 +3786,13 @@ case `uname` in
15 ;; 24 ;;
16 *BSD) 25 *BSD)
17 if test $ac_cv_c_compiler_gnu = yes; then 26 if test $ac_cv_c_compiler_gnu = yes; then
18- CC_OPT_FLAGS_TO_TRY="-O2" 27- CC_OPT_FLAGS_TO_TRY="-O2"
19+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include" 28+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
20 CC_DBG_FLAGS_TO_TRY="-g -O0" 29 CC_DBG_FLAGS_TO_TRY="-g -O0"
21 fi 30 fi
22 ;; 31 ;;
23 Darwin*) 32 Darwin*)
24 if test $ac_cv_c_compiler_gnu = yes; then 33 if test $ac_cv_c_compiler_gnu = yes; then
25- CC_OPT_FLAGS_TO_TRY="-O2" 34- CC_OPT_FLAGS_TO_TRY="-O2"
26+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include" 35+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
27 CC_DBG_FLAGS_TO_TRY="-g -O0" 36 CC_DBG_FLAGS_TO_TRY="-g -O0"
28 fi 37 fi
29 SET_DT_SONAME="" 38 SET_DT_SONAME=""
30@@ -5331,7 +5331,7 @@ 39@@ -5331,7 +5331,7 @@ fi
31 fi 40 fi
32  41
33 if test x$with_libpaper != xno; then 42 if test x$with_libpaper != xno; then
34- LIBS="$LIBS -lpaper" 43- LIBS="$LIBS -lpaper"
35+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper" 44+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
36  45
37 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h 46 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
38  47
 48@@ -6474,7 +6474,7 @@ done
 49 LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
 50 LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
 51 if ( test x$with_pdftoraster != xno ); then
 52- if test "$CUPSVERSION" ">" "1.2"; then
 53+ if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then
 54 CUPSPDFTORASTER="1"
 55 fi
 56 fi