sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Assume "pkg-config --static zlib" works after 9.x EOL

Browse source 
Many hacks simply removed dependency on zlib which broke static linking
if it was actually supported.
This commit is contained in:
Jan Beich 2017-01-03 18:43:18 +00:00
parent b557ec87bb
commit 417eff8ffb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=430509
18 changed files with 14 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
graphics/libcdr01/Makefile
View file

@ -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>

5
graphics/libetonyek01/Makefile
View file

@ -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

2
graphics/libfreehand/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= libfreehand
PORTVERSION= 0.1.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= LODEV

8
graphics/libfreehand/files/patch-libfreehand.pc.in
View file

@ -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

6
lang/tcl86/Makefile
View file

@ -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} \

2
net/freerdp1/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= freerdp
PORTVERSION= 1.2.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net comms ipv6
PKGNAMESUFFIX= 1

2
net/freerdp1/files/patch-freerdp.pc.in
View file

@ -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}

3
net/freerdp1/files/patch-winpr.pc.in
View file

@ -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}

5
print/libmspub01/Makefile
View file

@ -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>

1
print/qpdf/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= qpdf
PORTVERSION= 6.0.0
PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF

11
print/qpdf/files/patch-libqpdf.pc.in
View file

@ -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}

6
security/libssh2/Makefile
View file

@ -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>

2
textproc/libabw/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= libabw
PORTVERSION= 0.1.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= LODEV/${PORTNAME}

8
textproc/libabw/files/patch-libabw.pc.in
View file

@ -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

2
textproc/libe-book/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= libe-book
PORTVERSION= 0.1.2
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= textproc
MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/

8
textproc/libe-book/files/patch-libe-book.pc.in
View file

@ -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

5
textproc/libvisio01/Makefile
View file

@ -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>

4
www/spdylay/Makefile
View file

@ -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/