On NetBSD, man pages were getting installed into /usr/man. That's,

like, so 80's! Pass a value more appropriate for the current decade
to --mandir via CONFIGURE_ARGS, and let ./configure set this in
the Makefiles.

Install catted man pages with the suffix ".0" rather than ".1".

Bump PKGTOOLS_VERSION.

7 files changed, 19 insertions, 14 deletions

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 965173be495..07cad50a15e 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2003/01/10 12:01:43 agc Exp $
+# $NetBSD: Makefile,v 1.67 2003/01/11 07:52:15 schmonz Exp $
 
 # Notes to package maintainers:
 #
@@ -58,3 +58,8 @@ post-install:
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX:=		${PKG_TOOLS_BIN:C|/[^/]?bin$||}
+.if ${PREFIX} == "/usr" 
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/share/man
+.else
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
+.endif                                
diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in
index 41177afe9dd..08f9f1ae489 100644
--- a/pkgtools/pkg_install/files/add/Makefile.in
+++ b/pkgtools/pkg_install/files/add/Makefile.in
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.in,v 1.2 2002/12/22 13:10:12 grant Exp $
+# $NetBSD: Makefile.in,v 1.3 2003/01/11 07:52:17 schmonz Exp $
 # Original from FreeBSD, no rcs id.
 
 PREFIX=		@prefix@
 INSTALL=	@INSTALL@
 
-mandir=		${PREFIX}/man
+mandir=		@mandir@
 mandircat1=	${mandir}/cat1
 
 CC=		@CC@
@@ -37,4 +37,4 @@ clean:
 install:
 	${INSTALL} ${PROG} ${PREFIX}/sbin
 	${INSTALL} -m 755 -d ${mandircat1}
-	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.1
+	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.0
diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in
index a96e9a5a727..9346d17cd61 100644
--- a/pkgtools/pkg_install/files/admin/Makefile.in
+++ b/pkgtools/pkg_install/files/admin/Makefile.in
@@ -3,7 +3,7 @@
 PREFIX=		@prefix@
 INSTALL=	@INSTALL@
 
-mandir=		${PREFIX}/man
+mandir=		@mandir@
 mandircat1=	${mandir}/cat1
 
 CC=		@CC@
@@ -36,4 +36,4 @@ clean:
 install:
 	${INSTALL} ${PROG} ${PREFIX}/sbin
 	${INSTALL} -m 755 -d ${mandircat1}
-	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.1
+	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.0
diff --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in
index 734c44ca266..36434e6930d 100644
--- a/pkgtools/pkg_install/files/create/Makefile.in
+++ b/pkgtools/pkg_install/files/create/Makefile.in
@@ -3,7 +3,7 @@
 PREFIX=		@prefix@
 INSTALL=	@INSTALL@
 
-mandir=		${PREFIX}/man
+mandir=		@mandir@
 mandircat1=	${mandir}/cat1
 
 CC=		@CC@
@@ -36,4 +36,4 @@ clean:
 install:
 	${INSTALL} ${PROG} ${PREFIX}/sbin
 	${INSTALL} -m 755 -d ${mandircat1}
-	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.1
+	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.0
diff --git a/pkgtools/pkg_install/files/delete/Makefile.in b/pkgtools/pkg_install/files/delete/Makefile.in
index 496af1c25f6..20a7601c755 100644
--- a/pkgtools/pkg_install/files/delete/Makefile.in
+++ b/pkgtools/pkg_install/files/delete/Makefile.in
@@ -4,7 +4,7 @@
 PREFIX=		@prefix@
 INSTALL=	@INSTALL@
 
-mandir=		${PREFIX}/man
+mandir=		@mandir@
 mandircat1=	${mandir}/cat1
 
 CC=		@CC@
@@ -37,4 +37,4 @@ clean:
 install:
 	${INSTALL} ${PROG} ${PREFIX}/sbin
 	${INSTALL} -m 755 -d ${mandircat1}
-	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.1
+	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.0
diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in
index 5121a613594..4d819b58614 100644
--- a/pkgtools/pkg_install/files/info/Makefile.in
+++ b/pkgtools/pkg_install/files/info/Makefile.in
@@ -3,7 +3,7 @@
 PREFIX=		@prefix@
 INSTALL=	@INSTALL@
 
-mandir=		${PREFIX}/man
+mandir=		@mandir@
 mandircat1=	${mandir}/cat1
 
 CC=		@CC@
@@ -36,4 +36,4 @@ clean:
 install:
 	${INSTALL} ${PROG} ${PREFIX}/sbin
 	${INSTALL} -m 755 -d ${mandircat1}
-	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.1
+	${INSTALL} -m 444 ${PROG}.cat1 ${mandircat1}/${PROG}.0
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index 4bebe5778a2..42ef5f6ca53 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.2 2003/01/09 13:13:05 schmonz Exp $	*/
+/*	$NetBSD: version.h,v 1.3 2003/01/11 07:52:19 schmonz Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20030109"
+#define PKGTOOLS_VERSION "20030111"
 
 #endif /* _INST_LIB_VERSION_H_ */