From owner-svn-ports-head@FreeBSD.ORG  Thu Mar  6 18:21:05 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 51613D64;
 Thu,  6 Mar 2014 18:21:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F2A08E9;
 Thu,  6 Mar 2014 18:21:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26IL5lI031474;
 Thu, 6 Mar 2014 18:21:05 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26IL5Sr031473;
 Thu, 6 Mar 2014 18:21:05 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201403061821.s26IL5Sr031473@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Thu, 6 Mar 2014 18:21:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347295 - head/www/netsurf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Mar 2014 18:21:05 -0000

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>