From owner-svn-ports-all@FreeBSD.ORG Mon Sep 30 19:58:21 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTP id DB1125B1;
Mon, 30 Sep 2013 19:58:21 +0000 (UTC)
(envelope-from bsam@FreeBSD.org)
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 AD09B20CF;
Mon, 30 Sep 2013 19:58:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8UJwLsf093296;
Mon, 30 Sep 2013 19:58:21 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8UJwKsO093291;
Mon, 30 Sep 2013 19:58:20 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201309301958.r8UJwKsO093291@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Mon, 30 Sep 2013 19:58:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r328855 - in head: devel/xdg-user-dirs games/instead
shells/fish www/xapian-omega
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Sep 2013 19:58:21 -0000
Author: bsam
Date: Mon Sep 30 19:58:20 2013
New Revision: 328855
URL: http://svnweb.freebsd.org/changeset/ports/328855
Log:
Fix using iconv at ports:
. shells/fish;
. games/instead;
. www/xapian-omega;
. devel/xdg-user-dirs.
Submitted by: marino (via e-mail)
Approved by: portmgr (bapt, implicit)
Modified:
head/devel/xdg-user-dirs/Makefile
head/games/instead/Makefile
head/shells/fish/Makefile
head/www/xapian-omega/Makefile
Modified: head/devel/xdg-user-dirs/Makefile
==============================================================================
--- head/devel/xdg-user-dirs/Makefile Mon Sep 30 19:41:57 2013 (r328854)
+++ head/devel/xdg-user-dirs/Makefile Mon Sep 30 19:58:20 2013 (r328855)
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USES= gettext iconv
USE_GMAKE= yes
USE_GNOME= libxslt:build
-LDFLAGS+= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
CFLAGS+= -I${LOCALBASE}/include
MAN1= xdg-user-dir.1 xdg-user-dirs-update.1
Modified: head/games/instead/Makefile
==============================================================================
--- head/games/instead/Makefile Mon Sep 30 19:41:57 2013 (r328854)
+++ head/games/instead/Makefile Mon Sep 30 19:58:20 2013 (r328855)
@@ -17,6 +17,7 @@ USE_GNOME= gtk20
USE_LUA= 5.1
USE_SDL= sdl image ttf mixer
USES= pkgconfig iconv
+LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
CONFIGURE_SCRIPT= configure.sh
CONFIGURE_ENV= PREFIX="${PREFIX}"
Modified: head/shells/fish/Makefile
==============================================================================
--- head/shells/fish/Makefile Mon Sep 30 19:41:57 2013 (r328854)
+++ head/shells/fish/Makefile Mon Sep 30 19:58:20 2013 (r328855)
@@ -20,7 +20,7 @@ USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --docdir=${WRKDIR}/tmproot
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -pthread
+LDFLAGS+= -L${LOCALBASE}/lib -pthread ${ICONV_LIB}
MAN1= fish.1 fish_indent.1 fish_pager.1 fishd.1 mimedb.1
Modified: head/www/xapian-omega/Makefile
==============================================================================
--- head/www/xapian-omega/Makefile Mon Sep 30 19:41:57 2013 (r328854)
+++ head/www/xapian-omega/Makefile Mon Sep 30 19:58:20 2013 (r328855)
@@ -41,6 +41,7 @@ NO_STAGE= yes
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
+LDFLAGS+= ${ICONV_LIB}
CONFIGURE_ARGS+=--with-iconv
.else
CONFIGURE_ARGS+=--without-iconv