CVS commit: pkgsrc/editors/nano

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Feb  5 17:25:52 UTC 2021

Modified Files:
        pkgsrc/editors/nano: Makefile distinfo
Added Files:
        pkgsrc/editors/nano/patches: patch-doc_nano.1 patch-doc_nanorc.5

Log Message:
nano: Fix hardcoded paths in manpages

pkgsrc changes:
---------------
  * Add patches to substitute hardcoded /etc and /usr paths in manpages.
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/editors/nano/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/editors/nano/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/nano/patches/patch-doc_nano.1 \
    pkgsrc/editors/nano/patches/patch-doc_nanorc.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/nano/Makefile
diff -u pkgsrc/editors/nano/Makefile:1.92 pkgsrc/editors/nano/Makefile:1.93
--- pkgsrc/editors/nano/Makefile:1.92   Sun Jan 24 17:13:42 2021
+++ pkgsrc/editors/nano/Makefile        Fri Feb  5 17:25:52 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2021/01/24 17:13:42 nia Exp $
+# $NetBSD: Makefile,v 1.93 2021/02/05 17:25:52 triaxx Exp $
 
 DISTNAME=      nano-5.5
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:C/\..*$//}/
 EXTRACT_SUFX=  .tar.xz
@@ -33,6 +34,12 @@ INFO_FILES=          yes
 INSTALLATION_DIRS+=    share/examples/nano
 CONF_FILES+=           share/examples/nano/nanorc ${PKG_SYSCONFDIR}/nanorc
 
+SUBST_CLASSES+=                man
+SUBST_STAGE.man=       pre-configure
+SUBST_MESSAGE.man=     Fixing paths in manpages.
+SUBST_FILES.man=       doc/nano.1 doc/nanorc.5
+SUBST_VARS.man=                PKG_SYSCONFDIR PREFIX
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/doc/sample.nanorc ${DESTDIR}${PREFIX}/share/examples/nano/nanorc
 

Index: pkgsrc/editors/nano/distinfo
diff -u pkgsrc/editors/nano/distinfo:1.63 pkgsrc/editors/nano/distinfo:1.64
--- pkgsrc/editors/nano/distinfo:1.63   Sun Jan 24 17:13:42 2021
+++ pkgsrc/editors/nano/distinfo        Fri Feb  5 17:25:52 2021
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.63 2021/01/24 17:13:42 nia Exp $
+$NetBSD: distinfo,v 1.64 2021/02/05 17:25:52 triaxx Exp $
 
 SHA1 (nano-5.5.tar.xz) = b727bcd583498312f52307ed39b83d7515401c58
 RMD160 (nano-5.5.tar.xz) = 0aaec99f60c214081608e3278ecd662e48f95825
 SHA512 (nano-5.5.tar.xz) = cbd2b6e1dc7437caf4ec6b55252664430fb1d6243dcf51a7b29ca3683bd1e6a25809c7b9d514d42cc85eb1a615bf3365951c07bf7c3c183a8cbe71c8586d9481
 Size (nano-5.5.tar.xz) = 1427592 bytes
 SHA1 (patch-configure) = 5f34f74d20c9b18f21afa308ed5634daed98a25d
+SHA1 (patch-doc_nano.1) = 28dcfb77046774d09128986783bbc434a708e212
+SHA1 (patch-doc_nanorc.5) = a1c2151152d08348263a6f36be43fa04fb4eee15

Added files:

Index: pkgsrc/editors/nano/patches/patch-doc_nano.1
diff -u /dev/null pkgsrc/editors/nano/patches/patch-doc_nano.1:1.1
--- /dev/null   Fri Feb  5 17:25:52 2021
+++ pkgsrc/editors/nano/patches/patch-doc_nano.1        Fri Feb  5 17:25:52 2021
@@ -0,0 +1,21 @@
+$NetBSD: patch-doc_nano.1,v 1.1 2021/02/05 17:25:52 triaxx Exp $
+
+* Fix hard-coded pathes.
+
+--- doc/nano.1.orig    2021-01-14 10:11:45.000000000 +0000
++++ doc/nano.1
+@@ -383,7 +383,7 @@ or \fI~/.config/nano/nanorc\fR, whicheve
+ .BR nanorc (5)
+ for more information on the possible contents of those files.
+ .sp
+-See \fI/usr/share/nano/\fR and \fI/usr/share/nano/extra/\fR
++See \fI@PREFIX@/share/nano/\fR and \fI@PREFIX@/share/nano/extra/\fR
+ for available syntax-coloring definitions.
+ 
+ .SH NOTES
+@@ -420,4 +420,4 @@ the environment variable \fBNANO_NOCATCH
+ .SH SEE ALSO
+ .BR nanorc (5)
+ .sp
+-\fI/usr/share/doc/nano/\fP (or equivalent on your system)
++\fI@PREFIX@/share/doc/nano/\fP (or equivalent on your system)
Index: pkgsrc/editors/nano/patches/patch-doc_nanorc.5
diff -u /dev/null pkgsrc/editors/nano/patches/patch-doc_nanorc.5:1.1
--- /dev/null   Fri Feb  5 17:25:52 2021
+++ pkgsrc/editors/nano/patches/patch-doc_nanorc.5      Fri Feb  5 17:25:52 2021
@@ -0,0 +1,31 @@
+$NetBSD: patch-doc_nanorc.5,v 1.1 2021/02/05 17:25:52 triaxx Exp $
+
+* Fix hard-coded pathes.
+
+--- doc/nanorc.5.orig  2021-01-14 10:11:45.000000000 +0000
++++ doc/nanorc.5
+@@ -25,7 +25,7 @@ nanorc \- GNU nano's configuration file
+ The \fInanorc\fP files contain the default settings for \fBnano\fP,
+ a small and friendly editor.  During startup, if \fB\-\-rcfile\fR
+ is not given, \fBnano\fR will read two files: first the
+-system-wide settings, from \fI/etc/nanorc\fP (the exact path might be
++system-wide settings, from \fI@PKG_SYSCONFDIR@/nanorc\fP (the exact path might be
+ different on your system), and then the user-specific settings, either
+ from \fI~/.nanorc\fR or from \fI$XDG_CONFIG_HOME/nano/nanorc\fR
+ or from \fI~/.config/nano/nanorc\fR, whichever is encountered first.
+@@ -995,13 +995,13 @@ for \fBunbind\fR it means all menus wher
+ 
+ .SH FILES
+ .TP
+-.I /etc/nanorc
++.I @PKG_SYSCONFDIR@/nanorc
+ System-wide configuration file.
+ .TP
+ .IR ~/.nanorc " or " $XDG_CONFIG_HOME/nano/nanorc " or " ~/.config/nano/nanorc
+ Per-user configuration file.
+ .TP
+-.I /usr/share/nano/*
++.I @PREFIX@/share/nano/*
+ Syntax definitions for the syntax coloring of common file types
+ (and for less common file types in the \fIextra/\fR subdirectory).
+