summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeld <feld@FreeBSD.org>2017-08-18 16:23:33 +0000
committerfeld <feld@FreeBSD.org>2017-08-18 16:23:33 +0000
commitb4b8c6c45ac96d48bfe5f9ccee937cd175518ffd (patch)
tree7ef62f4cf25fdb81e800110e330d8973754d00a0
parentb1c98c830cfded72474d405af3b2ae8642472515 (diff)
downloadFreeBSD-ports-b4b8c6c45ac96d48bfe5f9ccee937cd175518ffd.zip
FreeBSD-ports-b4b8c6c45ac96d48bfe5f9ccee937cd175518ffd.tar.gz
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)
-rw-r--r--www/swish-e/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index ec661ac..9d17568 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -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>
OpenPOWER on IntegriCloud