Date: Thu, 6 Mar 2014 18:21:05 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347295 - head/www/netsurf Message-ID: <201403061821.s26IL5Sr031473@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Mar 6 18:21:04 2014 New Revision: 347295 URL: http://svnweb.freebsd.org/changeset/ports/347295 QAT: https://qat.redports.org/buildarchive/r347295/ Log: - Fix compilation with newer glib20. - Prefer libc iconv over libiconv. PR: ports/186948 Modified: head/www/netsurf/Makefile Modified: head/www/netsurf/Makefile ============================================================================== --- head/www/netsurf/Makefile Thu Mar 6 18:20:53 2014 (r347294) +++ head/www/netsurf/Makefile Thu Mar 6 18:21:04 2014 (r347295) @@ -46,6 +46,8 @@ LIB_DEPENDS+= libssl.so:${PORTSDIR}/secu BUILD_DEPENDS+= gperf:${PORTSDIR}/devel/gperf .endif +.include <bsd.port.pre.mk> + post-patch: @${REINPLACE_CMD} '/^NSFB_LINUX_AVAILABLE/ s|yes|no| ; s| -g||' \ ${WRKSRC}/src/libnsfb-${NSFB_VERSION}/Makefile @@ -53,7 +55,7 @@ post-patch: ${WRKSRC}/src/libnsfb-${NSFB_VERSION}/src/plot/*bpp*.c @${REINPLACE_CMD} 's| -O2||' \ ${WRKSRC}/src/netsurf-${PORTVERSION}/gtk/Makefile.defaults - @${REINPLACE_CMD} '/OpenSSL/d ; s| -g||' \ + @${REINPLACE_CMD} '/OpenSSL/d ; s| -g|| ; s|-DG_DISABLE_DEPRECATED||' \ ${WRKSRC}/src/netsurf-${PORTVERSION}/gtk/Makefile.target @${REINPLACE_CMD} -e '/ifeq.*clang/s/word 1/filter clang/' \ ${WRKSRC}/src/buildsystem-1.0/makefiles/Makefile.tools @@ -62,6 +64,10 @@ post-patch: do-configure: @${CP} ${FILESDIR}/Makefile.config ${WRKSRC}/src/netsurf-${PORTVERSION} +.if empty(ICONV_LIB) + @${REINPLACE_CMD} '/NETSURF_USE_LIBICONV_PLUG/ s|NO|YES|' \ + ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config +.endif .if ${PORT_OPTIONS:MGSTREAMER} @${REINPLACE_CMD} '/NETSURF_USE_VIDEO/ s|NO|YES|' \ ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config @@ -71,4 +77,4 @@ do-configure: ${WRKSRC}/src/netsurf-${PORTVERSION}/Makefile.config .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403061821.s26IL5Sr031473>