Wed Oct 13 20:47:09 2021 UTC ()
Pullup ticket #6512 - requested by mlelstv
print/ghostscript-agpl: pullup and build fix

Revisions pulled up:
- print/ghostscript-agpl/Makefile.common           1.25
- print/ghostscript-agpl/PLIST                     1.20
- print/ghostscript-agpl/distinfo                  1.37
- print/ghostscript-agpl/patches/patch-configure    1.8


(tm)
diff -r1.24 -r1.24.4.1 pkgsrc/print/ghostscript-agpl/Makefile.common
diff -r1.19 -r1.19.4.1 pkgsrc/print/ghostscript-agpl/PLIST
diff -r1.35.4.2 -r1.35.4.3 pkgsrc/print/ghostscript-agpl/distinfo
diff -r1.7 -r1.7.8.1 pkgsrc/print/ghostscript-agpl/patches/patch-configure
cvs diff -r1.24 -r1.24.4.1 pkgsrc/print/ghostscript-agpl/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/Makefile.common 2021/06/09 20:20:09 1.24
+++ pkgsrc/print/ghostscript-agpl/Makefile.common 2021/10/13 20:47:09 1.24.4.1
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1# $NetBSD: Makefile.common,v 1.24 2021/06/09 20:20:09 adam Exp $ 1# $NetBSD: Makefile.common,v 1.24.4.1 2021/10/13 20:47:09 tm Exp $
2# used by print/ghostscript-agpl/Makefile 2# used by print/ghostscript-agpl/Makefile
3# used by fonts/ghostscript-cidfonts-ryumin/Makefile 3# used by fonts/ghostscript-cidfonts-ryumin/Makefile
4 4
5GS_VERSION= 9.54.0 5GS_VERSION= 9.55.0
cvs diff -r1.19 -r1.19.4.1 pkgsrc/print/ghostscript-agpl/PLIST (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/PLIST 2021/06/15 12:39:31 1.19
+++ pkgsrc/print/ghostscript-agpl/PLIST 2021/10/13 20:47:09 1.19.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.19 2021/06/15 12:39:31 mef Exp $ 1@comment $NetBSD: PLIST,v 1.19.4.1 2021/10/13 20:47:09 tm Exp $
2bin/dvipdf 2bin/dvipdf
3bin/eps2eps 3bin/eps2eps
4bin/gs 4bin/gs
5bin/gsbj 5bin/gsbj
6bin/gsc 6bin/gsc
7bin/gsdj 7bin/gsdj
8bin/gsdj500 8bin/gsdj500
9bin/gslj 9bin/gslj
10bin/gslp 10bin/gslp
11bin/gsnd 11bin/gsnd
12bin/gsx 12bin/gsx
13bin/lprsetup.sh 13bin/lprsetup.sh
14bin/pdf2dsc 14bin/pdf2dsc
@@ -23,27 +23,27 @@ bin/ps2pdf @@ -23,27 +23,27 @@ bin/ps2pdf
23bin/ps2pdf12 23bin/ps2pdf12
24bin/ps2pdf13 24bin/ps2pdf13
25bin/ps2pdf14 25bin/ps2pdf14
26bin/ps2pdfwr 26bin/ps2pdfwr
27bin/ps2ps 27bin/ps2ps
28bin/ps2ps2 28bin/ps2ps2
29bin/unix-lpr.sh 29bin/unix-lpr.sh
30include/ghostscript/gdevdsp.h 30include/ghostscript/gdevdsp.h
31include/ghostscript/gserrors.h 31include/ghostscript/gserrors.h
32include/ghostscript/iapi.h 32include/ghostscript/iapi.h
33include/ghostscript/ierrors.h 33include/ghostscript/ierrors.h
34lib/libgs.so 34lib/libgs.so
35lib/libgs.so.9 35lib/libgs.so.9
36lib/libgs.so.9.54 36lib/libgs.so.9.55
37man/de/man1/dvipdf.1 37man/de/man1/dvipdf.1
38man/de/man1/eps2eps.1 38man/de/man1/eps2eps.1
39man/de/man1/gsnd.1 39man/de/man1/gsnd.1
40man/de/man1/pdf2dsc.1 40man/de/man1/pdf2dsc.1
41man/de/man1/pdf2ps.1 41man/de/man1/pdf2ps.1
42man/de/man1/printafm.1 42man/de/man1/printafm.1
43man/de/man1/ps2ascii.1 43man/de/man1/ps2ascii.1
44man/de/man1/ps2pdf.1 44man/de/man1/ps2pdf.1
45man/de/man1/ps2pdf12.1 45man/de/man1/ps2pdf12.1
46man/de/man1/ps2pdf13.1 46man/de/man1/ps2pdf13.1
47man/de/man1/ps2pdf14.1 47man/de/man1/ps2pdf14.1
48man/de/man1/ps2ps.1 48man/de/man1/ps2ps.1
49man/man1/dvipdf.1 49man/man1/dvipdf.1
cvs diff -r1.35.4.2 -r1.35.4.3 pkgsrc/print/ghostscript-agpl/distinfo (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/distinfo 2021/10/05 21:20:57 1.35.4.2
+++ pkgsrc/print/ghostscript-agpl/distinfo 2021/10/13 20:47:09 1.35.4.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.35.4.2 2021/10/05 21:20:57 tm Exp $ 1$NetBSD: distinfo,v 1.35.4.3 2021/10/13 20:47:09 tm Exp $
2 2
3SHA1 (ghostscript-9.54.0.tar.xz) = 23cce513d4e80504da0778e4ce6f05db73ae2bee 3SHA1 (ghostscript-9.55.0.tar.xz) = 8bdb24d0dbb429c5bd574fa94a613206d5543ec9
4RMD160 (ghostscript-9.54.0.tar.xz) = 2229023643022c1e6a22db4cce3f5004abb245cd 4RMD160 (ghostscript-9.55.0.tar.xz) = 4e4833825b1645953afb56bbdde5fd14c6e04d6f
5SHA512 (ghostscript-9.54.0.tar.xz) = a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc 5SHA512 (ghostscript-9.55.0.tar.xz) = 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
6Size (ghostscript-9.54.0.tar.xz) = 56001768 bytes 6Size (ghostscript-9.55.0.tar.xz) = 67417724 bytes
7SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909 7SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
8SHA1 (patch-base_gsicc__lcms2.c) = 23f5f905b537c0d82d37e140ed45e352ab951d54 8SHA1 (patch-base_gsicc__lcms2.c) = 23f5f905b537c0d82d37e140ed45e352ab951d54
9SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516 9SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
10SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0 10SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0
11SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688 11SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688
12SHA1 (patch-base_unix-dll.mak) = 73b5ee7fcbc7940ce72f44b35417d624f7ae5bca 12SHA1 (patch-base_unix-dll.mak) = 73b5ee7fcbc7940ce72f44b35417d624f7ae5bca
13SHA1 (patch-configure) = 8de018c1f7978423faf0b8d2c52e590a5ee484fe 13SHA1 (patch-configure) = f3f2583ef56a01f4107fec75057b7fc1be519c39
14SHA1 (patch-devices_devs.mak) = e9937d401a278cc6d0a6d4cff78c526375bc18ca 14SHA1 (patch-devices_devs.mak) = e9937d401a278cc6d0a6d4cff78c526375bc18ca
cvs diff -r1.7 -r1.7.8.1 pkgsrc/print/ghostscript-agpl/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/patches/patch-configure 2020/09/29 14:29:42 1.7
+++ pkgsrc/print/ghostscript-agpl/patches/patch-configure 2021/10/13 20:47:09 1.7.8.1
@@ -1,68 +1,72 @@ @@ -1,68 +1,72 @@
1$NetBSD: patch-configure,v 1.7 2020/09/29 14:29:42 ryoon Exp $ 1$NetBSD: patch-configure,v 1.7.8.1 2021/10/13 20:47:09 tm Exp $
2 2
3Use system zlib for linking. 3Use system zlib for linking.
4Add rpath. 4Add rpath.
5Get all LDFLAGS for FreeType2. 5Get all LDFLAGS for FreeType2.
6Use correct install_name with path on Darwin. 6Use correct install_name with path on Darwin.
7 7
8--- configure.orig 2020-09-25 12:33:30.000000000 +0000 8--- configure.orig 2021-09-27 07:44:02.000000000 +0000
9+++ configure 9+++ configure
10@@ -4028,7 +4028,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR 10@@ -4049,7 +4049,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
11 CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)" 11 CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)"
12 CFLAGSAUX_PROFILETMP="\$(CFLAGS_PROFILE)" 12 CFLAGSAUX_PROFILETMP="\$(CFLAGS_PROFILE)"
13 LDFLAGSAUXTMP="\$(LDFLAGS)" 13 LDFLAGSAUXTMP="\$(LDFLAGS)"
14-AUXEXTRALIBSTMP="\$(EXTRALIBS)" 14-AUXEXTRALIBSTMP="\$(EXTRALIBS)"
15+AUXEXTRALIBSTMP="\$(EXTRALIBS) -lz" 15+AUXEXTRALIBSTMP="\$(EXTRALIBS) -lz"
16  16
17 # purposefully do not include "help" output for this 17 # purposefully do not include "help" output for this
18 # Check whether --enable-save_confaux was given. 18 # Check whether --enable-save_confaux was given.
19@@ -4660,9 +4660,7 @@ case $host in 19@@ -4681,9 +4681,7 @@ case $host in
20 CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" 20 CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
21 CFLAGS_LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" 21 CFLAGS_LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
22 # the trailing space is required! 22 # the trailing space is required!
23- if test $GCC = no; then 23- if test $GCC = no; then
24- SET_DT_SONAME="-h " 24- SET_DT_SONAME="-h "
25- fi 25- fi
26+ SET_DT_SONAME="-h," 26+ SET_DT_SONAME="-h,"
27 if test $GCC = yes; then 27 if test $GCC = yes; then
28 CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" 28 CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
29 CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" 29 CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
30@@ -7693,7 +7691,7 @@ fi 30@@ -7627,7 +7625,7 @@ fi
31 fi 31 fi
32  32
33 if test x$with_libpaper != xno; then 33 if test x$with_libpaper != xno; then
34- LIBS="$LIBS -lpaper" 34- LIBS="$LIBS -lpaper"
35+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper" 35+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
36  36
37 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h 37 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
38  38
39@@ -11620,10 +11618,10 @@ case $host in 39@@ -11587,11 +11585,11 @@ case $host in
40 ;; 40 ;;
41 *-darwin*) 41 *-darwin*)
42 DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS" 42 DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
43- GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GS_SONAME_MAJOR_MINOR)" 43- GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GS_SONAME_MAJOR_MINOR)"
44- PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PCL_SONAME_MAJOR_MINOR)" 44- PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PCL_SONAME_MAJOR_MINOR)"
45- XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(XPS_SONAME_MAJOR_MINOR)" 45- XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(XPS_SONAME_MAJOR_MINOR)"
46- PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GPDL_SONAME_MAJOR_MINOR)" 46- PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GPDL_SONAME_MAJOR_MINOR)"
 47- PDF_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PDF_SONAME_MAJOR_MINOR)"
47+ GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GS_SONAME_MAJOR_MINOR)" 48+ GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GS_SONAME_MAJOR_MINOR)"
48+ PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PCL_SONAME_MAJOR_MINOR)" 49+ PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PCL_SONAME_MAJOR_MINOR)"
49+ XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(XPS_SONAME_MAJOR_MINOR)" 50+ XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(XPS_SONAME_MAJOR_MINOR)"
50+ PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GPDL_SONAME_MAJOR_MINOR)" 51+ PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GPDL_SONAME_MAJOR_MINOR)"
 52+ PDF_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PDF_SONAME_MAJOR_MINOR)"
51 DYNAMIC_LIBS="" 53 DYNAMIC_LIBS=""
52 SO_LIB_EXT=".dylib" 54 SO_LIB_EXT=".dylib"
53 ;; 55 ;;
54@@ -11639,10 +11637,10 @@ case $host in 56@@ -11607,11 +11605,11 @@ case $host in
55 #fi 57 #fi
56 # ^^^ untested 58 # ^^^ untested
57 fi 59 fi
58- GS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR) $_ldflags" 60- GS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR) $_ldflags"
59- PCL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags" 61- PCL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags"
60- XPS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags" 62- XPS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags"
61- PDL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags" 63- PDL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags"
 64- PDF_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)"
62+ GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR) $_ldflags" 65+ GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR) $_ldflags"
63+ PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags" 66+ PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags"
64+ XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags" 67+ XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags"
65+ PDL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags" 68+ PDL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags"
 69+ PDF_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)"
66 DYNAMIC_LIBS="" 70 DYNAMIC_LIBS=""
67 SO_LIB_EXT=".so" 71 SO_LIB_EXT=".so"
68 ;; 72 ;;