Date: Sat, 8 Aug 2015 14:11:03 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393730 - in head/x11-toolkits/vte3: . files Message-ID: <201508081411.t78EB36r073970@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Aug 8 14:11:03 2015 New Revision: 393730 URL: https://svnweb.freebsd.org/changeset/ports/393730 Log: * Remove 8.x patch. * Make OSVERSION conditionals check OPSYS == FreeBSD. And add check for OPSYS == DragonFly, since they don't have zlib.pc in there base [1] * Remove old reinplace that didn't apply anymore. And the thing it was supposed to handle is done elsewhere in the Makefile. Reported by: marino@ [1] Tested by: marino@ Deleted: head/x11-toolkits/vte3/files/extra-patch-gnome-pty-helper_gnome-utmp.c Modified: head/x11-toolkits/vte3/Makefile Modified: head/x11-toolkits/vte3/Makefile ============================================================================== --- head/x11-toolkits/vte3/Makefile Sat Aug 8 13:56:32 2015 (r393729) +++ head/x11-toolkits/vte3/Makefile Sat Aug 8 14:11:03 2015 (r393730) @@ -48,12 +48,8 @@ PLIST_SUB= VERSION=2.91 .include <bsd.port.options.mk> -.if ${OSVERSION} < 900007 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c -.endif - -.if ${OSVERSION} < 1000000 -CFLAGS+= -lz +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly +LIBS+= -lz .endif post-patch: @@ -62,7 +58,7 @@ post-patch: ${WRKSRC}/src/Makefile.in .endif # zlib.pc only is available on 10.1-R and newer. -.if ${OSVERSION} < 1000000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly @${REINPLACE_CMD} -e 's|gio-unix-2.0 zlib|gio-unix-2.0|g' \ ${WRKSRC}/configure .endif @@ -74,8 +70,6 @@ post-patch: .endif @${REINPLACE_CMD} -e 's|(AM_MAKEFLAGS) install-exec-hook|(AM_MAKEFLAGS)|g' \ ${WRKSRC}/gnome-pty-helper/Makefile.in - @${REINPLACE_CMD} -e 's|zlib"|"|g' \ - ${WRKSRC}/configure .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508081411.t78EB36r073970>