svn commit: r322746 - head/mail/elmo

[Baptiste Daroussin]

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>