From owner-svn-ports-all@FreeBSD.ORG Thu Mar 28 02:50:16 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 77D4839A; Thu, 28 Mar 2013 02:50:16 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5C3961E9; Thu, 28 Mar 2013 02:50:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2S2oGuI059737; Thu, 28 Mar 2013 02:50:16 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2S2oFTR059728; Thu, 28 Mar 2013 02:50:15 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201303280250.r2S2oFTR059728@svn.freebsd.org> From: Eitan Adler Date: Thu, 28 Mar 2013 02:50:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315432 - in head/editors: nano nano-devel nano-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 02:50:16 -0000 Author: eadler Date: Thu Mar 28 02:50:14 2013 New Revision: 315432 URL: http://svnweb.freebsd.org/changeset/ports/315432 Log: - Fix pkg-plist for nano and nano-devel. - Incorporate patches from nano into nano-devel - Other misc. fixes Added: head/editors/nano-devel/files/patch-doc_man_Makefile.in (contents, props changed) head/editors/nano-devel/files/patch-doc_man_fr_Makefile.in (contents, props changed) Modified: head/editors/nano-devel/Makefile head/editors/nano-devel/pkg-plist head/editors/nano/Makefile head/editors/nano/pkg-plist Modified: head/editors/nano-devel/Makefile ============================================================================== --- head/editors/nano-devel/Makefile Thu Mar 28 02:35:24 2013 (r315431) +++ head/editors/nano-devel/Makefile Thu Mar 28 02:50:14 2013 (r315432) @@ -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 enhan 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 .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 Added: head/editors/nano-devel/files/patch-doc_man_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nano-devel/files/patch-doc_man_Makefile.in Thu Mar 28 02:50:14 2013 (r315432) @@ -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: + Added: head/editors/nano-devel/files/patch-doc_man_fr_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/nano-devel/files/patch-doc_man_fr_Makefile.in Thu Mar 28 02:50:14 2013 (r315432) @@ -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: + Modified: head/editors/nano-devel/pkg-plist ============================================================================== --- head/editors/nano-devel/pkg-plist Thu Mar 28 02:35:24 2013 (r315431) +++ head/editors/nano-devel/pkg-plist Thu Mar 28 02:50:14 2013 (r315432) @@ -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%% Modified: head/editors/nano/Makefile ============================================================================== --- head/editors/nano/Makefile Thu Mar 28 02:35:24 2013 (r315431) +++ head/editors/nano/Makefile Thu Mar 28 02:50:14 2013 (r315432) @@ -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 Modified: head/editors/nano/pkg-plist ============================================================================== --- head/editors/nano/pkg-plist Thu Mar 28 02:35:24 2013 (r315431) +++ head/editors/nano/pkg-plist Thu Mar 28 02:50:14 2013 (r315432) @@ -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