From d66891cdc0d847d403c1d82f7100d8ee88b068d4 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Sun, 17 Feb 2008 02:23:52 +0000
Subject: Honor PKG_SYSCONFDIR and switch to use CONF_FILES framework.

Bump PKGREVISION.
---
 misc/ja-man/Makefile | 12 +++++++-----
 misc/ja-man/PLIST    |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'misc')

diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile
index bd164c68ba4..f047c8c841e 100644
--- a/misc/ja-man/Makefile
+++ b/misc/ja-man/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/02/16 11:13:44 obache Exp $
+# $NetBSD: Makefile,v 1.14 2008/02/17 02:23:52 obache Exp $
 
 DISTNAME=	NetBSD1.3I-jman-19990531
 PKGNAME=	ja-man-19990531
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	japanese misc
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 
@@ -26,7 +26,7 @@ PLIST_SRC=	${WRKDIR}/PLIST
 USE_TOOLS+=		patch
 USE_BSD_MAKE=		yes
 MANCOMPRESSED_IF_MANZ=	yes
-INSTALLATION_DIRS=	bin etc share/groff/tmac/mdoc
+INSTALLATION_DIRS=	bin share/groff/tmac/mdoc share/examples
 .for c in 1 2 3 4 5 6 7 8 9
 INSTALLATION_DIRS+=	${PKGMANDIR}/${JAMANDIR}/cat${c}
 INSTALLATION_DIRS+=	${PKGMANDIR}/${JAMANDIR}/man${c}
@@ -34,6 +34,8 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/${JAMANDIR}/man${c}
 
 INSTALL_DIRS+=	man
 
+CONF_FILES+=	share/examples/jman.conf ${PKG_SYSCONFDIR}/jman.conf
+
 .include "../../mk/bsd.prefs.mk"
 
 post-extract:
@@ -46,7 +48,7 @@ post-patch:
 
 do-build:
 	sed -e 's|$${BINDIR}|${PREFIX}/bin|g' \
-		-e 's|$${JMANCONFDIR}|${PREFIX}/etc|g' ${WRKSRC}/jman/jman.sh \
+		-e 's|$${JMANCONFDIR}|${PKG_SYSCONFDIR}|g' ${WRKSRC}/jman/jman.sh \
 		> ${WRKSRC}/jman/jman
 	sed -e 's|$${PREFIX}|${PREFIX}|g' \
 		-e 's|$${LOCALBASE}|${LOCALBASE}|g' \
@@ -77,7 +79,7 @@ post-install:
 			${DESTDIR}${PREFIX}/share/groff/tmac/$${f}j; \
 	 done
 	${INSTALL_SCRIPT} ${WRKSRC}/jman/jman ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/jman/jman.conf.t ${DESTDIR}${PREFIX}/etc/jman.conf
+	${INSTALL_DATA} ${WRKSRC}/jman/jman.conf.t ${DESTDIR}${PREFIX}/share/examples/jman.conf
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jman
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/jman
 
diff --git a/misc/ja-man/PLIST b/misc/ja-man/PLIST
index e502c325fdc..a143c373bb8 100644
--- a/misc/ja-man/PLIST
+++ b/misc/ja-man/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:23 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/02/17 02:23:52 obache Exp $
 bin/jman
-etc/jman.conf
 man/${JAMANDIR}/cat1/Mail.0
 man/${JAMANDIR}/cat1/[.0
 man/${JAMANDIR}/cat1/addftinfo.0
@@ -1604,6 +1603,7 @@ man/${JAMANDIR}/man9/vsunlock.9
 man/${JAMANDIR}/man9/wakeup.9
 man/${JAMANDIR}/man9/writedisklabel.9
 share/doc/jman/README
+share/examples/jman.conf
 @dirrm share/doc/jman
 share/groff/tmac/mdoc/doc-commonj
 share/groff/tmac/mdoc/doc-ditroffj
-- 
cgit v1.2.3