Initial commit of a new module that encapsulates all of the code

for manipulating PLISTs.  This module is not used by default pending
more widespread testing -- currently the variable _USE_PLIST_MODULE
must be defined in /etc/mk.conf to enable its use.

The main features of the new PLIST module are:

    (1) Splits out the PLIST-handling code from bsd.pkg.mk into a
	separate "plist" module.

    (2) Splits out giant, multi-line awk scripts stored in make
	variables into separate awk scripts that may be joined
	together to post-process PLISTs.  Each of these awk scripts
	consolidates the processing for one set of files, e.g.,
	man pages, info pages, etc., and is more easily commented
	than a make variable.

    (3) Splits out the print-PLIST code from the regular PLIST code
	since they have no common pieces (print-plist.mk vs.
	plist.mk).

    (4) Completely re-implements the shared-library handling to be
	more efficient.  Along the way, this also fixes a problem
	for Mac OS X users where the PLISTs incorrectly contained
	absolute paths.

    (5) Completely re-implements the info-file handling so that we
	can migrate from INFO_FILES definitions to just adding
	info/foo.info entries in the static PLISTs.

    (6) Adds commented-out support for automatically compressed or
	decompressed info page entries based on the value of MANZ.
	These changes will be activated after texinfo.mk has been
	replaced by something that is built using the more modern
	primitives now available in pkgsrc.

    (7) Move the file compression logic into a separate script
	"doc-compress" that compresses or decompresses files while
	minding symlinks.  This script is now called by bsd.pkg.mk
	to do the "autmoatic man page handling".  In the future,
	it will also handle the "automatic info page handling" and
	possible others.

In general, the idea is to move stuff out of the Makefiles and into
separate files where we don't need to worry about quoting rules
and where each file can have a separate history of commits.  This
simplifies the makefile logic (especially in terms of readability)
and also simplifies maintenance of the code.

13 files changed, 104 insertions, 13 deletions

diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 86ca8aee9b0..6c233499baf 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.21 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: AIX.mk,v 1.22 2006/01/12 23:43:56 jlam Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -42,8 +42,13 @@ IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	0
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -57,7 +62,9 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	aixlib	# type of shared lib
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z 	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 54975678e2c..057d0c22cee 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.16 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: BSDOS.mk,v 1.17 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -47,8 +47,13 @@ IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
 IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -64,7 +69,9 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 44a788a62a5..7f4768ef533 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.15 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: Darwin.mk,v 1.16 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -52,8 +52,13 @@ IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# on installation, fixup PLIST for shared libs
+.endif
 .if ${OS_VERSION:R} >= 6
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -69,7 +74,9 @@ _OPSYS_COMPILER_RPATH_FLAG=	-L	# compiler flag to pass rpaths to linker
 _OPSYS_SHLIB_TYPE=	dylib	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		no	# don't add rpath to LDFLAGS
 
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index dcc697ce223..46aab24a835 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.23 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: DragonFly.mk,v 1.24 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -48,8 +48,13 @@ IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -63,7 +68,9 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 725d879e9ec..3831ccf09a1 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.15 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: FreeBSD.mk,v 1.16 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -44,8 +44,13 @@ IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -59,7 +64,9 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 04a3e3f9bc5..2a2d06f48aa 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.20 2005/12/08 01:12:56 jschauma Exp $
+# $NetBSD: IRIX.mk,v 1.21 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -40,8 +40,13 @@ IMAKE_LIBMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}3/X11
 IMAKE_FILEMAN_DIR?=	${IMAKE_MAN_SOURCE_PATH}5/X11
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6/X11
 IMAKE_MANNEWSUFFIX?=	z
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
@@ -60,7 +65,9 @@ _PATCH_BACKUP_ARG?=	-b -V simple -z # switch to patch(1) for backup suffix
 .else
 _PATCH_CAN_BACKUP=	no		# native patch(1) can make backups
 .endif
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no		# Don't use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index c44df2767d3..9623569ed22 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.47 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: Interix.mk,v 1.48 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -125,8 +125,13 @@ IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -141,7 +146,9 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type - not exactly true, but near enough
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	yes	# gettext not in base system
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 5afdc7ee9b9..a8891d46276 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.21 2006/01/10 16:58:04 christos Exp $
+# $NetBSD: Linux.mk,v 1.22 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -46,9 +46,14 @@ IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
 IMAKE_TOOLS=		gmake	# extra tools required when we use imake
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	no	# on installation, fixup PLIST for shared libs
+.endif
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -62,7 +67,9 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 7706009b6a1..44bf20e5214 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.17 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: NetBSD.mk,v 1.18 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -60,8 +60,13 @@ IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -75,7 +80,9 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index fca4f399342..8b47b0989c7 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.10 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: OSF1.mk,v 1.11 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -47,8 +47,13 @@ IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	1
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST
+.endif
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -63,7 +68,9 @@ _OPSYS_RPATH_NAME=	-rpath,	# name of symbol in rpath directive to linker
 _OPSYS_SHLIB_TYPE=	COFF	# type of shared lib
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z 	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	yes	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 2f5493342a9..7ef9bc5b867 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.20 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: OpenBSD.mk,v 1.21 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -46,8 +46,13 @@ IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
 IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall catinstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
+.endif
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
@@ -65,7 +70,9 @@ _PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
 .else
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
 .endif
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 67694d27714..9abf4020792 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.20 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: SunOS.mk,v 1.21 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -47,8 +47,13 @@ IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
+.endif
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
@@ -62,7 +67,9 @@ _OPSYS_PTHREAD_AUTO=	no		# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF		# shared lib type
 _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	yes		# Use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 20f4eb86ce3..5dd4862531d 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.18 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: UnixWare.mk,v 1.19 2006/01/12 23:43:57 jlam Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -39,8 +39,13 @@ IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+.if defined(_USE_PLIST_MODULE)
+IMAKE_MANINSTALL?=	maninstall
+.endif
 
+.if !defined(_USE_PLIST_MODULE)
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
+.endif
 .if exists(/usr/include/netinet/in6.h)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
@@ -54,7 +59,9 @@ _OPSYS_PTHREAD_AUTO=	no		# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF		# shared lib type
 _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
+.if !defined(_USE_PLIST_MODULE)
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
+.endif
 _USE_GNU_GETTEXT=	yes		# Use GNU gettext
 #
 # The native linker for UnixWare doesn't really support an option to pass