Date: Fri, 18 Aug 2017 16:23:33 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448256 - branches/2017Q3/www/swish-e Message-ID: <201708181623.v7IGNXCZ015380@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Fri Aug 18 16:23:33 2017 New Revision: 448256 URL: https://svnweb.freebsd.org/changeset/ports/448256 Log: MFH: r448255 www/swish-e: Fix building on FreeBSD 11.1 and HEAD Newer zlib has its own uncompress2 function, so hot-patch the source to rename uncompress2 to swishe_uncompress2. I could not devise a better way to do this at the moment. Cleaner patch would be welcomed. Approved by: portmgr (with hat) Modified: branches/2017Q3/www/swish-e/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/www/swish-e/Makefile ============================================================================== --- branches/2017Q3/www/swish-e/Makefile Fri Aug 18 16:22:45 2017 (r448255) +++ branches/2017Q3/www/swish-e/Makefile Fri Aug 18 16:23:33 2017 (r448256) @@ -10,11 +10,9 @@ MASTER_SITES= http://swish-e.org/distribution/ MAINTAINER= ports@FreeBSD.org COMMENT= Simple web indexing for humans - enhanced -BROKEN_FreeBSD_12= fails to compile: zlib.h: conflicting types for 'uncompress2' - +USES= gmake libtool perl5 shebangfix USE_LDCONFIG= yes USE_GNOME= libxml2 -USES= gmake libtool perl5 shebangfix SHEBANG_FILES= src/swishspider GNU_CONFIGURE= yes MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ @@ -36,5 +34,8 @@ post-patch: ${WRKSRC}/${p}/Makefile.in .endfor .endif + # Rename uncompress2 to swishe_uncompress2 to fix building with newer zlib which exports + # its own uncompress2 + ${FIND} ${WRKSRC}/src -type f -exec ${REINPLACE_CMD} 's,uncompress2,swishe_uncompress2,g' {} \+ .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708181623.v7IGNXCZ015380>