From owner-svn-ports-all@FreeBSD.ORG  Fri May 31 13:17:42 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])
 by hub.freebsd.org (Postfix) with ESMTP id 54BD550F;
 Fri, 31 May 2013 13:17:42 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 46E9CCC;
 Fri, 31 May 2013 13:17:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4VDHgCB097405;
 Fri, 31 May 2013 13:17:42 GMT (envelope-from garga@svn.freebsd.org)
Received: (from garga@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4VDHg0H097404;
 Fri, 31 May 2013 13:17:42 GMT (envelope-from garga@svn.freebsd.org)
Message-Id: <201305311317.r4VDHg0H097404@svn.freebsd.org>
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 31 May 2013 13:17:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319490 - head/www/sarg
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: Fri, 31 May 2013 13:17:42 -0000

Author: garga
Date: Fri May 31 13:17:41 2013
New Revision: 319490
URL: http://svnweb.freebsd.org/changeset/ports/319490

Log:
  - Remove bashisms from configure.in
  - Fix libinconv and libintl linking
  - Bump PORTREVISION
  
  PR:		ports/178465 (based on)
  Submitted by:	John Marino <draco@marino.st>

Modified:
  head/www/sarg/Makefile

Modified: head/www/sarg/Makefile
==============================================================================
--- head/www/sarg/Makefile	Fri May 31 12:36:02 2013	(r319489)
+++ head/www/sarg/Makefile	Fri May 31 13:17:41 2013	(r319490)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sarg
 PORTVERSION=	2.3.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -34,6 +35,7 @@ MAN1=		sarg.1
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 USES+=		gettext
+EXTRA_LDFLAGS=	-lintl
 .else
 PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=--disable-nls
@@ -71,6 +73,7 @@ CONFIGURE_ARGS+=--without-ldap
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=--with-iconv
 USES+=	iconv
+EXTRA_LDFLAGS+=	-liconv
 .else
 CONFIGURE_ARGS+=--without-iconv
 .endif
@@ -80,8 +83,11 @@ post-extract:
 	@${CHMOD} 0755 ${WRKSRC}/configure
 
 post-patch:
-.if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e '/^LIBS/ s/$$/ -lintl/' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/test .*==/ s/==/=/' \
+		${WRKSRC}/configure.in
+.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MICONV}
+	@${REINPLACE_CMD} -e '/^LIBS/ s/$$/ ${EXTRA_LDFLAGS}/' \
+		${WRKSRC}/Makefile.in
 .endif
 
 pre-configure: