[Midnightbsd-cvs] mports [15598] U trunk/editors/nano: modernize gettext handling

[laffer1 at midnightbsd.org]

Revision: 15598
          http://svnweb.midnightbsd.org/mports/?rev=15598
Author:   laffer1
Date:     2013-11-17 16:08:55 -0500 (Sun, 17 Nov 2013)
Log Message:
-----------
modernize gettext handling

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

Property Changed:
----------------
    trunk/editors/nano/distinfo
    trunk/editors/nano/files/patch-doc_man_Makefile.in
    trunk/editors/nano/files/patch-doc_man_fr_Makefile.in
    trunk/editors/nano/pkg-plist

Modified: trunk/editors/nano/Makefile
===================================================================
--- trunk/editors/nano/Makefile	2013-11-16 21:08:43 UTC (rev 15597)
+++ trunk/editors/nano/Makefile	2013-11-17 21:08:55 UTC (rev 15598)
@@ -2,7 +2,7 @@
 
 PORTNAME=	nano
 PORTVERSION=	2.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v2.2/ \
 		${MASTER_SITE_GNU}
@@ -10,6 +10,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
+
 LICENSE=	gpl3
 
 GNU_CONFIGURE=	yes
@@ -17,21 +18,30 @@
 		--docdir=${DOCSDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_JOBS_SAFE=	yes
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
 PLIST_SUB+=	NLS=""
+MANLANG=	"" fr
 .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
+
 INFO=		nano
 MAN1=		nano.1 rnano.1
 MAN5=		nanorc.5
-MANLANG=	"" fr
 
+
+
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} < 3000)

Index: trunk/editors/nano/distinfo
===================================================================
--- trunk/editors/nano/distinfo	2013-11-16 21:08:43 UTC (rev 15597)
+++ trunk/editors/nano/distinfo	2013-11-17 21:08:55 UTC (rev 15598)

Property changes on: trunk/editors/nano/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.12
\ No newline at end of property
Index: trunk/editors/nano/files/patch-doc_man_Makefile.in
===================================================================
--- trunk/editors/nano/files/patch-doc_man_Makefile.in	2013-11-16 21:08:43 UTC (rev 15597)
+++ trunk/editors/nano/files/patch-doc_man_Makefile.in	2013-11-17 21:08:55 UTC (rev 15598)

Property changes on: trunk/editors/nano/files/patch-doc_man_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/editors/nano/files/patch-doc_man_fr_Makefile.in
===================================================================
--- trunk/editors/nano/files/patch-doc_man_fr_Makefile.in	2013-11-16 21:08:43 UTC (rev 15597)
+++ trunk/editors/nano/files/patch-doc_man_fr_Makefile.in	2013-11-17 21:08:55 UTC (rev 15598)

Property changes on: trunk/editors/nano/files/patch-doc_man_fr_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/editors/nano/pkg-plist
===================================================================
--- trunk/editors/nano/pkg-plist	2013-11-16 21:08:43 UTC (rev 15597)
+++ trunk/editors/nano/pkg-plist	2013-11-17 21:08:55 UTC (rev 15598)
@@ -1,5 +1,12 @@
+ at comment $FreeBSD$
 bin/nano
 bin/rnano
+%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/nano.1.html
+%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/nanorc.5.html
+%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/fr/rnano.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nano.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nanorc.5.html
+%%PORTDOCS%%%%DOCSDIR%%/rnano.1.html
 %%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/nano.mo
@@ -31,34 +38,34 @@
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/nano.mo
 %%EXAMPLESDIR%%/nanorc.sample
-share/nano/asm.nanorc
-share/nano/awk.nanorc
-share/nano/c.nanorc
-share/nano/cmake.nanorc
-share/nano/css.nanorc
-share/nano/debian.nanorc
-share/nano/fortran.nanorc
-share/nano/gentoo.nanorc
-share/nano/groff.nanorc
-share/nano/html.nanorc
-share/nano/java.nanorc
-share/nano/makefile.nanorc
-share/nano/man.nanorc
-share/nano/mgp.nanorc
-share/nano/mutt.nanorc
-share/nano/nanorc.nanorc
-share/nano/objc.nanorc
-share/nano/ocaml.nanorc
-share/nano/patch.nanorc
-share/nano/perl.nanorc
-share/nano/php.nanorc
-share/nano/pov.nanorc
-share/nano/python.nanorc
-share/nano/ruby.nanorc
-share/nano/sh.nanorc
-share/nano/tcl.nanorc
-share/nano/tex.nanorc
-share/nano/xml.nanorc
+%%DATADIR%%/asm.nanorc
+%%DATADIR%%/awk.nanorc
+%%DATADIR%%/c.nanorc
+%%DATADIR%%/cmake.nanorc
+%%DATADIR%%/css.nanorc
+%%DATADIR%%/debian.nanorc
+%%DATADIR%%/fortran.nanorc
+%%DATADIR%%/gentoo.nanorc
+%%DATADIR%%/groff.nanorc
+%%DATADIR%%/html.nanorc
+%%DATADIR%%/java.nanorc
+%%DATADIR%%/makefile.nanorc
+%%DATADIR%%/man.nanorc
+%%DATADIR%%/mgp.nanorc
+%%DATADIR%%/mutt.nanorc
+%%DATADIR%%/nanorc.nanorc
+%%DATADIR%%/objc.nanorc
+%%DATADIR%%/ocaml.nanorc
+%%DATADIR%%/patch.nanorc
+%%DATADIR%%/perl.nanorc
+%%DATADIR%%/php.nanorc
+%%DATADIR%%/pov.nanorc
+%%DATADIR%%/python.nanorc
+%%DATADIR%%/ruby.nanorc
+%%DATADIR%%/sh.nanorc
+%%DATADIR%%/tcl.nanorc
+%%DATADIR%%/tex.nanorc
+%%DATADIR%%/xml.nanorc
 @dirrm share/nano
 @dirrm %%EXAMPLESDIR%%
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES


Property changes on: trunk/editors/nano/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property