svn commit: r430509 - in head: graphics/libcdr01 graphics/libetonyek01 graphics/libfreehand graphics/libfreehand/files lang/tcl86 net/freerdp1 net/freerdp1/files print/libmspub01 print/qpdf print/q...
Jan Beich
jbeich at FreeBSD.org
Tue Jan 3 18:43:21 UTC 2017
Author: jbeich
Date: Tue Jan 3 18:43:18 2017
New Revision: 430509
URL: https://svnweb.freebsd.org/changeset/ports/430509
Log:
Assume "pkg-config --static zlib" works after 9.x EOL
Many hacks simply removed dependency on zlib which broke static linking
if it was actually supported.
Deleted:
head/graphics/libfreehand/files/
head/print/qpdf/files/patch-libqpdf.pc.in
head/textproc/libabw/files/patch-libabw.pc.in
head/textproc/libe-book/files/
Modified:
head/graphics/libcdr01/Makefile (contents, props changed)
head/graphics/libetonyek01/Makefile (contents, props changed)
head/graphics/libfreehand/Makefile (contents, props changed)
head/lang/tcl86/Makefile (contents, props changed)
head/net/freerdp1/Makefile (contents, props changed)
head/net/freerdp1/files/patch-freerdp.pc.in (contents, props changed)
head/net/freerdp1/files/patch-winpr.pc.in (contents, props changed)
head/print/libmspub01/Makefile (contents, props changed)
head/print/qpdf/Makefile (contents, props changed)
head/security/libssh2/Makefile (contents, props changed)
head/textproc/libabw/Makefile (contents, props changed)
head/textproc/libe-book/Makefile (contents, props changed)
head/textproc/libvisio01/Makefile (contents, props changed)
head/www/spdylay/Makefile (contents, props changed)
Modified: head/graphics/libcdr01/Makefile
==============================================================================
--- head/graphics/libcdr01/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/graphics/libcdr01/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -2,7 +2,7 @@
PORTNAME= libcdr
PORTVERSION= 0.1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics devel
MASTER_SITES= LODEV
PKGNAMESUFFIX= 01
@@ -27,7 +27,4 @@ INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -Wno-long-long
-post-patch:
- @${REINPLACE_CMD} -e "s,zlib,,g" ${WRKSRC}/libcdr.pc.in
-
.include <bsd.port.mk>
Modified: head/graphics/libetonyek01/Makefile
==============================================================================
--- head/graphics/libetonyek01/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/graphics/libetonyek01/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -2,7 +2,7 @@
PORTNAME= libetonyek
PORTVERSION= 0.1.6
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
@@ -38,9 +38,6 @@ TEST_CONFIGURE_OFF= --disable-tests
.include <bsd.port.options.mk>
-post-patch:
- @${REINPLACE_CMD} -e "s,zlib,,g" ${WRKSRC}/libetonyek.pc.in
-
.if ${PORT_OPTIONS:MTEST}
post-build:
@cd ${WRKSRC}/src/test && ${MAKE_CMD} check
Modified: head/graphics/libfreehand/Makefile
==============================================================================
--- head/graphics/libfreehand/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/graphics/libfreehand/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -2,7 +2,7 @@
PORTNAME= libfreehand
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= LODEV
Modified: head/lang/tcl86/Makefile
==============================================================================
--- head/lang/tcl86/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/lang/tcl86/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -81,12 +81,6 @@ post-patch:
s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \
s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \
${PATCH_WRKSRC}/unix/tclConfig.sh.in
-# On FreeBSD 9, pkg-config --cflags tcl can't find zlib.
-.if ${OSVERSION} < 1000000
- ${REINPLACE_CMD} -e \
- 's|Requires.private: zlib >= 1.2.3||' \
- ${PATCH_WRKSRC}/unix/tcl.pc.in
-.endif
post-patch-TCLMAN-off:
@${FIND} ${PATCH_WRKSRC}/pkgs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
Modified: head/net/freerdp1/Makefile
==============================================================================
--- head/net/freerdp1/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/net/freerdp1/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -3,7 +3,7 @@
PORTNAME= freerdp
PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net comms ipv6
PKGNAMESUFFIX= 1
Modified: head/net/freerdp1/files/patch-freerdp.pc.in
==============================================================================
--- head/net/freerdp1/files/patch-freerdp.pc.in Tue Jan 3 18:43:02 2017 (r430508)
+++ head/net/freerdp1/files/patch-freerdp.pc.in Tue Jan 3 18:43:18 2017 (r430509)
@@ -6,7 +6,7 @@ Index: freerdp.pc.in
Version: @FREERDP_VERSION_FULL@
Requires:
-Requires.private: winpr zlib libssl
-+Requires.private: winpr1
++Requires.private: winpr zlib
Libs: -L${libdir} ${libs}
Libs.private: -ldl -lpthread
Cflags: -I${includedir}
Modified: head/net/freerdp1/files/patch-winpr.pc.in
==============================================================================
--- head/net/freerdp1/files/patch-winpr.pc.in Tue Jan 3 18:43:02 2017 (r430508)
+++ head/net/freerdp1/files/patch-winpr.pc.in Tue Jan 3 18:43:18 2017 (r430509)
@@ -1,11 +1,12 @@
Index: winpr.pc.in
--- winpr.pc.in.orig 2014-09-11 22:46:32 UTC
+++ winpr.pc.in
-@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Run
+@@ -9,7 +9,7 @@ Description: WinPR: Windows Portable Run
URL: http://www.freerdp.com/
Version: @WINPR_VERSION_FULL@
Requires:
-Requires.private: zlib libssl
++Requires.private: zlib
Libs: -L${libdir} ${libs}
Libs.private: -ldl -lrt -lm -lpthread
Cflags: -I${includedir}
Modified: head/print/libmspub01/Makefile
==============================================================================
--- head/print/libmspub01/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/print/libmspub01/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -2,7 +2,7 @@
PORTNAME= libmspub
PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print graphics devel
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
PKGNAMESUFFIX= 01
@@ -25,7 +25,4 @@ INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --disable-werror --without-docs
CPPFLAGS+= -I${LOCALBASE}/include
-post-patch:
- @${REINPLACE_CMD} -e "s,zlib,,g" ${WRKSRC}/libmspub.pc.in
-
.include <bsd.port.mk>
Modified: head/print/qpdf/Makefile
==============================================================================
--- head/print/qpdf/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/print/qpdf/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -3,6 +3,7 @@
PORTNAME= qpdf
PORTVERSION= 6.0.0
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF
Modified: head/security/libssh2/Makefile
==============================================================================
--- head/security/libssh2/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/security/libssh2/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -3,7 +3,7 @@
PORTNAME= libssh2
PORTVERSION= 1.8.0
-PORTEPOCH= 2
+PORTEPOCH= 3
CATEGORIES= security devel
MASTER_SITES= http://www.libssh2.org/download/ \
LOCAL/sbz
@@ -49,8 +49,4 @@ post-patch:
. endif
.endif
-post-build:
- @${REINPLACE_CMD} -E -e '/Requires.private:/{s/[[:<:]]zlib[[:>:]]//;s/,,/,/;s/ ,/ /;s/,$$//;}' \
- ${WRKSRC}/libssh2.pc
-
.include <bsd.port.post.mk>
Modified: head/textproc/libabw/Makefile
==============================================================================
--- head/textproc/libabw/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/textproc/libabw/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -2,7 +2,7 @@
PORTNAME= libabw
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= LODEV/${PORTNAME}
Modified: head/textproc/libe-book/Makefile
==============================================================================
--- head/textproc/libe-book/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/textproc/libe-book/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -2,7 +2,7 @@
PORTNAME= libe-book
PORTVERSION= 0.1.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc
MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/
Modified: head/textproc/libvisio01/Makefile
==============================================================================
--- head/textproc/libvisio01/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/textproc/libvisio01/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -2,7 +2,7 @@
PORTNAME= libvisio
PORTVERSION= 0.1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc devel
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
PKGNAMESUFFIX= 01
@@ -26,7 +26,4 @@ USE_GNOME= libxml2
USES= compiler:c++0x gmake gperf libtool pathfix perl5 pkgconfig tar:xz
INSTALL_TARGET= install-strip
-post-patch:
- @${REINPLACE_CMD} -e "s,zlib,,g" ${WRKSRC}/libvisio.pc.in
-
.include <bsd.port.mk>
Modified: head/www/spdylay/Makefile
==============================================================================
--- head/www/spdylay/Makefile Tue Jan 3 18:43:02 2017 (r430508)
+++ head/www/spdylay/Makefile Tue Jan 3 18:43:18 2017 (r430509)
@@ -3,6 +3,7 @@
PORTNAME= spdylay
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= www net
MASTER_SITES= https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \
LOCAL/sunpoet
@@ -32,9 +33,6 @@ USES= compiler:c++11-lang libtool pathf
PORTDOCS= *
-post-patch:
- @${REINPLACE_CMD} -e 's|^Requires.private: zlib$$|Libs.private: -L${LIBDIR} -lz|' ${WRKSRC}/lib/libspdylay.pc.in
-
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/examples/spdycli ${STAGEDIR}${PREFIX}/bin/
${INSTALL_DATA} ${WRKSRC}/shrpx.conf.sample ${STAGEDIR}${PREFIX}/etc/
More information about the svn-ports-all
mailing list