pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/platform Remove leftover code sections guarded by _...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6274df3057ec
branches:  trunk
changeset: 509918:6274df3057ec
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Mar 18 21:40:44 2006 +0000

description:
Remove leftover code sections guarded by _USE_PLIST_MODULE which was
mainlined long ago.

diffstat:

 mk/platform/AIX.mk       |  10 +---------
 mk/platform/BSDOS.mk     |  10 +---------
 mk/platform/Darwin.mk    |  10 +---------
 mk/platform/DragonFly.mk |  10 +---------
 mk/platform/FreeBSD.mk   |  10 +---------
 mk/platform/IRIX.mk      |  10 +---------
 mk/platform/Interix.mk   |  10 +---------
 mk/platform/Linux.mk     |  10 +---------
 mk/platform/NetBSD.mk    |  10 +---------
 mk/platform/OSF1.mk      |  10 +---------
 mk/platform/OpenBSD.mk   |  10 +---------
 mk/platform/SunOS.mk     |  10 +---------
 mk/platform/UnixWare.mk  |  10 +---------
 13 files changed, 13 insertions(+), 117 deletions(-)

diffs (truncated from 430 to 300 lines):

diff -r 6018ded760d6 -r 6274df3057ec mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/AIX.mk        Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk      Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/BSDOS.mk      Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/Darwin.mk     Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk  Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/DragonFly.mk  Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk    Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/FreeBSD.mk    Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/IRIX.mk       Sat Mar 18 21:40:44 2006 +0000
@@ -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_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 @@
 .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 -r 6018ded760d6 -r 6274df3057ec mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/Interix.mk    Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/Linux.mk      Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Sat Mar 18 18:38:36 2006 +0000
+++ b/mk/platform/NetBSD.mk     Sat Mar 18 21:40:44 2006 +0000
@@ -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_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_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 -r 6018ded760d6 -r 6274df3057ec mk/platform/OSF1.mk
--- a/mk/platform/OSF1.mk       Sat Mar 18 18:38:36 2006 +0000



Home | Main Index | Thread Index | Old Index