summaryrefslogtreecommitdiff
path: root/misc/ja-man
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-10-24 07:25:45 +0000
committerrillig <rillig@pkgsrc.org>2006-10-24 07:25:45 +0000
commit8ea189be6dd3a8fc19eeff9231a0c5dae065e61a (patch)
treed1f7fb8cf2fb4cdf2092ef0b447c0eab419e91f2 /misc/ja-man
parent9b4318c4ac25815f5b95b863c3b279b259db5a61 (diff)
downloadpkgsrc-8ea189be6dd3a8fc19eeff9231a0c5dae065e61a.tar.gz
Fixed PKGMANDIR and a few pkglint warnings.
Diffstat (limited to 'misc/ja-man')
-rw-r--r--misc/ja-man/Makefile33
-rw-r--r--misc/ja-man/distinfo4
-rw-r--r--misc/ja-man/patches/patch-ac4
3 files changed, 23 insertions, 18 deletions
diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile
index c91d389bb71..b402de3f645 100644
--- a/misc/ja-man/Makefile
+++ b/misc/ja-man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 21:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/24 07:25:45 rillig Exp $
DISTNAME= NetBSD1.3I-jman-19990531
PKGNAME= ja-man-19990531
@@ -16,29 +16,35 @@ DEPENDS+= ja-groff-0.99{,nb*}:../../textproc/ja-groff
JAMANDIR= ja_JP.EUC
PLIST_SUBST+= JAMANDIR=${JAMANDIR:Q}
MAKE_ENV+= JAMANDIR=${JAMANDIR:Q}
+MAKE_ENV+= PKGMANDIR=${PKGMANDIR}
+MAKE_ENV+= ${BSD_MAKE_ENV}
+MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/${JAMANDIR}
PLIST_SRC= ${WRKDIR}/PLIST
-USE_TOOLS+= gtar
+USE_TOOLS+= patch
MANCOMPRESSED_IF_MANZ= yes
INSTALLATION_DIRS= bin etc share/groff/tmac
+.for c in 1 2 3 4 5 6 7 8 9
+INSTALLATION_DIRS+= ${PKGMANDIR}/${JAMANDIR}/cat${c}
+INSTALLATION_DIRS+= ${PKGMANDIR}/${JAMANDIR}/man${c}
+.endfor
.include "../../mk/bsd.prefs.mk"
post-extract:
- @${GTAR} cCf ${PREFIX}/share/groff/tmac - tmac.andoc tmac.doc \
- mdoc/doc-common mdoc/doc-ditroff mdoc/doc-nroff mdoc/doc-syms | \
- ${GTAR} xCf ${WRKSRC} -
+ cd ${PREFIX}/share/groff/tmac \
+ && 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 < \
${WRKSRC}/jgroff-for-netbsd-jman.dif
do-build:
- @${SED} -e 's|$${BINDIR}|${PREFIX}/bin|g' \
+ sed -e 's|$${BINDIR}|${PREFIX}/bin|g' \
-e 's|$${JMANCONFDIR}|${PREFIX}/etc|g' ${WRKSRC}/jman/jman.sh \
> ${WRKSRC}/jman/jman
- @${SED} -e 's|$${PREFIX}|${PREFIX}|g' \
+ sed -e 's|$${PREFIX}|${PREFIX}|g' \
-e 's|$${LOCALBASE}|${LOCALBASE}|g' \
-e 's|$${X11BASE}|${X11BASE}|g' \
-e 's|$${JAMANDIR}|${JAMANDIR}|g' \
@@ -49,14 +55,14 @@ MKCATPAGES?= yes
pre-install:
.if ${MKCATPAGES} == no
- @${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST > ${PLIST_SRC}
+ sed -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST > ${PLIST_SRC}
.if exists(${PKGDIR}/PLIST.${MACHINE})
- @${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
+ sed -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
.endif
.else
- @${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+ cp ${PKGDIR}/PLIST ${PLIST_SRC}
.if exists(${PKGDIR}/PLIST.${MACHINE})
- @${CAT} ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
+ cat ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
.endif
.endif
@@ -70,7 +76,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/jman/jman.conf.t ${PREFIX}/etc/jman.conf
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jman
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jman
- @(cd ${WRKSRC}/man; \
- ${MAKE} PREFIX='${PREFIX}' JAMANDIR='${JAMANDIR}' install)
+ cd ${WRKSRC}/man && ${MAKE} ${MAKE_ENV} install
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/ja-man/distinfo b/misc/ja-man/distinfo
index 17b0d29f0cd..86754240e6f 100644
--- a/misc/ja-man/distinfo
+++ b/misc/ja-man/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:02:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/10/24 07:25:45 rillig 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) = 2598d46314ba694a227dca3c4d38212da2f64361
+SHA1 (patch-ac) = 1a61567a1c05b36ef2ed1950012d9c262f38ba3a
SHA1 (patch-ad) = b608d193a471c8694247fc3650ab1b1a1e75428f
SHA1 (patch-ae) = 0ddbcea34c2deddff32e8148c8ee23cff6ab7d53
SHA1 (patch-af) = 41806023d8844395df25b9fb2b53a4cf767a5ffd
diff --git a/misc/ja-man/patches/patch-ac b/misc/ja-man/patches/patch-ac
index e5d7b9c6b8f..abd2903e5cc 100644
--- a/misc/ja-man/patches/patch-ac
+++ b/misc/ja-man/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $
+$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
@@ -1,9 +1,9 @@
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $
- ${TMACDIR}/mdoc/doc-nroff \
- ${TMACDIR}/mdoc/doc-syms
+NROFF= jgnroff -Tnippon
-+MANDIR= ${PREFIX}/man/${JAMANDIR}
++MANDIR= ${PREFIX}/${PKGMANDIR}/${JAMANDIR}
+TMACDIR= ${PREFIX}/share/groff/tmac
+CATDEPS= ${TMACDIR}/tmac.andocj \
+ ${TMACDIR}/tmac.docj \