From owner-svn-ports-head@FreeBSD.ORG  Thu Jul 11 06:27:40 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ADE02619;
 Thu, 11 Jul 2013 06:27:40 +0000 (UTC)
 (envelope-from bapt@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 A121C1360;
 Thu, 11 Jul 2013 06:27:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B6RebQ054839;
 Thu, 11 Jul 2013 06:27:40 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B6Re2o054838;
 Thu, 11 Jul 2013 06:27:40 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201307110627.r6B6Re2o054838@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 11 Jul 2013 06:27:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322746 - head/mail/elmo
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.14
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, 11 Jul 2013 06:27:40 -0000

Author: bapt
Date: Thu Jul 11 06:27:40 2013
New Revision: 322746
URL: http://svnweb.freebsd.org/changeset/ports/322746

Log:
  Fix build with nls (was broken because USES was set after pre.mk)
  While here:
  Use options helpers
  Use options sub
  Use shebangfix

Modified:
  head/mail/elmo/Makefile

Modified: head/mail/elmo/Makefile
==============================================================================
--- head/mail/elmo/Makefile	Thu Jul 11 06:15:02 2013	(r322745)
+++ head/mail/elmo/Makefile	Thu Jul 11 06:27:40 2013	(r322746)
@@ -12,10 +12,13 @@ COMMENT=	Receive, filter, read, compose,
 
 CONFLICTS=	elmo-devel-[0-9]*
 
+OPTIONS_DEFINE=	NLS
+
 GNU_CONFIGURE=	yes
-USES=		iconv
+USES=		iconv shebangfix
 USE_OPENSSL=	yes
 USE_PERL5_RUN=	yes
+SHEBANG_FILES=	src/elmoconf.pl
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -26,16 +29,10 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		elmo.1 elmoconf.pl.1
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
-PLIST_SUB+=	NLS=""
-USES+=		gettext
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ON=	--with-libintl-prefix="${LOCALBASE}"
+NLS_CONFIGURE_OFF=	--disable-nls
+NLS_USES=	gettext
+OPTIONS_SUB=	yes
 
 .if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
 LIB_DEPENDS+=	gpgme.19:${PORTSDIR}/security/gpgme
@@ -47,12 +44,10 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/bin/env perl|${PERL} -w|" \
-		${WRKSRC}/src/elmoconf.pl
 	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' -e 's|== "|= "|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' ${WRKSRC}/src/pgp.c
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>