svn commit: r430508 - in head: devel/geany-plugin-devhelp x11-toolkits/vte3

[Jan Beich]

Author: jbeich
Date: Tue Jan  3 18:43:02 2017
New Revision: 430508
URL: https://svnweb.freebsd.org/changeset/ports/430508

Log:
  Assume "pkg-config zlib" works after 9.x reached EOL

Modified:
  head/devel/geany-plugin-devhelp/Makefile   (contents, props changed)
  head/x11-toolkits/vte3/Makefile   (contents, props changed)

Modified: head/devel/geany-plugin-devhelp/Makefile
==============================================================================
--- head/devel/geany-plugin-devhelp/Makefile	Tue Jan  3 18:36:54 2017	(r430507)
+++ head/devel/geany-plugin-devhelp/Makefile	Tue Jan  3 18:43:02 2017	(r430508)
@@ -12,12 +12,5 @@ LIB_DEPENDS=	libwnck-1.so:x11-toolkits/l
 
 USE_GNOME=	gconf2
 
-# Workaround for 9.x which doesn't have zlib.pc
-LIBS=		-lz
-
-post-patch:
-	${REINPLACE_CMD} -e 's,zlib,,g' \
-		${WRKSRC}/configure
-
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/x11-toolkits/vte3/Makefile
==============================================================================
--- head/x11-toolkits/vte3/Makefile	Tue Jan  3 18:36:54 2017	(r430507)
+++ head/x11-toolkits/vte3/Makefile	Tue Jan  3 18:43:02 2017	(r430508)
@@ -34,18 +34,9 @@ PLIST_SUB=	VERSION=2.91
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly
-LIBS+=	-lz
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
 		${WRKSRC}/src/Makefile.in
-# zlib.pc only is available on 10.1-R and newer.
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly
-	@${REINPLACE_CMD} -e 's|gio-unix-2.0 zlib|gio-unix-2.0|g' \
-		${WRKSRC}/configure
-.endif
 # borrowed osversion from bsd.ssp.mk
 .if ${OSVERSION} < 1000036 && ${ARCH} == i386
 	@${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \