summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2004-04-30 15:11:28 +0000
committerreed <reed@pkgsrc.org>2004-04-30 15:11:28 +0000
commit4822be3cf7158ee9407215f11e5a6444502269c1 (patch)
treecf9840ca71932c468791272f4fb8df24dfde17ff
parent03f6987ce47dcb6e8da94f92c4219336f5d7a798 (diff)
downloadpkgsrc-4822be3cf7158ee9407215f11e5a6444502269c1.tar.gz
This configures the to-be-installed mdoc.local file so the
"volume-operating-system" macro is ${OPSYS}. And sets the default .Os value to "pkgsrc" as suggested by wiz@. (It was hard-coded "NetBSD\~1.6".) Usually the mdoc.local "volume-operating-system" definition is for the operating system name often displayed on top of man pages. And "operating-system" is for the default .Os value (operating system and version/release) and is usually displayed at bottom of man page. Bump PKGREVISION. This closes my PR #23100.
-rw-r--r--doc/CHANGES3
-rw-r--r--textproc/groff/Makefile22
-rw-r--r--textproc/groff/files/mdoc.local5
3 files changed, 20 insertions, 10 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index e35eb13625f..62ba7fe23db 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5779 2004/04/30 10:50:44 grant Exp $
+$NetBSD: CHANGES,v 1.5780 2004/04/30 15:11:28 reed Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -2299,3 +2299,4 @@ Changes to the packages collection and infrastructure in 2004:
Added p5-Text-Quoted-1.5 [minskim 2004-04-30]
Added musicpd-0.10.3 [grant 2004-04-30]
Added mpc-0.10.3 [grant 2004-04-30]
+ Updated groff to groff-1.19nb4 [reed 2004-04-30]
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 25c25277b6e..9f8eb47c977 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/04/18 19:45:11 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/30 15:11:28 reed Exp $
#
DISTNAME= groff-1.19
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
@@ -20,15 +20,25 @@ USE_BUILDLINK3= YES
INFO_FILES= groff
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/mdoc.local \
- ${PREFIX}/share/groff/site-tmac
-
.include "../../mk/bsd.prefs.mk"
.ifdef PAPERSIZE
CONFIGURE_ENV+= PAGE=${PAPERSIZE}
.endif
+# Usually the mdoc.local "volume-operating-system" definition is for
+# the operating system name often displayed on top of man pages. And
+# "operating-system" is for the default .Os value (operating system
+# and version/release) and is usually displayed at bottom of man page.
+# XXX Use "pkgsrc" as default .Os value.
+post-patch:
+ ${SED} -e "s,@@VOLUME_OPERATING_SYSTEM@@,${OPSYS},g" \
+ -e "s,@@OPERATING_SYSTEM@@,pkgsrc,g" \
+ ${FILESDIR}/mdoc.local > ${WRKDIR}/mdoc.local
+
+post-install:
+ ${INSTALL_DATA} ${WRKDIR}/mdoc.local \
+ ${PREFIX}/share/groff/site-tmac
+
.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/groff/files/mdoc.local b/textproc/groff/files/mdoc.local
index c1af4a8170e..a1c8ab63466 100644
--- a/textproc/groff/files/mdoc.local
+++ b/textproc/groff/files/mdoc.local
@@ -36,8 +36,7 @@
.\"
.\" %beginstrip%
.
-.\" NetBSD
-.ds volume-operating-system NetBSD
+.ds volume-operating-system @@VOLUME_OPERATING_SYSTEM@@
.
.\" NetBSD .Lb values
.\".ds str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32)
@@ -138,7 +137,7 @@
.als str-St--isoC99 str-St--isoC-99
.
.\" Default .Os value
-.ds operating-system NetBSD\~1.6
+.ds operating-system @@OPERATING_SYSTEM@@
.\" Other known versions, not yet in groff distribution
.ds operating-system-NetBSD-1.4.2 1.4.2
.ds operating-system-NetBSD-1.4.3 1.4.3