From 6f6e8eaa3a8af5e8893c5525a24287352db655e8 Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 28 Mar 2013 02:50:14 +0000
Subject: - Fix pkg-plist for nano and nano-devel. - Incorporate patches from
nano into nano-devel - Other misc. fixes
---
editors/nano-devel/Makefile | 19 +++++++-
editors/nano-devel/files/patch-doc_man_Makefile.in | 23 ++++++++++
.../nano-devel/files/patch-doc_man_fr_Makefile.in | 23 ++++++++++
editors/nano-devel/pkg-plist | 51 ++++++++++++----------
editors/nano/Makefile | 3 ++
editors/nano/pkg-plist | 2 -
6 files changed, 93 insertions(+), 28 deletions(-)
create mode 100644 editors/nano-devel/files/patch-doc_man_Makefile.in
create mode 100644 editors/nano-devel/files/patch-doc_man_fr_Makefile.in
diff --git a/editors/nano-devel/Makefile b/editors/nano-devel/Makefile
index 8fa7327a1942..65ced0c15ad0 100644
--- a/editors/nano-devel/Makefile
+++ b/editors/nano-devel/Makefile
@@ -1,9 +1,11 @@
+#
# $FreeBSD$
PORTNAME= nano
PORTVERSION= 2.3.2
CATEGORIES= editors
-MASTER_SITES= http://www.nano-editor.org/dist/v${PORTVERSION:R}/
+MASTER_SITES= http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
+ ${MASTER_SITE_GNU}
PKGNAMESUFFIX= -devel
MAINTAINER= eadler@FreeBSD.org
@@ -11,8 +13,15 @@ COMMENT= Nano's ANOther editor, an enhanced free Pico clone
CONFLICTS= nano-2*
+LICENSE= GPLv3
+
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --docdir=${DOCSDIR}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+MAKE_JOBS_SAFE= yes
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
@@ -24,11 +33,17 @@ 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
-MAKE_JOBS_SAFE= yes
+PORTSCOUT= limitw:1,odd
.include <bsd.port.pre.mk>
diff --git a/editors/nano-devel/files/patch-doc_man_Makefile.in b/editors/nano-devel/files/patch-doc_man_Makefile.in
new file mode 100644
index 000000000000..59d56c1182f1
--- /dev/null
+++ b/editors/nano-devel/files/patch-doc_man_Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD: head/editors/nano/files/patch-doc_man_Makefile.in 300896 2012-07-14 13:54:48Z beat $
+
+--- doc/man/Makefile.in.orig
++++ doc/man/Makefile.in
+@@ -204,7 +204,7 @@
+ @GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+ nano_man_mans = nano.1 nanorc.5 rnano.1
+ @GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
+-@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html
++@GROFF_HTML_TRUE@htmlmandir = $(htmldir)
+ @GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
+ @GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans)
+ @GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+@@ -577,7 +577,7 @@
+
+ info-am:
+
+-install-data-am: install-htmlmanDATA install-man
++install-data-am: $(install_htmlmanDATA) install-man
+
+ install-exec-am:
+
diff --git a/editors/nano-devel/files/patch-doc_man_fr_Makefile.in b/editors/nano-devel/files/patch-doc_man_fr_Makefile.in
new file mode 100644
index 000000000000..a944bfb373eb
--- /dev/null
+++ b/editors/nano-devel/files/patch-doc_man_fr_Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD: head/editors/nano/files/patch-doc_man_fr_Makefile.in 300896 2012-07-14 13:54:48Z beat $
+
+--- doc/man/fr/Makefile.in.orig
++++ doc/man/fr/Makefile.in
+@@ -193,7 +193,7 @@
+ @GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+ nano_man_mans = nano.1 nanorc.5 rnano.1
+ @GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
+-@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html/fr
++@GROFF_HTML_TRUE@htmlmandir = $(htmldir)/fr
+ @GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
+ @GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans)
+ @GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+@@ -424,7 +424,7 @@
+
+ info-am:
+
+-install-data-am: install-htmlmanDATA install-man
++install-data-am: $(install_htmlmanDATA) install-man
+
+ install-exec-am:
+
diff --git a/editors/nano-devel/pkg-plist b/editors/nano-devel/pkg-plist
index 699bfa574c09..e702e8e73e80 100644
--- a/editors/nano-devel/pkg-plist
+++ b/editors/nano-devel/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD: head/editors/nano/pkg-plist 315129 2013-03-24 15:50:36Z eadler $
bin/nano
bin/rnano
%%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
@@ -15,6 +16,7 @@ bin/rnano
%%NLS%%share/locale/hu/LC_MESSAGES/nano.mo
%%NLS%%share/locale/id/LC_MESSAGES/nano.mo
%%NLS%%share/locale/it/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/nano.mo
%%NLS%%share/locale/ms/LC_MESSAGES/nano.mo
%%NLS%%share/locale/nb/LC_MESSAGES/nano.mo
%%NLS%%share/locale/nl/LC_MESSAGES/nano.mo
@@ -24,6 +26,7 @@ bin/rnano
%%NLS%%share/locale/ro/LC_MESSAGES/nano.mo
%%NLS%%share/locale/ru/LC_MESSAGES/nano.mo
%%NLS%%share/locale/rw/LC_MESSAGES/nano.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/nano.mo
%%NLS%%share/locale/sr/LC_MESSAGES/nano.mo
%%NLS%%share/locale/sv/LC_MESSAGES/nano.mo
%%NLS%%share/locale/tr/LC_MESSAGES/nano.mo
@@ -32,48 +35,48 @@ bin/rnano
%%NLS%%share/locale/zh_CN/LC_MESSAGES/nano.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/nano.mo
%%EXAMPLESDIR%%/nanorc.sample
+%%DATADIR%%/asm.nanorc
%%DATADIR%%/awk.nanorc
+%%DATADIR%%/c.nanorc
%%DATADIR%%/cmake.nanorc
-%%DATADIR%%/fortran.nanorc
-%%DATADIR%%/xml.nanorc
-%%DATADIR%%/php.nanorc
-%%DATADIR%%/tcl.nanorc
-%%DATADIR%%/ocaml.nanorc
-%%DATADIR%%/debian.nanorc
%%DATADIR%%/css.nanorc
-%%DATADIR%%/lua.nanorc
-%%DATADIR%%/objc.nanorc
+%%DATADIR%%/debian.nanorc
+%%DATADIR%%/fortran.nanorc
%%DATADIR%%/gentoo.nanorc
-%%DATADIR%%/asm.nanorc
-%%DATADIR%%/c.nanorc
%%DATADIR%%/groff.nanorc
%%DATADIR%%/html.nanorc
+%%DATADIR%%/lua.nanorc
%%DATADIR%%/java.nanorc
%%DATADIR%%/makefile.nanorc
-%%DATADIR%%/mgp.nanorc
-%%NLS%%%%DATADIR%%/man-html/fr/nano.1.html
-%%NLS%%%%DATADIR%%/man-html/fr/nanorc.5.html
-%%NLS%%%%DATADIR%%/man-html/fr/rnano.1.html
-%%DATADIR%%/man-html/nano.1.html
-%%DATADIR%%/man-html/nanorc.5.html
-%%DATADIR%%/man-html/rnano.1.html
-%%DATADIR%%/spec.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%%/spec.nanorc
+%%DATADIR%%/tcl.nanorc
%%DATADIR%%/tex.nanorc
-%%NLS%%@dirrm %%DATADIR%%/man-html/fr
-@dirrm %%DATADIR%%/man-html
-@dirrm %%DATADIR%%
+%%DATADIR%%/xml.nanorc
+@dirrm share/nano
@dirrm %%EXAMPLESDIR%%
%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/rw
-%%NLS%%@dirrmtry man/fr/man5
-%%NLS%%@dirrmtry man/fr/man1
-%%NLS%%@dirrmtry man/fr
+@dirrm man/fr
+@dirrm man/fr/man5
+@dirrm man/fr/man1
+%%DOCSDIR%%/nano.1.html
+%%DOCSDIR%%/nanorc.5.html
+%%DOCSDIR%%/rnano.1.html
+%%NLS%%%%DOCSDIR%%/fr/nano.1.html
+%%NLS%%%%DOCSDIR%%/fr/nanorc.5.html
+%%NLS%%%%DOCSDIR%%/fr/rnano.1.html
+%%NLS%%@dirrm %%DOCSDIR%%/fr
+@dirrm %%DOCSDIR%%
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 24e6ee7628e2..bf303af26586 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -11,9 +11,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= eadler@FreeBSD.org
COMMENT= Nano's ANOther editor, an enhanced free Pico clone
+CONFLICTS= nano-2*
+
LICENSE= GPLv3
GNU_CONFIGURE= yes
+
CONFIGURE_ARGS= --docdir=${DOCSDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/editors/nano/pkg-plist b/editors/nano/pkg-plist
index 039c1912c5dd..031ee5e8fef3 100644
--- a/editors/nano/pkg-plist
+++ b/editors/nano/pkg-plist
@@ -21,7 +21,6 @@ bin/rnano
%%NLS%%share/locale/hu/LC_MESSAGES/nano.mo
%%NLS%%share/locale/id/LC_MESSAGES/nano.mo
%%NLS%%share/locale/it/LC_MESSAGES/nano.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/nano.mo
%%NLS%%share/locale/ms/LC_MESSAGES/nano.mo
%%NLS%%share/locale/nb/LC_MESSAGES/nano.mo
%%NLS%%share/locale/nl/LC_MESSAGES/nano.mo
@@ -31,7 +30,6 @@ bin/rnano
%%NLS%%share/locale/ro/LC_MESSAGES/nano.mo
%%NLS%%share/locale/ru/LC_MESSAGES/nano.mo
%%NLS%%share/locale/rw/LC_MESSAGES/nano.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/nano.mo
%%NLS%%share/locale/sr/LC_MESSAGES/nano.mo
%%NLS%%share/locale/sv/LC_MESSAGES/nano.mo
%%NLS%%share/locale/tr/LC_MESSAGES/nano.mo
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0