summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-07-01 10:12:54 +0000
committerwiz <wiz@pkgsrc.org>2003-07-01 10:12:54 +0000
commita775070aa31961d6c03d7d45cf1dc20079ae6762 (patch)
treee52ef061817e57433567d6ae5899ded08d1c8dae /textproc
parent62871f970cde732ebfebca09c1e13bff42a1e8d6 (diff)
downloadpkgsrc-a775070aa31961d6c03d7d45cf1dc20079ae6762.tar.gz
Pull over some patches from src/ (disabling SGR and a bug fix).
Add mdoc.local from src/gnu/usr.bin/groff/tmac. Convert to USE_NEW_TEXINFO. Bump PKGREVISION.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/groff/Makefile17
-rw-r--r--textproc/groff/PLIST4
-rw-r--r--textproc/groff/distinfo6
-rw-r--r--textproc/groff/files/mdoc.local153
-rw-r--r--textproc/groff/patches/patch-ab52
-rw-r--r--textproc/groff/patches/patch-ad13
-rw-r--r--textproc/groff/patches/patch-ae64
7 files changed, 261 insertions, 48 deletions
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 38ab6842df7..88ac0179ff0 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/06/05 03:31:00 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/01 10:12:54 wiz Exp $
#
DISTNAME= groff-1.19
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
@@ -13,13 +13,18 @@ COMMENT= GNU roff text processing suite
DEPENDS+= netpbm>=10.0:../../graphics/netpbm
DEPENDS+= psutils>=1.17:../../print/psutils
-GNU_CONFIGURE= YES
-USE_GCC_SHLIB= YES
-USE_PERL5= YES
-USE_BUILDLINK2= YES
+GNU_CONFIGURE= YES
+USE_GCC_SHLIB= YES
+USE_PERL5= YES
+USE_BUILDLINK2= YES
+USE_NEW_TEXINFO= YES
INFO_FILES= groff
+post-install:
+ ${INSTALL_DATA} ${FILESDIR}/mdoc.local \
+ ${PREFIX}/share/groff/site-tmac
+
.include "../../mk/bsd.prefs.mk"
.ifdef PAPERSIZE
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index 95ba822d6ae..c083b08d6f6 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/05/15 08:11:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/07/01 10:12:54 wiz Exp $
bin/addftinfo
bin/afmtodit
bin/eqn
@@ -29,7 +29,6 @@ bin/soelim
bin/tbl
bin/tfmtodit
bin/troff
-@unexec ${INSTALL_INFO} --delete %D/info/groff %D/info/dir
info/groff
info/groff-1
info/groff-10
@@ -42,7 +41,6 @@ info/groff-6
info/groff-7
info/groff-8
info/groff-9
-@exec ${INSTALL_INFO} %D/info/groff %D/info/dir
man/man1/addftinfo.1
man/man1/afmtodit.1
man/man1/eqn.1
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index ae80dccc84c..4053a5861da 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/05/07 13:18:26 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/07/01 10:12:54 wiz Exp $
SHA1 (groff-1.19.tar.gz) = b045c1e9f4aafec5e52c32e04eac537952f617ca
Size (groff-1.19.tar.gz) = 2416140 bytes
SHA1 (patch-aa) = bd1c45fe22612af86a9da54582afbfdf1d6737a9
-SHA1 (patch-ab) = a968aafab2bb24ea947d45b215abe3cfb624a074
+SHA1 (patch-ab) = 96e82cde53a6f945763e88f0b163581a71dc448b
SHA1 (patch-ac) = 0bf974a050a762172cb3b43edd55159fe22c955d
+SHA1 (patch-ad) = 1ccb3038b60c9f3955c03dcdc5913c1541e41a87
+SHA1 (patch-ae) = 18d553fe99ca6915d42de5f6edf74fc56e2fc650
diff --git a/textproc/groff/files/mdoc.local b/textproc/groff/files/mdoc.local
new file mode 100644
index 00000000000..72411ece080
--- /dev/null
+++ b/textproc/groff/files/mdoc.local
@@ -0,0 +1,153 @@
+.\" NetBSD: mdoc.local,v 1.3 2003/07/01 09:59:50 wiz Exp
+.\"
+.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by the NetBSD
+.\" Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\" contributors may be used to endorse or promote products derived
+.\" from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" %beginstrip%
+.
+.\" NetBSD
+.ds volume-operating-system NetBSD
+.
+.\" NetBSD .Lb values
+.\".ds str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32)
+.ds str-Lb-libarm ARM Architecture Library (libarm, \-larm)
+.\".ds str-Lb-libc Standard C\~Library (libc, \-lc)
+.ds str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk)
+.\".ds str-Lb-libcompat Compatibility Library (libcompat, \-lcompat)
+.\".ds str-Lb-libcrypt Crypt Library (libcrypt, \-lcrypt)
+.\".ds str-Lb-libcurses Curses Library (libcurses, \-lcurses)
+.\".ds str-Lb-libedit Command Line Editor Library (libedit, \-ledit)
+.ds str-Lb-libform Curses Form Library (libform, \-lform)
+.\".ds str-Lb-libi386 i386 Architecture Library (libi386, \-li386)
+.ds str-Lb-libintl Internationalized Message Handling Library (libintl, \-lintl)
+.\".ds str-Lb-libipsec IPsec Policy Control Library (libipsec, \-lipsec)
+.\".ds str-Lb-libkvm Kernel Data Access Library (libkvm, \-lkvm)
+.\".ds str-Lb-libm Math Library (libm, \-lm)
+.ds str-Lb-libm68k m68k Architecture Library (libm68k, \-lm68k)
+.ds str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic)
+.\".ds str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu)
+.\".ds str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio)
+.ds str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap)
+.ds str-Lb-libpci PCI Bus Access Library (libpci, \-lpci)
+.ds str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc)
+.\".ds str-Lb-libposix POSIX Compatibility Library (libposix, \-lposix)
+.ds str-Lb-libpthread POSIX Thread Library (libpthread, \-lpthread)
+.\".ds str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv)
+.ds str-Lb-librt POSIX Real-time Library (librt, \-lrt)
+.\".ds str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap)
+.ds str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid)
+.\".ds str-Lb-libutil System Utilities Library (libutil, \-lutil)
+.ds str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64)
+.\".ds str-Lb-libz Compression Library (libz, \-lz)
+.
+.\" architecture names where case diverges from groff
+.ds volume-as-alpha alpha
+.ds volume-as-amiga amiga
+.ds volume-as-arc arc
+.\" next two are dead...
+.\".ds volume-as-arm26 arm26
+.\".ds volume-as-arm32 arm32
+.ds volume-as-atari atari
+.ds volume-as-bebox bebox
+.ds volume-as-cobalt cobalt
+.ds volume-as-evbsh3 evbsh3
+.ds volume-as-hp300 hp300
+.ds volume-as-hpcmips hpcmips
+.ds volume-as-mips mips
+.ds volume-as-sparc sparc
+.ds volume-as-vax vax
+.\" not in groff
+.ds volume-as-acorn26 acorn26
+.ds volume-as-acorn32 acorn32
+.ds volume-as-algor algor
+.ds volume-as-amd64 amd64
+.ds volume-as-cats cats
+.ds volume-as-cesfic cesfic
+.ds volume-as-dreamcast dreamcast
+.ds volume-as-evbarm evbarm
+.ds volume-as-evbmips evbmips
+.ds volume-as-evbppc evbppc
+.ds volume-as-hp700 hp700
+.ds volume-as-hpcarm hpcarm
+.ds volume-as-hpcsh hpcsh
+.ds volume-as-mipsco mipsco
+.ds volume-as-mvmeppc mvmeppc
+.ds volume-as-netwinder netwinder
+.ds volume-as-playstation2 playstation2
+.ds volume-as-pmppc pmppc
+.ds volume-as-sandpoint sandpoint
+.ds volume-as-sbmips sbmips
+.ds volume-as-shark shark
+.ds volume-as-sun2 sun2
+.ds volume-as-x86_64 x86_64
+.
+.\" standards names diverging from groff
+.ds doc-str-St--isoC \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990
+.as doc-str-St--isoC " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq])
+.ds str-St--xcurses4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4, Version\~2
+.as str-St--xcurses4.2 " (\*[Lq]\*[doc-Tn-font-size]XCURSES\*[doc-str-St]\^4.2\*[Rq])
+.ds str-St--xpg4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4, Version\~2
+.as str-St--xpg4.2 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4.2\*[Rq])
+.
+.\" standards names not in groff
+.als str-St--isoC-90 str-St--isoC
+.ds str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995
+.as str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq])
+.ds str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994
+.as str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq])
+.ds str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995
+.as str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq])
+.ds str-St--xns5.2d2.0 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5.2 Draft\~2.0
+.as str-St--xns5.2d2.0 " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5.2D2.0\*[Rq])
+.ds str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994
+.as str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
+.\" for a short time only -- use -isoC-90 or -isoC
+.als str-St--isoC90 str-St--isoC
+.\" for a short time only -- use -isoC-99
+.als str-St--isoC99 str-St--isoC-99
+.
+.\" Default .Os value
+.ds operating-system NetBSD\~1.6
+.\" 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
+.ds operating-system-NetBSD-1.5.1 1.5.1
+.ds operating-system-NetBSD-1.5.2 1.5.2
+.ds operating-system-NetBSD-1.5.3 1.5.3
+.ds operating-system-NetBSD-1.6.1 1.6.1
+.ds operating-system-NetBSD-2.0 2.0
+.ds str-At-V.3 \*[Tn-font-size]AT&T\*[str-At] System\~V.3
+.as str-At-V.3 " \*[Tn-font-size]UNIX\*[str-At]
+.\" For easier converting
+.nr hyphen-flags 1
diff --git a/textproc/groff/patches/patch-ab b/textproc/groff/patches/patch-ab
index defabc6e545..f200ba8d3ad 100644
--- a/textproc/groff/patches/patch-ab
+++ b/textproc/groff/patches/patch-ab
@@ -1,38 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2003/01/04 11:20:14 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2003/07/01 10:12:55 wiz Exp $
---- src/roff/nroff/nroff.sh.orig Thu Feb 7 09:36:54 2002
-+++ src/roff/nroff/nroff.sh
-@@ -5,14 +5,16 @@ prog="$0"
- # Default device.
- # First try the "locale charmap" command, because it's most reliable.
- # On systems where it doesn't exist, look at the environment variables.
--case "`locale charmap 2>/dev/null`" in
-- UTF-8)
-- T=-Tutf8 ;;
-- ISO-8859-1)
-- T=-Tlatin1 ;;
-- IBM-1047)
-- T=-Tcp1047 ;;
-- *)
-+# XXX: commented out because /bin/sh doesn't like not finding "locale",
-+# and ignores the error redirection in this case.
-+#case "`locale charmap 2>/dev/null`" in
-+# UTF-8)
-+# T=-Tutf8 ;;
-+# ISO-8859-1)
-+# T=-Tlatin1 ;;
-+# IBM-1047)
-+# T=-Tcp1047 ;;
-+# *)
- case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
- *.UTF-8)
- T=-Tutf8 ;;
-@@ -31,7 +33,7 @@
- *)
- T=-Tascii ;;
- esac ;;
-- esac ;;
-+# esac ;;
- esac
- opts=
-
+--- tmac/doc-common.orig Thu Feb 27 15:51:49 2003
++++ tmac/doc-common
+@@ -554,7 +554,10 @@
+ . as doc-header-string "\|.\|.\|.
+ . \}
+ . tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[]
+-. sp \n[doc-header-space]u
++. ie !\n[cR] \
++. sp \n[doc-header-space]u
++. el \
++. sp 1v
+ . ev
+ . ns
+ ..
diff --git a/textproc/groff/patches/patch-ad b/textproc/groff/patches/patch-ad
new file mode 100644
index 00000000000..2c5ce047ab0
--- /dev/null
+++ b/textproc/groff/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/07/01 10:12:55 wiz Exp $
+
+--- src/roff/nroff/nroff.sh.orig Tue Jan 28 09:40:44 2003
++++ src/roff/nroff/nroff.sh
+@@ -5,7 +5,7 @@ prog="$0"
+ # Default device.
+ # First try the "locale charmap" command, because it's most reliable.
+ # On systems where it doesn't exist, look at the environment variables.
+-case "`locale charmap 2>/dev/null`" in
++case "`#locale charmap 2>/dev/null`" in
+ UTF-8)
+ T=-Tutf8 ;;
+ ISO-8859-1)
diff --git a/textproc/groff/patches/patch-ae b/textproc/groff/patches/patch-ae
new file mode 100644
index 00000000000..292e88b9438
--- /dev/null
+++ b/textproc/groff/patches/patch-ae
@@ -0,0 +1,64 @@
+$NetBSD: patch-ae,v 1.1 2003/07/01 10:12:55 wiz Exp $
+
+--- tmac/troffrc.orig Tue Apr 8 19:26:42 2003
++++ tmac/troffrc
+@@ -43,4 +43,59 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4
+ .\" Handle paper formats
+ .do mso papersize.tmac
+ .
++.if n \{\
++. nr _C \n(.C
++. cp 0
++.
++. \" The following code sets a top-of-page trap to disable grotty's TTY
++. \" mode. Since neither \X nor .output can be used before the first
++. \" page has started, we must use a trap. To make it work with troff's
++. \" -o option, we wait until the first printed page.
++.
++. de sgr@dummy
++. .
++.
++. rn wh wh@old
++.
++. \" The stand-alone version. If no other trap is set, we can safely
++. \" insert the truncated vertical space caused by the trap (if any).
++. \" Otherwise we assume that the document's main macro package takes
++. \" care of that. As soon as the trap has been executed, it is removed.
++. de1 no@sgr
++. if \\n[.P] \{\
++. if (\\n[.t] == \\n[.p]) \{\
++. rn wh@old wh
++. rm no@sgr
++. wh 0
++. sp \\n[.trunc]
++. nop \X'tty: sgr 0'
++. sp -1
++. \}\}
++. .
++.
++. wh@old 0 no@sgr
++.
++. \" The piggyback version to be appended to macros planted with the
++. \" modified `wh' request.
++. de1 no@sgr1
++. if \\n[.P] \{\
++. rn wh@old wh
++. ds no@sgr1
++. nop \X'tty: sgr 0'
++. sp -1
++. \}
++. .
++.
++. \" We redefine the `wh' request so that `no@sgr1' is appended to
++. \" the trap macro.
++. de1 wh
++. am1 \\$2 sgr@dummy
++. no@sgr1
++. sgr@dummy
++. wh@old \\$1 \\$2
++. .
++.
++. cp \n[_C]
++.\}
++.
+ .\" Don't let blank lines creep in here.