svn commit: r430483 - in head: audio/forked-daapd audio/sayonara biology/vcftools databases/monetdb/files devel/bennugd-core devel/bennugd-modules devel/liborcus devel/liborcus07 devel/love emulato...
Jan Beich
jbeich at FreeBSD.org
Tue Jan 3 17:06:53 UTC 2017
Author: jbeich
Date: Tue Jan 3 17:06:49 2017
New Revision: 430483
URL: https://svnweb.freebsd.org/changeset/ports/430483
Log:
Assume "pkg-config zlib" works after 9.x reached EOL
Many ports passed ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-L/usr/lib -lz"
which is unsafe at least with lang/gcc* that override some system headers
and have newer libgcc_s.so that our old version in base may not be
forward-compatible with.
Deleted:
head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile
head/security/openvas-libraries/files/patch-base-CMakeLists.txt
Modified:
head/audio/forked-daapd/Makefile (contents, props changed)
head/audio/sayonara/Makefile (contents, props changed)
head/biology/vcftools/Makefile (contents, props changed)
head/databases/monetdb/files/patch-configure (contents, props changed)
head/devel/bennugd-core/Makefile (contents, props changed)
head/devel/bennugd-modules/Makefile (contents, props changed)
head/devel/liborcus/Makefile (contents, props changed)
head/devel/liborcus07/Makefile (contents, props changed)
head/devel/love/Makefile (contents, props changed)
head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile (contents, props changed)
head/games/easyrpg-player/Makefile (contents, props changed)
head/graphics/zathura/Makefile (contents, props changed)
head/mail/notmuch/Makefile (contents, props changed)
head/multimedia/mkvtoolnix/Makefile (contents, props changed)
head/net-mgmt/seafile-client/files/patch-configure.ac (contents, props changed)
head/net-mgmt/seafile-server/files/patch-configure.ac (contents, props changed)
head/net-p2p/transmission-cli/Makefile (contents, props changed)
head/news/nzbget/Makefile (contents, props changed)
head/news/pan/Makefile (contents, props changed)
head/print/cups-filters/Makefile (contents, props changed)
head/print/libmspub01/Makefile (contents, props changed)
head/textproc/libe-book/Makefile (contents, props changed)
head/www/aria2/Makefile (contents, props changed)
head/www/nghttp2/Makefile (contents, props changed)
head/www/spdylay/Makefile (contents, props changed)
Modified: head/audio/forked-daapd/Makefile
==============================================================================
--- head/audio/forked-daapd/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/audio/forked-daapd/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -53,14 +53,7 @@ LASTFM_CONFIGURE_ENABLE=lastfm
LASTFM_LIB_DEPENDS= libcurl.so:ftp/curl
MPD_CONFIGURE_ENABLE= mpd
-.include <bsd.port.pre.mk>
-
-# Ensure FreeBSD 9 can find zlib library
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000712
-CONFIGURE_ENV+= ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
-.endif
-
post-install:
@${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/audio/sayonara/Makefile
==============================================================================
--- head/audio/sayonara/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/audio/sayonara/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -30,9 +30,5 @@ post-patch:
${WRKSRC}/resources/CMakeLists.txt
@${REINPLACE_CMD} -e '/DESTINATION/s,/usr/,,' \
${WRKSRC}/src/GUI/Resources/Icons/CMakeLists.txt
-.if !exists(/usr/libdata/pkgconfig/zlib.pc)
- @${REINPLACE_CMD} -e '/zlib/s/PKG_CHECK_MODULES/FIND_PACKAGE/' \
- ${WRKSRC}/src/Helper/Compressor/CMakeLists.txt
-.endif
.include <bsd.port.mk>
Modified: head/biology/vcftools/Makefile
==============================================================================
--- head/biology/vcftools/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/biology/vcftools/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -14,9 +14,6 @@ LICENSE= LGPL3
USES= autoreconf gmake perl5 pkgconfig
GNU_CONFIGURE= yes
-# No zlib.pc on 9.x
-CONFIGURE_ENV= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
-
USE_GITHUB= yes
.include <bsd.port.mk>
Modified: head/databases/monetdb/files/patch-configure
==============================================================================
--- head/databases/monetdb/files/patch-configure Tue Jan 3 16:37:20 2017 (r430482)
+++ head/databases/monetdb/files/patch-configure Tue Jan 3 17:06:49 2017 (r430483)
@@ -9,90 +9,3 @@
*)
if test "x$enable_jaql" = xyes; then
as_fn_error $? "MonetDB/JAQL requires flex" "$LINENO" 5
-@@ -17802,6 +17802,7 @@
- /* end confdefs.h. */
- #include <stdio.h>
- #include <bzlib.h>
-+#include <zlib.h>
- int
- main ()
- {
-@@ -20575,76 +20576,9 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
--$as_echo_n "checking for zlib... " >&6; }
--
--if test -n "$zlib_CFLAGS"; then
-- pkg_cv_zlib_CFLAGS="$zlib_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
-- test "x$?" != "x0" && pkg_failed=yes
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$zlib_LIBS"; then
-- pkg_cv_zlib_LIBS="$zlib_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
-- test "x$?" != "x0" && pkg_failed=yes
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1`
-- else
-- zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$zlib_PKG_ERRORS" >&5
--
-- have_zlib="no"; why_have_zlib="(zlib not found)"
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- have_zlib="no"; why_have_zlib="(zlib not found)"
--else
-- zlib_CFLAGS=$pkg_cv_zlib_CFLAGS
-- zlib_LIBS=$pkg_cv_zlib_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
- have_zlib="yes"
--fi
--if test x"$have_zlib" = x"yes" ; then
-+
-+if x"$have_zlib" = x"yes" ; then
-
- $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
-
Modified: head/devel/bennugd-core/Makefile
==============================================================================
--- head/devel/bennugd-core/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/devel/bennugd-core/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -12,7 +12,7 @@ DISTNAME= bennugd-${PORTVERSION}
MAINTAINER= amdmi3 at FreeBSD.org
COMMENT= High level open source game development suite, core libs
-USES= dos2unix libtool tar:bzip2
+USES= dos2unix libtool pkgconfig tar:bzip2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --bindir="${PREFIX}/libexec"
SUB_FILES= bgdc bgdi
@@ -23,8 +23,6 @@ INSTALL_TARGET= install-strip
ONLY_FOR_ARCHS= i386
ONLY_FOR_ARCHS_REASON= Segfaults on !i386
-CONFIGURE_ENV= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
-
WRKSRC= ${WRKDIR}/bennugd/${PORTNAME}
PLIST_FILES= bin/bgdc bin/bgdi \
Modified: head/devel/bennugd-modules/Makefile
==============================================================================
--- head/devel/bennugd-modules/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/devel/bennugd-modules/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd"
-CONFIGURE_ENV= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
DOS2UNIX_GLOB= *.c
INSTALL_TARGET= install-strip
Modified: head/devel/liborcus/Makefile
==============================================================================
--- head/devel/liborcus/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/devel/liborcus/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -23,7 +23,6 @@ CONFIGURE_ARGS= --disable-spreadsheet-mo
--with-boost="${LOCALBASE}" \
--with-boost-system=boost_system \
--disable-python
-CONFIGURE_ENV= ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Modified: head/devel/liborcus07/Makefile
==============================================================================
--- head/devel/liborcus07/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/devel/liborcus07/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -26,7 +26,6 @@ INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --disable-spreadsheet-model --disable-werror \
--with-boost="${LOCALBASE}" \
--with-boost-system=boost_system
-CONFIGURE_ENV= ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Modified: head/devel/love/Makefile
==============================================================================
--- head/devel/love/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/devel/love/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -27,8 +27,6 @@ USES= compiler:c++11-lib desktop-file-u
USE_SDL= sdl2
USE_GL= gl glu
GNU_CONFIGURE= yes
-CONFIGURE_ENV= zlib_CFLAGS=" " \
- zlib_LIBS="-lz"
WRKSRC= ${WRKDIR}/love-${PORTVERSION}
INSTALL_TARGET= install-strip
Modified: head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile
==============================================================================
--- head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -17,17 +17,6 @@
endif
ifeq ($(origin PKG_CONFIG), undefined)
-@@ -199,6 +200,10 @@
- ZLIB_LDLIBS += -lz
- endif
-
-+ifeq ($(OS), FREEBSD) # use system zlib on FreeBSD
-+ ZLIB_LDLIBS += -lz
-+endif
-+
- ifeq ($(origin ZLIB_CFLAGS) $(origin ZLIB_LDLIBS), undefined undefined)
- ifeq ($(shell $(PKG_CONFIG) --modversion zlib 2>/dev/null),)
- $(error No zlib development libraries found!)
@@ -292,8 +297,8 @@
endif
Modified: head/games/easyrpg-player/Makefile
==============================================================================
--- head/games/easyrpg-player/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/games/easyrpg-player/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -38,16 +38,10 @@ PORTDOCS= AUTHORS README
OPTIONS_DEFINE= DOCS
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-CONFIGURE_ENV+= ZLIB_CFLAGS=" " ZLIB_LIBS=-lz
-.endif
-
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/zathura/Makefile
==============================================================================
--- head/graphics/zathura/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/graphics/zathura/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -24,8 +24,6 @@ USES= compiler:c11 gmake pathfix pkgcon
PATHFIX_MAKEFILEIN= Makefile
MAKE_ENV= SFLAGS="${STRIP}" \
RSTTOMAN=${LOCALBASE}/bin/rst2man \
- ZLIB_INC= \
- ZLIB_LIB=-lz \
WITH_SYNCTEX=1
CPPFLAGS+= -DWITH_SYNCTEX
Modified: head/mail/notmuch/Makefile
==============================================================================
--- head/mail/notmuch/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/mail/notmuch/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -68,12 +68,6 @@ MUTT_USE= PERL=yes
RUBY_USE= RUBY=yes
ZSH_CONFIGURE_WITH= zsh-completion
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000
-CONFIGURE_ENV= zlib_cflags="" zlib_ldflags="-lz" PKG_CONFIG_PATH=""
-.endif
-
do-build-MUTT-on:
${MAKE_CMD} -C ${WRKSRC}/contrib/notmuch-mutt all
${GZIP_CMD} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1
@@ -86,4 +80,4 @@ post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/multimedia/mkvtoolnix/Makefile
==============================================================================
--- head/multimedia/mkvtoolnix/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/multimedia/mkvtoolnix/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -25,7 +25,7 @@ USES= compiler:c++14-lang iconv localba
GNU_CONFIGURE= yes
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS= yes
-CONFIGURE_ENV+= ac_cv_path_PO4A=no ZLIB_CFLAGS=-I/usr/include ZLIB_LIBS=-lz
+CONFIGURE_ENV+= ac_cv_path_PO4A=no
CONFIGURE_ARGS= --without-curl \
--with-boost=${LOCALBASE} \
--with-boost-filesystem=boost_filesystem \
Modified: head/net-mgmt/seafile-client/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/seafile-client/files/patch-configure.ac Tue Jan 3 16:37:20 2017 (r430482)
+++ head/net-mgmt/seafile-client/files/patch-configure.ac Tue Jan 3 17:06:49 2017 (r430483)
@@ -38,21 +38,19 @@
AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
-@@ -193,6 +207,9 @@ if test "$bwin32" = true; then
+@@ -193,6 +207,8 @@ if test "$bwin32" = true; then
LIB_MAC=
MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
LIB_CRYPT32=-lcrypt32
-+ ZLIB_LIBS=
+ LIB_INOTIFY=
+ LIB_KVM=
elif test "$bmac" = true ; then
LIB_WS32=
LIB_GDI32=
-@@ -207,6 +224,26 @@ elif test "$bmac" = true ; then
+@@ -207,6 +224,24 @@ elif test "$bmac" = true ; then
LIB_MAC="-framework CoreServices"
LIB_CRYPT32=
LIB_ICONV=-liconv
-+ ZLIB_LIBS=
+ LIB_INOTIFY=
+ LIB_KVM=
+elif test "$bbsd" = true ; then
@@ -69,51 +67,26 @@
+ MSVC_CFLAGS=
+ LIB_CRYPT32=
+ LIB_ICONV=-liconv
-+ ZLIB_LIBS=-lz
+ LIB_INOTIFY=-linotify
+ LIB_KVM=-lkvm
else
LIB_WS32=
LIB_GDI32=
-@@ -220,6 +257,9 @@ else
+@@ -220,6 +257,8 @@ else
LIB_MAC=
MSVC_CFLAGS=
LIB_CRYPT32=
-+ ZLIB_LIBS=-lz
+ LIB_INOTIFY=-linotify
+ LIB_KVM=
fi
AC_SUBST(LIB_WS32)
-@@ -232,6 +272,9 @@ AC_SUBST(LIB_IPHLPAPI)
+@@ -232,6 +272,8 @@ AC_SUBST(LIB_IPHLPAPI)
AC_SUBST(LIB_SHELL32)
AC_SUBST(LIB_PSAPI)
AC_SUBST(LIB_MAC)
-+AC_SUBST(ZLIB_LIBS)
+AC_SUBST(LIB_INOTIFY)
+AC_SUBST(LIB_KVM)
AC_SUBST(MSVC_CFLAGS)
AC_SUBST(LIB_CRYPT32)
AC_SUBST(LIB_ICONV)
-@@ -246,7 +289,9 @@ ZDB_REQUIRED=2.10
- #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
- CURL_REQUIRED=7.17
- FUSE_REQUIRED=2.7.3
-+if test "$blinux" = true ; then
- ZLIB_REQUIRED=1.2.0
-+fi
-
- PKG_CHECK_MODULES(SSL, [openssl])
- AC_SUBST(SSL_CFLAGS)
-@@ -276,9 +321,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >=
- AC_SUBST(LIBEVENT_CFLAGS)
- AC_SUBST(LIBEVENT_LIBS)
-
-+if test "$blinux" = true ; then
- PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
- AC_SUBST(ZLIB_CFLAGS)
- AC_SUBST(ZLIB_LIBS)
-+fi
-
- if test x${compile_python} = xyes; then
- AM_PATH_PYTHON([2.6])
Modified: head/net-mgmt/seafile-server/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/seafile-server/files/patch-configure.ac Tue Jan 3 16:37:20 2017 (r430482)
+++ head/net-mgmt/seafile-server/files/patch-configure.ac Tue Jan 3 17:06:49 2017 (r430483)
@@ -38,21 +38,19 @@
AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
-@@ -134,6 +148,9 @@ if test "$bwin32" = true; then
+@@ -134,6 +148,8 @@ if test "$bwin32" = true; then
LIB_MAC=
MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
LIB_CRYPT32=-lcrypt32
-+ ZLIB_LIBS=
+ LIB_INOTIFY=
+ LIB_KVM=
LIB_ICONV=-liconv
elif test "$bmac" = true ; then
LIB_WS32=
-@@ -149,6 +166,26 @@ elif test "$bmac" = true ; then
+@@ -149,6 +166,24 @@ elif test "$bmac" = true ; then
LIB_MAC="-framework CoreServices"
LIB_CRYPT32=
LIB_ICONV=-liconv
-+ ZLIB_LIBS=
+ LIB_INOTIFY=
+ LIB_KVM=
+elif test "$bbsd" = true ; then
@@ -69,51 +67,26 @@
+ MSVC_CFLAGS=
+ LIB_CRYPT32=
+ LIB_ICONV=-liconv
-+ ZLIB_LIBS=-lz
+ LIB_INOTIFY=-linotify
+ LIB_KVM=-lkvm
else
LIB_WS32=
LIB_GDI32=
-@@ -162,6 +199,9 @@ else
+@@ -162,6 +199,8 @@ else
LIB_MAC=
MSVC_CFLAGS=
LIB_CRYPT32=
-+ ZLIB_LIBS=-lz
+ LIB_INOTIFY=-linotify
+ LIB_KVM=
fi
AC_SUBST(LIB_WS32)
-@@ -174,6 +214,9 @@ AC_SUBST(LIB_IPHLPAPI)
+@@ -174,6 +214,8 @@ AC_SUBST(LIB_IPHLPAPI)
AC_SUBST(LIB_SHELL32)
AC_SUBST(LIB_PSAPI)
AC_SUBST(LIB_MAC)
-+AC_SUBST(ZLIB_LIBS)
+AC_SUBST(LIB_INOTIFY)
+AC_SUBST(LIB_KVM)
AC_SUBST(MSVC_CFLAGS)
AC_SUBST(LIB_CRYPT32)
AC_SUBST(LIB_ICONV)
-@@ -188,7 +231,9 @@ ZDB_REQUIRED=2.10
- #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
- CURL_REQUIRED=7.17
- FUSE_REQUIRED=2.7.3
-+if test "$blinux" = true ; then
- ZLIB_REQUIRED=1.2.0
-+fi
-
- PKG_CHECK_MODULES(SSL, [openssl])
- AC_SUBST(SSL_CFLAGS)
-@@ -218,9 +263,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >=
- AC_SUBST(LIBEVENT_CFLAGS)
- AC_SUBST(LIBEVENT_LIBS)
-
-+if test "$blinux" = true ; then
- PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
- AC_SUBST(ZLIB_CFLAGS)
- AC_SUBST(ZLIB_LIBS)
-+fi
-
- if test x${compile_python} = xyes; then
- AM_PATH_PYTHON([2.6])
Modified: head/net-p2p/transmission-cli/Makefile
==============================================================================
--- head/net-p2p/transmission-cli/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/net-p2p/transmission-cli/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -44,8 +44,7 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/trans
USES+= gmake iconv libtool localbase pkgconfig
GNU_CONFIGURE= yes
LIBS+= ${ICONV_LIB}
-CONFIGURE_ENV= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz" \
- ${ICONV_LIB:C at .+@ac_cv_func_iconv=yes@}
+CONFIGURE_ENV= ${ICONV_LIB:C at .+@ac_cv_func_iconv=yes@}
CONFIGURE_ARGS= --without-inotify \
--enable-external-b64 \
--enable-external-dht \
Modified: head/news/nzbget/Makefile
==============================================================================
--- head/news/nzbget/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/news/nzbget/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -60,8 +60,6 @@ CONFIGURE_ARGS+= --disable-sigchld-handl
.if ${OSVERSION} < 1000500
USE_GCC= yes
-CONFIGURE_ENV+= zlib_LIBS='-lz ' \
- zlib_CFLAGS=' '
.endif
post-install:
Modified: head/news/pan/Makefile
==============================================================================
--- head/news/pan/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/news/pan/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -22,8 +22,6 @@ USE_GNOME= intlhack
USE_GCC= any
GNU_CONFIGURE= yes
LDFLAGS+= -lgnuregex ${ICONV_LIB}
-CONFIGURE_ENV+= ZLIB_CFLAGS="-I/usr/include" \
- ZLIB_LIBS="-L/usr/lib -lz"
OPTIONS_DEFINE= GTKSPELL GNUTLS NLS
OPTIONS_RADIO= GTK
Modified: head/print/cups-filters/Makefile
==============================================================================
--- head/print/cups-filters/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/print/cups-filters/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -29,8 +29,7 @@ SHEBANG_FILES= filter/braille/drivers/ge
USE_GNOME= glib20
USE_RC_SUBR= cups_browsed
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-shell=/bin/sh \
- ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
+CONFIGURE_ARGS= --with-shell=/bin/sh
INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/print/libmspub01/Makefile
==============================================================================
--- head/print/libmspub01/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/print/libmspub01/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -23,7 +23,6 @@ USES= compiler:c++0x libtool pathfix pk
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --disable-werror --without-docs
-CONFIGURE_ENV= ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
Modified: head/textproc/libe-book/Makefile
==============================================================================
--- head/textproc/libe-book/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/textproc/libe-book/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -2,7 +2,7 @@
PORTNAME= libe-book
PORTVERSION= 0.1.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc
MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/
@@ -23,7 +23,6 @@ USES= compiler:c++11-lang gmake gperf l
tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= ZLIB_CFLAGS="-DWEHAVEZLIBINBASE" ZLIB_LIBS="-DWEDOHAVEIT"
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --disable-werror --disable-tests
CPPFLAGS+= -I${LOCALBASE}/include -DBOOST_ERROR_CODE_HEADER_ONLY
Modified: head/www/aria2/Makefile
==============================================================================
--- head/www/aria2/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/www/aria2/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -29,8 +29,6 @@ CONFIGURE_ARGS= --disable-epoll --enable
--without-libnettle --without-libuv
CONFIGURE_ENV= OPENSSL_CFLAGS=-I${OPENSSLINC} \
OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
- ZLIB_CFLAGS=-I${INCLUDEDIR} \
- ZLIB_LIBS="-L${LIBDIR} -lz" \
ac_cv_path_RST2HTML=no
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
Modified: head/www/nghttp2/Makefile
==============================================================================
--- head/www/nghttp2/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/www/nghttp2/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -24,9 +24,7 @@ SPDY_IMPLIES= APP
CONFIGURE_ARGS= --disable-python-bindings
CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
- OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
- ZLIB_CFLAGS="-I${INCLUDEDIR}" \
- ZLIB_LIBS="-L${LIBDIR} -lz"
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_CXXSTD= c++11
Modified: head/www/spdylay/Makefile
==============================================================================
--- head/www/spdylay/Makefile Tue Jan 3 16:37:20 2017 (r430482)
+++ head/www/spdylay/Makefile Tue Jan 3 17:06:49 2017 (r430483)
@@ -22,9 +22,7 @@ BROKEN_sparc64= does not build: fails t
CONFIGURE_ARGS= --enable-examples \
--enable-src
CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
- OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
- ZLIB_CFLAGS="-I${INCLUDEDIR}" \
- ZLIB_LIBS="-L${LIBDIR} -lz"
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_CXXSTD= c++11
More information about the svn-ports-all
mailing list