aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-01-03 18:43:18 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-01-03 18:43:18 +0000
commit417eff8ffbb134c0eceb884c13aeecebbcdfbf2b (patch)
treea2cbd0524028e8dab67072808b343a9acf54ce58
parentb557ec87bb860b1575ae5b0114ea8c037ca358f9 (diff)
downloadports-417eff8ffbb134c0eceb884c13aeecebbcdfbf2b.tar.gz
ports-417eff8ffbb134c0eceb884c13aeecebbcdfbf2b.zip
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.
Notes
Notes: svn path=/head/; revision=430509
-rw-r--r--graphics/libcdr01/Makefile5
-rw-r--r--graphics/libetonyek01/Makefile5
-rw-r--r--graphics/libfreehand/Makefile2
-rw-r--r--graphics/libfreehand/files/patch-libfreehand.pc.in8
-rw-r--r--lang/tcl86/Makefile6
-rw-r--r--net/freerdp1/Makefile2
-rw-r--r--net/freerdp1/files/patch-freerdp.pc.in2
-rw-r--r--net/freerdp1/files/patch-winpr.pc.in3
-rw-r--r--print/libmspub01/Makefile5
-rw-r--r--print/qpdf/Makefile1
-rw-r--r--print/qpdf/files/patch-libqpdf.pc.in11
-rw-r--r--security/libssh2/Makefile6
-rw-r--r--textproc/libabw/Makefile2
-rw-r--r--textproc/libabw/files/patch-libabw.pc.in8
-rw-r--r--textproc/libe-book/Makefile2
-rw-r--r--textproc/libe-book/files/patch-libe-book.pc.in8
-rw-r--r--textproc/libvisio01/Makefile5
-rw-r--r--www/spdylay/Makefile4
18 files changed, 14 insertions, 71 deletions
diff --git a/graphics/libcdr01/Makefile b/graphics/libcdr01/Makefile
index 938a5664c55e..22ef60f86f19 100644
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@@ -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>
diff --git a/graphics/libetonyek01/Makefile b/graphics/libetonyek01/Makefile
index 49f4f746bdea..31b6b48d610b 100644
--- a/graphics/libetonyek01/Makefile
+++ b/graphics/libetonyek01/Makefile
@@ -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
diff --git a/graphics/libfreehand/Makefile b/graphics/libfreehand/Makefile
index 820d53ffba8d..aa6c73c94970 100644
--- a/graphics/libfreehand/Makefile
+++ b/graphics/libfreehand/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libfreehand
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= LODEV
diff --git a/graphics/libfreehand/files/patch-libfreehand.pc.in b/graphics/libfreehand/files/patch-libfreehand.pc.in
deleted file mode 100644
index e50a1647bb33..000000000000
--- a/graphics/libfreehand/files/patch-libfreehand.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./libfreehand.pc.in.orig 2014-04-16 19:00:19.000000000 +0200
-+++ ./libfreehand.pc.in 2014-06-10 16:02:17.706475057 +0200
-@@ -9,5 +9,3 @@
- Requires: librevenge-0.0 librevenge-stream-0.0
- Libs: -L${libdir} -lfreehand-@FH_MAJOR_VERSION@.@FH_MINOR_VERSION@
- Cflags: -I${includedir}/libfreehand-@FH_MAJOR_VERSION@.@FH_MINOR_VERSION@
--
--Requires.private: zlib
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 5f339e01da1b..053a928f093a 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -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} \
diff --git a/net/freerdp1/Makefile b/net/freerdp1/Makefile
index 7d550ea8f148..e0eff88123ea 100644
--- a/net/freerdp1/Makefile
+++ b/net/freerdp1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freerdp
PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net comms ipv6
PKGNAMESUFFIX= 1
diff --git a/net/freerdp1/files/patch-freerdp.pc.in b/net/freerdp1/files/patch-freerdp.pc.in
index 7220ebccef41..3ff4436d239b 100644
--- a/net/freerdp1/files/patch-freerdp.pc.in
+++ b/net/freerdp1/files/patch-freerdp.pc.in
@@ -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}
diff --git a/net/freerdp1/files/patch-winpr.pc.in b/net/freerdp1/files/patch-winpr.pc.in
index 1bf8ac3c70f3..167fdcf83f74 100644
--- a/net/freerdp1/files/patch-winpr.pc.in
+++ b/net/freerdp1/files/patch-winpr.pc.in
@@ -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}
diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile
index ef16dd4067b7..77781dc6c543 100644
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@@ -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>
diff --git a/print/qpdf/Makefile b/print/qpdf/Makefile
index 59715632989d..383188d11c1c 100644
--- a/print/qpdf/Makefile
+++ b/print/qpdf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qpdf
PORTVERSION= 6.0.0
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/qpdf/files/patch-libqpdf.pc.in b/print/qpdf/files/patch-libqpdf.pc.in
deleted file mode 100644
index b5c7f6733c18..000000000000
--- a/print/qpdf/files/patch-libqpdf.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libqpdf.pc.in.orig 2014-06-07 21:06:13 UTC
-+++ libqpdf.pc.in
-@@ -6,6 +6,7 @@ includedir=@includedir@
- Name: libqpdf
- Description: PDF transformation library
- Version: @PACKAGE_VERSION@
--Requires.private: zlib, libpcre
-+Requires.private: libpcre
- Libs: -L${libdir} -lqpdf
-+Libs.private: -lz
- Cflags: -I${includedir}
diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index b16409aff045..211edc862990 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -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>
diff --git a/textproc/libabw/Makefile b/textproc/libabw/Makefile
index b293080ea379..662c2ccc1ab0 100644
--- a/textproc/libabw/Makefile
+++ b/textproc/libabw/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libabw
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= LODEV/${PORTNAME}
diff --git a/textproc/libabw/files/patch-libabw.pc.in b/textproc/libabw/files/patch-libabw.pc.in
deleted file mode 100644
index 3033418f64b2..000000000000
--- a/textproc/libabw/files/patch-libabw.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- libabw.pc.in.orig 2014-04-16 17:04:09 UTC
-+++ libabw.pc.in
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0 librevenge-stre
- Libs: -L${libdir} -labw-@ABW_MAJOR_VERSION@.@ABW_MINOR_VERSION@
- Cflags: -I${includedir}/libabw-@ABW_MAJOR_VERSION@.@ABW_MINOR_VERSION@
-
--Requires.private: libxml-2.0 zlib
-+Requires.private: libxml-2.0
diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index 44aae393a1a7..e68c3d93c54f 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libe-book
PORTVERSION= 0.1.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc
MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/
diff --git a/textproc/libe-book/files/patch-libe-book.pc.in b/textproc/libe-book/files/patch-libe-book.pc.in
deleted file mode 100644
index ec21d46dc079..000000000000
--- a/textproc/libe-book/files/patch-libe-book.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- libe-book.pc.in.orig 2014-06-27 10:20:12 UTC
-+++ libe-book.pc.in
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0 librevenge-stre
- Libs: -L${libdir} -le-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@
- Cflags: -I${includedir}/libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@
-
--Requires.private: icu-uc @REQUIRES_EXPERIMENTAL@ libxml-2.0 zlib
-+Requires.private: icu-uc @REQUIRES_EXPERIMENTAL@ libxml-2.0
diff --git a/textproc/libvisio01/Makefile b/textproc/libvisio01/Makefile
index a0ecaa6ad451..eb4086c1e410 100644
--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@@ -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>
diff --git a/www/spdylay/Makefile b/www/spdylay/Makefile
index 26a4cbf83514..03e2725dcf6f 100644
--- a/www/spdylay/Makefile
+++ b/www/spdylay/Makefile
@@ -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 pathfix pkgconfig ssl tar:xz
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/