[pkgsrc/trunk]: pkgsrc/mk Revert previous (re-add common CPP_PRECOMP_FLAGS). ...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db27be285e59
branches:  trunk
changeset: 483648:db27be285e59
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Nov 16 18:04:00 2004 +0000

description:
Revert previous (re-add common CPP_PRECOMP_FLAGS).  For consistency, also
move usage of _USER_DEPENDS and _OPSYS_MAX_CMDLEN to bsd.pkg.mk.

diffstat:

 mk/bsd.pkg.mk            |  9 ++++++++-
 mk/platform/AIX.mk       |  6 ++----
 mk/platform/BSDOS.mk     |  4 ++--
 mk/platform/Darwin.mk    |  6 +-----
 mk/platform/DragonFly.mk |  6 ++----
 mk/platform/FreeBSD.mk   |  6 ++----
 mk/platform/IRIX.mk      |  4 ++--
 mk/platform/Interix.mk   |  7 +++----
 mk/platform/Linux.mk     |  4 ++--
 mk/platform/NetBSD.mk    |  6 ++----
 mk/platform/OpenBSD.mk   |  6 ++----
 mk/platform/SunOS.mk     |  4 ++--
 mk/platform/UnixWare.mk  |  4 ++--
 13 files changed, 32 insertions(+), 40 deletions(-)

diffs (truncated from 363 to 300 lines):

diff -r 0c7f54a57b73 -r db27be285e59 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1538 2004/11/16 16:21:40 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1539 2004/11/16 18:04:00 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -379,6 +379,10 @@
 .  endfor
 .endif
 
+CPPFLAGS+=             ${CPP_PRECOMP_FLAGS}
+DEPENDS+=              ${USE_USERADD:D${_USER_DEPENDS}}
+DEPENDS+=              ${USE_GROUPADD:D${_USER_DEPENDS}}
+
 # If GNU_CONFIGURE is defined, then pass LIBS to the GNU configure script.
 # also pass in a CONFIG_SHELL to avoid picking up bash
 .if defined(GNU_CONFIGURE)
@@ -386,6 +390,9 @@
 CONFIGURE_ENV+=                CONFIG_SHELL=${CONFIG_SHELL}
 CONFIGURE_ENV+=                LIBS=${LIBS:Q}
 CONFIGURE_ENV+=                install_sh=${INSTALL:Q}
+.  if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN)
+CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
+.  endif
 .endif
 
 #
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/AIX.mk        Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: AIX.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -114,10 +114,9 @@
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
 _USER_DEPENDS= user>=20000313:../../sysutils/user
-DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=   openmotif       # default 2.0 compatible libs type
@@ -186,7 +185,6 @@
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 #_OPSYS_MAX_CMDLEN!=   /sbin/sysctl -n kern.argmax
-#CONFIGURE_ENV+=               lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 #.endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk      Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/BSDOS.mk      Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -98,6 +98,7 @@
 USERADD?=      /usr/sbin/adduser
 GROUPADD?=     /usr/sbin/addgroup
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
@@ -166,7 +167,6 @@
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 #_OPSYS_MAX_CMDLEN!=   /sbin/sysctl -n kern.argmax
-#CONFIGURE_ENV+=               lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 #.endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/Darwin.mk     Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: Darwin.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -87,7 +87,6 @@
 .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
 CPP_PRECOMP_FLAGS?=    -no-cpp-precomp # use the GNU cpp, not the OS X cpp
 .endif
-CPPFLAGS+=             ${CPP_PRECOMP_FLAGS}
 DEF_UMASK?=            0022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
@@ -107,8 +106,6 @@
 _PKG_USER_HOME?=       /var/empty      # to match other system accounts
 _PKG_USER_SHELL?=      /usr/bin/false  # to match other system accounts
 _USER_DEPENDS=         user>=20040801:../../sysutils/user_darwin
-DEPENDS+=              ${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=              ${USE_GROUPADD:D${_USER_DEPENDS}}
 
 # imake installs manpages in weird places
 # these values from /usr/X11R6/lib/X11/config/Imake.tmpl
@@ -158,7 +155,6 @@
 # to avoid a test required by the libtool script that takes forever.
 .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 _OPSYS_MAX_CMDLEN!=    /usr/sbin/sysctl -n kern.argmax
-CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 .endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk  Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/DragonFly.mk  Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -94,10 +94,9 @@
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
 _USER_DEPENDS= user>=20000313:../../sysutils/user
-DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
@@ -169,7 +168,6 @@
 # to avoid a test required by the libtool script that takes forever.
 .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 _OPSYS_MAX_CMDLEN!=    /sbin/sysctl -n kern.argmax
-CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 .endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk    Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/FreeBSD.mk    Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: FreeBSD.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -94,10 +94,9 @@
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
 _USER_DEPENDS= user>=20000313:../../sysutils/user
-DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
@@ -169,7 +168,6 @@
 # to avoid a test required by the libtool script that takes forever.
 .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 _OPSYS_MAX_CMDLEN!=    /sbin/sysctl -n kern.argmax
-CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 .endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/IRIX.mk       Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.5 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: IRIX.mk,v 1.6 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -92,6 +92,7 @@
 WC?=           /sbin/wc
 XARGS?=                /sbin/xargs
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
@@ -170,7 +171,6 @@
 # to avoid a test required by the libtool script that takes forever.
 .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 _OPSYS_MAX_CMDLEN!=    /usr/sbin/sysconf ARG_MAX
-CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 .endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/Interix.mk    Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.11 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: Interix.mk,v 1.12 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -108,9 +108,8 @@
 GROUPADD?=             ${LOCALBASE}/sbin/groupadd
 _PKG_USER_HOME?=       # empty by default
 _USER_DEPENDS=         user>=20040426:../../sysutils/user_interix
-DEPENDS+=              ${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=              ${USE_GROUPADD:D${_USER_DEPENDS}}
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            002
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
 
@@ -189,7 +188,7 @@
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=262144
+_OPSYS_MAX_CMDLEN=     262144
 .endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/Linux.mk      Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.4 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: Linux.mk,v 1.5 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -129,6 +129,7 @@
 WC?=           /usr/bin/wc
 XARGS?=                /usr/bin/xargs -r
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
@@ -196,7 +197,6 @@
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 #_OPSYS_MAX_CMDLEN!=   /sbin/sysctl -n kern.argmax
-#CONFIGURE_ENV+=               lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 #.endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/NetBSD.mk     Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.4 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: NetBSD.mk,v 1.5 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -87,10 +87,9 @@
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
 _USER_DEPENDS= user>=20000313:../../sysutils/user
-DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif
 
+CPP_PRECOMP_FLAGS?=    # unset
 DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
@@ -204,7 +203,6 @@
 # to avoid a test required by the libtool script that takes forever.
 .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
 _OPSYS_MAX_CMDLEN!=    /sbin/sysctl -n kern.argmax
-CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
 .endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
diff -r 0c7f54a57b73 -r db27be285e59 mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk    Tue Nov 16 18:01:58 2004 +0000
+++ b/mk/platform/OpenBSD.mk    Tue Nov 16 18:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $
+# $NetBSD: OpenBSD.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -85,10 +85,9 @@
 USERADD?=      ${LOCALBASE}/sbin/useradd
 GROUPADD?=     ${LOCALBASE}/sbin/groupadd
 _USER_DEPENDS= user>=20000313:../../sysutils/user
-DEPENDS+=      ${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=      ${USE_GROUPADD:D${_USER_DEPENDS}}
 .endif