diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-10-27 16:17:49 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-10-27 16:17:49 +0000 |
| commit | 40ed827e8459f4975a1fba7ad054d7ad4d2b95df (patch) | |
| tree | 67182495948e97196fb0d4a27d11af7ea9c402fb /print | |
| parent | 20b6ad1ceb091f0274b88a98872b8d55aee5ea8e (diff) | |
| download | pkgsrc-40ed827e8459f4975a1fba7ad054d7ad4d2b95df.tar.gz | |
ghostscript-gpl: Fix zlib change fallout.
Diffstat (limited to 'print')
| -rw-r--r-- | print/ghostscript-gpl/Makefile | 5 | ||||
| -rw-r--r-- | print/ghostscript-gpl/distinfo | 4 | ||||
| -rw-r--r-- | print/ghostscript-gpl/patches/patch-ah | 20 |
3 files changed, 24 insertions, 5 deletions
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile index 083b5e1036e..093f702ac28 100644 --- a/print/ghostscript-gpl/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2017/10/26 07:01:33 maya Exp $ +# $NetBSD: Makefile,v 1.32 2017/10/27 16:17:49 jperkin Exp $ DISTNAME= ghostscript-${GS_VERSION} PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-gpl/} @@ -84,7 +84,8 @@ CPPFLAGS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ # require linking against libiconv when it should do so. BUILDLINK_TRANSFORM.IRIX+= l:fontconfig:fontconfig:iconv -CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib +CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib +CONFIGURE_ENV+= ZLIB_DIR=${BUILDLINK_PREFIX.zlib}/lib # On OpenBSD 5.3, libxcb is required libXt. LDFLAGS.OpenBSD+= -lxcb diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo index 0a2ffab6804..32185f00ef7 100644 --- a/print/ghostscript-gpl/distinfo +++ b/print/ghostscript-gpl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2017/06/08 01:28:10 khorben Exp $ +$NetBSD: distinfo,v 1.19 2017/10/27 16:17:49 jperkin Exp $ SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d @@ -17,7 +17,7 @@ SHA1 (patch-CVE-2017-5951) = a4af8e561b9f5a6a330fbc2f915257bf5ba3cb2a SHA1 (patch-CVE-2017-6196) = 311d9236dd5abcd48ae0f412bf481e105b6207dc SHA1 (patch-CVE-2017-7207) = 31f4a73b49b52942385eaa3c8cf2a94b5bbde6df SHA1 (patch-af) = a556b774993c72481284e0d0cce222c61be4ea94 -SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52 +SHA1 (patch-ah) = 7548f6f78b8029febec044bc11214f9d6674c9d3 SHA1 (patch-ai) = 3962a3acac1d4537dbbe3fc3b205aba87387d485 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 d51df44828b..87784921a5b 100644 --- a/print/ghostscript-gpl/patches/patch-ah +++ b/print/ghostscript-gpl/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.6 2015/02/24 08:21:07 markd Exp $ +$NetBSD: patch-ah,v 1.7 2017/10/27 16:17:49 jperkin Exp $ (1) First chunk to fix the X11_TYPE=native problem, which freetype2 in /usr/X11R7/ is way old, and work around to @@ -57,6 +57,24 @@ $NetBSD: patch-ah,v 1.6 2015/02/24 08:21:07 markd Exp $ $as_echo "#define USE_LIBPAPER 1" >>confdefs.h +@@ -5832,7 +5835,7 @@ if ${ac_cv_lib_z_deflate+:} false; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" ++LIBS="-L${ZLIB_DIR} -Wl,-R${ZLIB_DIR} -lz $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5871,7 +5874,7 @@ if test "x$ac_cv_header_zlib_h" = xyes; + cat >>confdefs.h <<_ACEOF + #define HAVE_ZLIB_H 1 + _ACEOF +- SHARE_ZLIB=1; AUX_SHARED_ZLIB="-l\$(ZLIB_NAME)" ++ SHARE_ZLIB=1; AUX_SHARED_ZLIB="-L${ZLIB_DIR} -Wl,-R${ZLIB_DIR} -l\$(ZLIB_NAME)" + fi + + done @@ -6474,7 +6477,9 @@ done LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak" LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak" |