Remove leftover code sections guarded by _USE_PLIST_MODULE which was

mainlined long ago.

13 files changed, 13 insertions, 117 deletions

diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 6c233499baf..6901b08db48 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.22 2006/01/12 23:43:56 jlam Exp $
+# $NetBSD: AIX.mk,v 1.23 2006/03/18 21:40:44 jlam Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -42,13 +42,8 @@ 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
@@ -62,9 +57,6 @@ _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 057d0c22cee..a3001169ba0 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.17 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.18 2006/03/18 21:40:44 jlam Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -47,13 +47,8 @@ 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
@@ -69,9 +64,6 @@ _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 7f4768ef533..12c939a5e68 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.16 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.17 2006/03/18 21:40:44 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -52,13 +52,8 @@ 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
@@ -74,9 +69,6 @@ _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 bb12b97bc84..4ab845a1158 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.25 2006/02/06 18:58:33 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.26 2006/03/18 21:40:44 jlam Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -48,13 +48,8 @@ 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
@@ -69,9 +64,6 @@ _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 3831ccf09a1..36fa38e001b 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.16 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.17 2006/03/18 21:40:44 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -44,13 +44,8 @@ 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
@@ -64,9 +59,6 @@ _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 2a2d06f48aa..8a8d7113322 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.21 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.22 2006/03/18 21:40:44 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -40,13 +40,8 @@ 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
@@ -65,9 +60,6 @@ _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 9623569ed22..dba6ddb334d 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.48 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: Interix.mk,v 1.49 2006/03/18 21:40:44 jlam Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -125,13 +125,8 @@ 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
@@ -146,9 +141,6 @@ _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 a8891d46276..e544bdcb954 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.22 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: Linux.mk,v 1.23 2006/03/18 21:40:45 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -46,14 +46,9 @@ 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
@@ -67,9 +62,6 @@ _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 44bf20e5214..969df54f5d8 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.18 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.19 2006/03/18 21:40:45 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -60,13 +60,8 @@ 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
@@ -80,9 +75,6 @@ _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 8b47b0989c7..d2b57ed8877 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.11 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: OSF1.mk,v 1.12 2006/03/18 21:40:45 jlam Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -47,13 +47,8 @@ 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
@@ -68,9 +63,6 @@ _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 7ef9bc5b867..ac452f3abbe 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.21 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.22 2006/03/18 21:40:45 jlam Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -46,13 +46,8 @@ 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
@@ -70,9 +65,6 @@ _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 9abf4020792..b1314712259 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.21 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.22 2006/03/18 21:40:45 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -47,13 +47,8 @@ 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
@@ -67,9 +62,6 @@ _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 5dd4862531d..645e6cc2d72 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.19 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.20 2006/03/18 21:40:45 jlam Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -39,13 +39,8 @@ 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
@@ -59,9 +54,6 @@ _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