Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Nov 2014 02:01:42 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373191 - head/editors/nano
Message-ID:  <201411240201.sAO21g7H026187@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Mon Nov 24 02:01:42 2014
New Revision: 373191
URL: https://svnweb.freebsd.org/changeset/ports/373191
QAT: https://qat.redports.org/buildarchive/r373191/

Log:
  - Use options helpers
  - Simplify Makefile
  - Take maintainership

Modified:
  head/editors/nano/Makefile

Modified: head/editors/nano/Makefile
==============================================================================
--- head/editors/nano/Makefile	Mon Nov 24 01:56:41 2014	(r373190)
+++ head/editors/nano/Makefile	Mon Nov 24 02:01:42 2014	(r373191)
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.nano-editor.org
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 LICENSE=	GPLv3
@@ -17,36 +17,21 @@ CONFLICTS=	nano-devel-2*
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--docdir=${DOCSDIR}
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} --enable-utf8
+MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
-.else
-MAKE_ARGS+=	install_htmlmanDATA=""
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 INFO=		nano
 
 PORTSCOUT=	limitw:1,even
 
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS+=--enable-utf8
-
 post-build:
 	cd ${WRKSRC}/doc/man; ${REINPLACE_CMD} \
 		-e 's:SYSCONFDIR:${PREFIX}/etc:g' \
@@ -59,4 +44,4 @@ post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/nanorc.sample ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411240201.sAO21g7H026187>