Wed Mar 25 07:46:19 2020 UTC ()
ghostscript-agpl: get all LDFLAGS for FreeType2


(adam)
diff -r1.29 -r1.30 pkgsrc/print/ghostscript-agpl/distinfo
diff -r1.4 -r1.5 pkgsrc/print/ghostscript-agpl/patches/patch-configure
cvs diff -r1.29 -r1.30 pkgsrc/print/ghostscript-agpl/distinfo (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/distinfo 2020/03/24 16:34:45 1.29
+++ pkgsrc/print/ghostscript-agpl/distinfo 2020/03/25 07:46:19 1.30
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.29 2020/03/24 16:34:45 adam Exp $ 1$NetBSD: distinfo,v 1.30 2020/03/25 07:46:19 adam Exp $
2 2
3SHA1 (ghostscript-9.52.tar.xz) = dd816e2fab38e99b86d2872838bf73e49420cfb8 3SHA1 (ghostscript-9.52.tar.xz) = dd816e2fab38e99b86d2872838bf73e49420cfb8
4RMD160 (ghostscript-9.52.tar.xz) = b0a320a71b7de06043290e150307733ed7f591b9 4RMD160 (ghostscript-9.52.tar.xz) = b0a320a71b7de06043290e150307733ed7f591b9
5SHA512 (ghostscript-9.52.tar.xz) = 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67 5SHA512 (ghostscript-9.52.tar.xz) = 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
6Size (ghostscript-9.52.tar.xz) = 39711040 bytes 6Size (ghostscript-9.52.tar.xz) = 39711040 bytes
7SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909 7SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
8SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516 8SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
9SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0 9SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0
10SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688 10SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688
11SHA1 (patch-base_unix-dll.mak) = 73b5ee7fcbc7940ce72f44b35417d624f7ae5bca 11SHA1 (patch-base_unix-dll.mak) = 73b5ee7fcbc7940ce72f44b35417d624f7ae5bca
12SHA1 (patch-configure) = 218c3f36faca73d3145fe6a0aecab0a23d5a8ae0 12SHA1 (patch-configure) = ed5213adcb44070a77fc56297f4172f73dd2a8e7
13SHA1 (patch-devices_devs.mak) = e9937d401a278cc6d0a6d4cff78c526375bc18ca 13SHA1 (patch-devices_devs.mak) = e9937d401a278cc6d0a6d4cff78c526375bc18ca
cvs diff -r1.4 -r1.5 pkgsrc/print/ghostscript-agpl/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/patches/patch-configure 2020/03/24 16:34:45 1.4
+++ pkgsrc/print/ghostscript-agpl/patches/patch-configure 2020/03/25 07:46:19 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-configure,v 1.4 2020/03/24 16:34:45 adam Exp $ 1$NetBSD: patch-configure,v 1.5 2020/03/25 07:46:19 adam Exp $
2 2
3Use system zlib for linking. 3Use system zlib for linking.
4Add rpath. 4Add rpath.
 5Get all LDFLAGS for FreeType2.
5Use correct install_name with path on Darwin. 6Use correct install_name with path on Darwin.
6 7
7--- configure.orig 2020-03-19 08:22:25.000000000 +0000 8--- configure.orig 2020-03-19 08:22:25.000000000 +0000
8+++ configure 9+++ configure
9@@ -3917,7 +3917,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR 10@@ -3917,7 +3917,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
10 CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)" 11 CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)"
11 CFLAGSAUX_PROFILETMP="\$(CFLAGS_PROFILE)" 12 CFLAGSAUX_PROFILETMP="\$(CFLAGS_PROFILE)"
12 LDFLAGSAUXTMP="\$(LDFLAGS)" 13 LDFLAGSAUXTMP="\$(LDFLAGS)"
13-AUXEXTRALIBSTMP="\$(EXTRALIBS)" 14-AUXEXTRALIBSTMP="\$(EXTRALIBS)"
14+AUXEXTRALIBSTMP="\$(EXTRALIBS) -lz" 15+AUXEXTRALIBSTMP="\$(EXTRALIBS) -lz"
15  16
16 # purposefully do not include "help" output for this 17 # purposefully do not include "help" output for this
17 # Check whether --enable-save_confaux was given. 18 # Check whether --enable-save_confaux was given.
@@ -25,26 +26,35 @@ Use correct install_name with path on Da @@ -25,26 +26,35 @@ Use correct install_name with path on Da
25+ SET_DT_SONAME="-h," 26+ SET_DT_SONAME="-h,"
26 if test $ac_cv_c_compiler_gnu = yes; then 27 if test $ac_cv_c_compiler_gnu = yes; then
27 CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" 28 CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
28 CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" 29 CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
29@@ -7022,7 +7020,7 @@ fi 30@@ -7022,7 +7020,7 @@ fi
30 fi 31 fi
31  32
32 if test x$with_libpaper != xno; then 33 if test x$with_libpaper != xno; then
33- LIBS="$LIBS -lpaper" 34- LIBS="$LIBS -lpaper"
34+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper" 35+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
35  36
36 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h 37 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
37  38
 39@@ -7324,7 +7322,7 @@ $as_echo_n "checking for system freetype
 40 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 41 $as_echo "yes" >&6; }
 42 FT_CFLAGS="$CFLAGS `$PKGCONFIG --cflags freetype2`"
 43- FT_LIBS="`$PKGCONFIG --libs-only-l freetype2`"
 44+ FT_LIBS="`$PKGCONFIG --libs freetype2`"
 45 FT_BRIDGE=1
 46 SHARE_FT=1
 47 else
38@@ -10881,10 +10879,10 @@ case $host in 48@@ -10881,10 +10879,10 @@ case $host in
39 ;; 49 ;;
40 *-darwin*) 50 *-darwin*)
41 DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS" 51 DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
42- GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)" 52- GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)"
43- PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)" 53- PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)"
44- XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_SONAME_MAJOR_MINOR)" 54- XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_SONAME_MAJOR_MINOR)"
45- PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GPDL_SONAME_MAJOR_MINOR)" 55- PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GPDL_SONAME_MAJOR_MINOR)"
46+ GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GS_SONAME_MAJOR_MINOR)" 56+ GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GS_SONAME_MAJOR_MINOR)"
47+ PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PCL_SONAME_MAJOR_MINOR)" 57+ PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PCL_SONAME_MAJOR_MINOR)"
48+ XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(XPS_SONAME_MAJOR_MINOR)" 58+ XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(XPS_SONAME_MAJOR_MINOR)"
49+ PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GPDL_SONAME_MAJOR_MINOR)" 59+ PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GPDL_SONAME_MAJOR_MINOR)"
50 DYNAMIC_LIBS="" 60 DYNAMIC_LIBS=""