diff options
| -rw-r--r-- | misc/ja-man/Makefile | 4 | ||||
| -rw-r--r-- | misc/ja-man/distinfo | 14 | ||||
| -rw-r--r-- | misc/ja-man/patches/patch-aa | 7 | ||||
| -rw-r--r-- | misc/ja-man/patches/patch-ab | 19 | ||||
| -rw-r--r-- | misc/ja-man/patches/patch-ac | 7 | ||||
| -rw-r--r-- | misc/ja-man/patches/patch-ad | 10 | ||||
| -rw-r--r-- | misc/ja-man/patches/patch-ae | 11 | ||||
| -rw-r--r-- | misc/ja-man/patches/patch-af | 11 |
8 files changed, 49 insertions, 34 deletions
diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile index b402de3f645..e6f2a773aec 100644 --- a/misc/ja-man/Makefile +++ b/misc/ja-man/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/24 07:25:45 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2008/02/16 10:14:53 obache Exp $ DISTNAME= NetBSD1.3I-jman-19990531 PKGNAME= ja-man-19990531 @@ -37,7 +37,7 @@ post-extract: && pax -wr tmac.andoc tmac.doc mdoc/doc-common mdoc/doc-ditroff mdoc/doc-nroff mdoc/doc-syms ${WRKSRC} post-patch: - patch -s -p2 -d ${WRKSRC}/mdoc < \ + patch -s -p2 -d ${WRKSRC}/mdoc ${PATCH_DIST_ARGS} < \ ${WRKSRC}/jgroff-for-netbsd-jman.dif do-build: diff --git a/misc/ja-man/distinfo b/misc/ja-man/distinfo index 86754240e6f..40381c338df 100644 --- a/misc/ja-man/distinfo +++ b/misc/ja-man/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.3 2006/10/24 07:25:45 rillig Exp $ +$NetBSD: distinfo,v 1.4 2008/02/16 10:14:53 obache Exp $ SHA1 (NetBSD1.3I-jman-19990531.tar.gz) = 354a23fd50c03de1acc42117d0fa1a6091c67cf0 RMD160 (NetBSD1.3I-jman-19990531.tar.gz) = 03d2781b62bce2f9d9425d9dbc6b5fe0e40479a6 Size (NetBSD1.3I-jman-19990531.tar.gz) = 1645123 bytes -SHA1 (patch-aa) = d7888279176becb0e4e100cca7873fabb9344643 -SHA1 (patch-ab) = 7765340d1e596cfdec4d180c0956a980f42f3a72 -SHA1 (patch-ac) = 1a61567a1c05b36ef2ed1950012d9c262f38ba3a -SHA1 (patch-ad) = b608d193a471c8694247fc3650ab1b1a1e75428f -SHA1 (patch-ae) = 0ddbcea34c2deddff32e8148c8ee23cff6ab7d53 -SHA1 (patch-af) = 41806023d8844395df25b9fb2b53a4cf767a5ffd +SHA1 (patch-aa) = b98752158f934afa0452871ec10d184fab53cb1c +SHA1 (patch-ab) = b2431235d2233089418048e0ea1025ec3fa4e60e +SHA1 (patch-ac) = afcf5a4ff1f4933614c95f64b165344a9aa442c9 +SHA1 (patch-ad) = 2c9f05ca25f9ec227aec7d63f7414946ab568a96 +SHA1 (patch-ae) = 7fa53ffbbe7f15e93a949c5904a82e06c62d80b7 +SHA1 (patch-af) = 15a66ef2cea468948da17fe4873ebe763f3fc1c4 diff --git a/misc/ja-man/patches/patch-aa b/misc/ja-man/patches/patch-aa index 06c9ece6b1c..92eb5de5b4b 100644 --- a/misc/ja-man/patches/patch-aa +++ b/misc/ja-man/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ ---- ./jman/jman.sh.orig Wed Oct 4 04:53:42 1995 -+++ ./jman/jman.sh Mon May 31 16:18:47 1999 +$NetBSD: patch-aa,v 1.2 2008/02/16 10:14:53 obache Exp $ + +--- jman/jman.sh.orig 1995-10-03 19:53:42.000000000 +0000 ++++ jman/jman.sh @@ -1,5 +1,5 @@ #! /bin/sh diff --git a/misc/ja-man/patches/patch-ab b/misc/ja-man/patches/patch-ab index 8f71a0e7ecc..0a3a1051c46 100644 --- a/misc/ja-man/patches/patch-ab +++ b/misc/ja-man/patches/patch-ab @@ -1,7 +1,9 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ ---- jman/jman.conf.orig Thu Jan 28 07:16:18 1999 -+++ jman/jman.conf Tue Nov 2 18:30:01 1999 -@@ -6,7 +6,7 @@ +$NetBSD: patch-ab,v 1.2 2008/02/16 10:14:53 obache Exp $ + +--- jman/jman.conf.orig 1999-01-27 22:16:18.000000000 +0000 ++++ jman/jman.conf +@@ -5,9 +5,9 @@ _version BSD.2 + # The whatis/apropos database. _whatdb /usr/share/man/whatis.db -_whatdb /usr/X11R6/man/whatis.db @@ -11,7 +13,9 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ +_whatdb ${LOCALBASE}/man/whatis.db _whatdb /usr/local/man/whatis.db -@@ -19,12 +19,12 @@ + # Subdirectories for paths ending in '/', IN SEARCH ORDER. +@@ -18,41 +18,41 @@ _subdir cat1 man1 cat8 man8 cat6 man6 c + _suffix .0 _build .0.Z /usr/bin/zcat %s _build .0.gz /usr/bin/gunzip -c %s -_build .[1-9ln] /usr/local/bin/nroff -Tnippon -man %s @@ -32,7 +36,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ +_build .me ${PREFIX}/bin/jgnroff -Tnippon -me %s 2>/dev/null | cat -s # Sections and their directories. -@@ -33,10 +33,10 @@ + # All paths ending in '/' are the equivalent of entries specifying that + # directory with all of the subdirectories listed for the keyword _subdir. # default -_default /usr/local/jman/ /usr/{share,X11R6,X11,pkg,local}/man/ @@ -46,7 +51,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ +packages ${LOCALBASE}/man/ local /usr/local/man/ -@@ -44,15 +44,15 @@ + doc /usr/{pkg,share}/doc/{sendmail/op,sendmail/intro} # Specific section/directory combinations. -1 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}1 diff --git a/misc/ja-man/patches/patch-ac b/misc/ja-man/patches/patch-ac index abd2903e5cc..3cf825e6f5e 100644 --- a/misc/ja-man/patches/patch-ac +++ b/misc/ja-man/patches/patch-ac @@ -1,6 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2006/10/24 07:25:45 rillig Exp $ ---- ./man/Makefile.inc.orig Tue Jul 28 01:25:43 1998 -+++ ./man/Makefile.inc Mon May 31 16:18:47 1999 +$NetBSD: patch-ac,v 1.3 2008/02/16 10:14:53 obache Exp $ + +--- man/Makefile.inc.orig 1998-07-27 16:25:43.000000000 +0000 ++++ man/Makefile.inc @@ -1,9 +1,9 @@ -NROFF= nroff -Tnippon -MANDIR= ${DESTDIR}/usr/local/jman diff --git a/misc/ja-man/patches/patch-ad b/misc/ja-man/patches/patch-ad index 5790ee9fde5..9b9315f2788 100644 --- a/misc/ja-man/patches/patch-ad +++ b/misc/ja-man/patches/patch-ad @@ -1,7 +1,9 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ ---- ./man/Makefile.orig Thu Jan 28 07:23:34 1999 -+++ ./man/Makefile Mon May 31 16:18:47 1999 -@@ -9,6 +9,3 @@ +$NetBSD: patch-ad,v 1.2 2008/02/16 10:14:53 obache Exp $ + +--- man/Makefile.orig 1999-01-27 22:23:34.000000000 +0000 ++++ man/Makefile +@@ -8,7 +8,4 @@ SUBDIR+= ${MACHINE} + SUBDIR+= x68k .endif -beforeinstall: diff --git a/misc/ja-man/patches/patch-ae b/misc/ja-man/patches/patch-ae index 3fabbe6e8c0..84174e5b61f 100644 --- a/misc/ja-man/patches/patch-ae +++ b/misc/ja-man/patches/patch-ae @@ -1,10 +1,13 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ ---- ./tmac.andoc.orig Mon May 31 14:48:43 1999 -+++ ./tmac.andoc Mon May 31 16:18:47 1999 -@@ -3,5 +3,5 @@ +$NetBSD: patch-ae,v 1.2 2008/02/16 10:14:53 obache Exp $ + +--- tmac.andoc.orig 2008-02-16 07:46:20.000000000 +0000 ++++ tmac.andoc +@@ -2,7 +2,7 @@ + .if !\n(.g .ab These macros require groff. .de Dd .rm Dd -.do mso tmac.doc +.do mso tmac.docj \\*(Dd\\ .. + .de TH diff --git a/misc/ja-man/patches/patch-af b/misc/ja-man/patches/patch-af index c22d65b0d2c..21139c5ed43 100644 --- a/misc/ja-man/patches/patch-af +++ b/misc/ja-man/patches/patch-af @@ -1,7 +1,9 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ ---- ./tmac.doc.orig Mon May 31 14:48:43 1999 -+++ ./tmac.doc Mon May 31 16:18:47 1999 -@@ -50,11 +50,11 @@ +$NetBSD: patch-af,v 1.2 2008/02/16 10:14:53 obache Exp $ + +--- tmac.doc.orig 2008-02-16 07:46:20.000000000 +0000 ++++ tmac.doc +@@ -49,13 +49,13 @@ + .mso mdoc/\\$1 .. .if t \{\ -. sO doc-ditroff @@ -17,3 +19,4 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $ +.sO doc-symsj .nr Db 0 .de Db + .ie \\n(.$==0 \{\ |