Received: by mail.netbsd.org (Postfix, from userid 605) id 2F17984D91; Fri, 27 Oct 2017 16:17:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AD5A884D63 for ; Fri, 27 Oct 2017 16:17:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ieNRL21ujwco for ; Fri, 27 Oct 2017 16:17:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2A2FB84CDD for ; Fri, 27 Oct 2017 16:17:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 255F8FBDE; Fri, 27 Oct 2017 16:17:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1509121070251700" MIME-Version: 1.0 Date: Fri, 27 Oct 2017 16:17:50 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/print/ghostscript-gpl To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20171027161750.255F8FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1509121070251700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Fri Oct 27 16:17:50 UTC 2017 Modified Files: pkgsrc/print/ghostscript-gpl: Makefile distinfo pkgsrc/print/ghostscript-gpl/patches: patch-ah Log Message: ghostscript-gpl: Fix zlib change fallout. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/ghostscript-gpl/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/ghostscript-gpl/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/ghostscript-gpl/patches/patch-ah Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1509121070251700 Content-Disposition: inline Content-Length: 3441 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/ghostscript-gpl/Makefile diff -u pkgsrc/print/ghostscript-gpl/Makefile:1.31 pkgsrc/print/ghostscript-gpl/Makefile:1.32 --- pkgsrc/print/ghostscript-gpl/Makefile:1.31 Thu Oct 26 07:01:33 2017 +++ pkgsrc/print/ghostscript-gpl/Makefile Fri Oct 27 16:17:49 2017 @@ -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__EXTE # 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 Index: pkgsrc/print/ghostscript-gpl/distinfo diff -u pkgsrc/print/ghostscript-gpl/distinfo:1.18 pkgsrc/print/ghostscript-gpl/distinfo:1.19 --- pkgsrc/print/ghostscript-gpl/distinfo:1.18 Thu Jun 8 01:28:10 2017 +++ pkgsrc/print/ghostscript-gpl/distinfo Fri Oct 27 16:17:49 2017 @@ -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) = a4af8e561b9 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 Index: pkgsrc/print/ghostscript-gpl/patches/patch-ah diff -u pkgsrc/print/ghostscript-gpl/patches/patch-ah:1.6 pkgsrc/print/ghostscript-gpl/patches/patch-ah:1.7 --- pkgsrc/print/ghostscript-gpl/patches/patch-ah:1.6 Tue Feb 24 08:21:07 2015 +++ pkgsrc/print/ghostscript-gpl/patches/patch-ah Fri Oct 27 16:17:49 2017 @@ -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 $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" --_----------=_1509121070251700--