[Midnightbsd-cvs] mports [18576] trunk/editors/nano: modernize nano port

[laffer1 at midnightbsd.org]

Revision: 18576
          http://svnweb.midnightbsd.org/mports/?rev=18576
Author:   laffer1
Date:     2015-04-04 08:55:10 -0400 (Sat, 04 Apr 2015)
Log Message:
-----------
modernize nano port

Modified Paths:
--------------
    trunk/editors/nano/Makefile
    trunk/editors/nano/pkg-plist

Modified: trunk/editors/nano/Makefile
===================================================================
--- trunk/editors/nano/Makefile	2015-04-04 12:51:51 UTC (rev 18575)
+++ trunk/editors/nano/Makefile	2015-04-04 12:55:10 UTC (rev 18576)
@@ -2,7 +2,7 @@
 
 PORTNAME=	nano
 PORTVERSION=	2.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v2.2/ \
 		${MASTER_SITE_GNU}
@@ -16,45 +16,23 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} --mandir=${PREFIX}/man \
 		--docdir=${DOCSDIR}
+MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.mport.options.mk>
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-MANLANG=	"" fr
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
-.else
-MAKE_ARGS+=	install_htmlmanDATA=""
-.endif
-
 INFO=		nano
-MAN1=		nano.1 rnano.1
-MAN5=		nanorc.5
 
-
-
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} < 3000)
-CONFIGURE_ARGS+=--disable-utf8
-.else
-CONFIGURE_ARGS+=--enable-utf8
-.endif
-
 post-build:
 	cd ${WRKSRC}/doc/man; ${REINPLACE_CMD} \
 		-e 's:SYSCONFDIR:${PREFIX}/etc:g' \
 		-e 's:EXAMPLESDIR:${EXAMPLESDIR}:g' \
-		${MAN1} ${MAN5} ${WRKSRC}/doc/texinfo/${INFO:=.info}
+		nano.1 rnano.1 nanorc.5 ${WRKSRC}/doc/texinfo/${INFO:=.info}
 	${REINPLACE_CMD} -e 's/\\</[[:<:]]/g' -e 's/\\>/[[:>:]]/g' \
 		${WRKSRC}/doc/syntax/*.nanorc
 
@@ -62,4 +40,4 @@
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/nanorc.sample ${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/editors/nano/pkg-plist
===================================================================
--- trunk/editors/nano/pkg-plist	2015-04-04 12:51:51 UTC (rev 18575)
+++ trunk/editors/nano/pkg-plist	2015-04-04 12:55:10 UTC (rev 18576)
@@ -1,6 +1,11 @@
- at comment $FreeBSD$
 bin/nano
 bin/rnano
+man/man1/nano.1.gz
+man/man1/rnano.1.gz
+man/man5/nanorc.5.gz
+%%NLS%%man/fr/man1/nano.1.gz
+%%NLS%%man/fr/man1/rnano.1.gz
+%%NLS%%man/fr/man5/nanorc.5.gz
 %%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/nano.1.html
 %%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/nanorc.5.html
 %%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/rnano.1.html
@@ -66,12 +71,3 @@
 %%DATADIR%%/tcl.nanorc
 %%DATADIR%%/tex.nanorc
 %%DATADIR%%/xml.nanorc
- at dirrm share/nano
- at dirrm %%EXAMPLESDIR%%
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
-%%NLS%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry man/fr/man5
-%%NLS%%@dirrmtry man/fr/man1
-%%NLS%%@dirrmtry man/fr