From 42cea4feca97175ce7fe8e01cef19ba73b69c476 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Fri, 13 Sep 2013 17:14:53 +0000 Subject: - Fix build after iconv change [1] - Fix build with clang/libc++ ([2] for graphics/ipe) While here for databases/spatialite: - Trim Makefile headers - Remove check for unsupported FreeBSD versions Submitted by: marino [1] Reported by: swills, antoine [1] Submitted by: bsam [2] Approved by: portmgr (bapt, implicit) --- editors/mlview/Makefile | 4 ++-- editors/xmlcopyeditor/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'editors') diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index c65851638d22..2436b36ecded 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -13,10 +13,10 @@ COMMENT= A tree oriented XML editor for Gnome USE_BZIP2= yes USE_AUTOTOOLS= autoconf libtool -USES= pathfix gmake pkgconfig +USES= pathfix gmake iconv pkgconfig USE_GNOME= eel2 gnomeprefix gtksourceview libgnomeui USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0` GCONF_SCHEMAS= mlview.schemas diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile index 983fea120c2d..82d7844dd094 100644 --- a/editors/xmlcopyeditor/Makefile +++ b/editors/xmlcopyeditor/Makefile @@ -16,7 +16,7 @@ USE_WX= 2.8+ WX_COMPS= wx contrib WX_CONF_ARGS= absolute WX_UNICODE= yes -USES= gettext +USES= gettext iconv USE_DOS2UNIX= yes BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs @@ -32,6 +32,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} ${ICONV_LIB} .include -- cgit v1.2.3