pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/platform Reverted the last changes, which factored ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1c94437440c
branches:  trunk
changeset: 534396:b1c94437440c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 19 13:41:34 2007 +0000

description:
Reverted the last changes, which factored out some definitions that are
usually the same on the supported platforms.

The reason for having duplicate code in these files is to make it easier
to port pkgsrc to a new platform: You just have to copy one of the
existing platform files and edit the values in it. With some values
factored out, you would have to look at one more file.

Pointed out by agc@.

diffstat:

 mk/platform/AIX.mk       |   10 ++-
 mk/platform/BSDOS.mk     |   10 ++-
 mk/platform/Darwin.mk    |   10 ++-
 mk/platform/DragonFly.mk |   12 +++-
 mk/platform/FreeBSD.mk   |   12 +++-
 mk/platform/HPUX.mk      |   17 +++--
 mk/platform/IRIX.mk      |   10 ++-
 mk/platform/Interix.mk   |    9 ++-
 mk/platform/Linux.mk     |   17 +++--
 mk/platform/NetBSD.mk    |   18 ++++-
 mk/platform/OSF1.mk      |   12 +++-
 mk/platform/OpenBSD.mk   |   15 ++++-
 mk/platform/SunOS.mk     |   15 ++--
 mk/platform/UnixWare.mk  |    9 ++-
 mk/platform/defaults.mk  |  133 -----------------------------------------------
 15 files changed, 120 insertions(+), 189 deletions(-)

diffs (truncated from 760 to 300 lines):

diff -r a38893433481 -r b1c94437440c mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/AIX.mk        Fri Oct 19 13:41:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.28 2007/10/18 21:52:23 rillig Exp $
+# $NetBSD: AIX.mk,v 1.29 2007/10/19 13:41:34 rillig Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -16,12 +16,18 @@
 SU?=           /usr/bin/su
 TYPE?=         type                            # Shell builtin
 
+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
 NOLOGIN?=              /sbin/nologin
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             ${SU} - root -c
 ROOT_USER?=            root
 ROOT_GROUP?=           system
+ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
+ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 
 # imake installs manpages in weird places
 # these values from /usr/X11R6/lib/X11/config/NetBSD.cf
@@ -80,5 +86,3 @@
 #GAMEMODE=             2555
 #GAMEDIRMODE=          0775
 #.endif
-
-.include "${.PARSEDIR}/defaults.mk"
diff -r a38893433481 -r b1c94437440c mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk      Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/BSDOS.mk      Fri Oct 19 13:41:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.22 2007/10/18 21:52:23 rillig Exp $
+# $NetBSD: BSDOS.mk,v 1.23 2007/10/19 13:41:34 rillig Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -17,6 +17,8 @@
 # sh doesn't have built-in type
 TYPE?=         which
 
+CPP_PRECOMP_FLAGS?=    # unset
+DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
 .else
@@ -24,9 +26,13 @@
 .endif
 MOTIF_TYPE_DEFAULT?=   openmotif       # default 2.0 compatible libs type
 NOLOGIN?=              /sbin/nologin
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             ${SU} - root -c
 ROOT_USER?=            root
 ROOT_GROUP?=   wheel
+ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
+ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 
 # imake installs manpages in weird places
 # XXX: assume NetBSD defaults until somebody determines correct values
@@ -88,5 +94,3 @@
 #GAMEMODE=             2555
 #GAMEDIRMODE=          0775
 #.endif
-
-.include "${.PARSEDIR}/defaults.mk"
diff -r a38893433481 -r b1c94437440c mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/Darwin.mk     Fri Oct 19 13:41:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.25 2007/10/18 21:52:23 rillig Exp $
+# $NetBSD: Darwin.mk,v 1.26 2007/10/19 13:41:35 rillig Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -7,6 +7,7 @@
 .endif
 ECHO_N?=       ${ECHO} -n
 LDD?=          /usr/bin/otool -L
+IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 PKGLOCALEDIR?= share
 PS?=           /bin/ps
 # XXX: default from defaults/mk.conf.  Verify/correct for this platform
@@ -21,14 +22,19 @@
 .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
 CPP_PRECOMP_FLAGS?=    -no-cpp-precomp # use the GNU cpp, not the OS X cpp
 .endif
+DEF_UMASK?=            0022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=   openmotif       # default 2.0 compatible libs type
 NOLOGIN?=              /usr/bin/false
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             /usr/bin/sudo ${SH} -c
 ROOT_GROUP?=           wheel
 ROOT_USER?=            root
 SERIAL_DEVICES?=       /dev/null
+ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
+ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 
 GROUPADD?=             ${LOCALBASE}/sbin/groupadd
 USERADD?=              ${LOCALBASE}/sbin/useradd
@@ -100,5 +106,3 @@
 #GAMEMODE=             2555
 #GAMEDIRMODE=          0775
 #.endif
-
-.include "${.PARSEDIR}/defaults.mk"
diff -r a38893433481 -r b1c94437440c mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk  Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/DragonFly.mk  Fri Oct 19 13:41:34 2007 +0000
@@ -1,20 +1,28 @@
-# $NetBSD: DragonFly.mk,v 1.33 2007/10/18 21:52:23 rillig Exp $
+# $NetBSD: DragonFly.mk,v 1.34 2007/10/19 13:41:35 rillig Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
 ECHO_N?=       ${ECHO} -n
+IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 IMAKEOPTS+=    -DBuildHtmlManPages=NO
+PKGLOCALEDIR?= share
 PS?=           /bin/ps
 PW?=           /usr/sbin/pw
 SU?=           /usr/bin/su
 TYPE?=         type                            # Shell builtin
 
+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
 NOLOGIN?=              /sbin/nologin
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             ${SU} - root -c
 ROOT_USER?=            root
 ROOT_GROUP?=           wheel
+ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
+ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 
 # DragonFly does not provide an X11, so default to modular X.org
 X11_TYPE?=             modular
@@ -84,5 +92,3 @@
 GAMEMODE=              2555
 GAMEDIRMODE=           0775
 .endif
-
-.include "${.PARSEDIR}/defaults.mk"
diff -r a38893433481 -r b1c94437440c mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk    Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/FreeBSD.mk    Fri Oct 19 13:41:34 2007 +0000
@@ -1,15 +1,19 @@
-# $NetBSD: FreeBSD.mk,v 1.22 2007/10/18 21:52:23 rillig Exp $
+# $NetBSD: FreeBSD.mk,v 1.23 2007/10/19 13:41:35 rillig Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
 BRANDELF?=     /usr/bin/brandelf               # used by linux compat layer
 ECHO_N?=       ${ECHO} -n
+IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 IMAKEOPTS+=    -DBuildHtmlManPages=NO
+PKGLOCALEDIR?= share
 PS?=           /bin/ps
 PW?=           /usr/sbin/pw
 SU?=           /usr/bin/su
 TYPE?=         type                            # Shell builtin
 
+CPP_PRECOMP_FLAGS?=    # unset
+DEF_UMASK?=            0022
 .if ${OBJECT_FMT} == "ELF"
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
 .else
@@ -17,9 +21,13 @@
 .endif
 MOTIF_TYPE_DEFAULT?=   openmotif       # default 2.0 compatible libs type
 NOLOGIN?=              /sbin/nologin
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             ${SU} - root -c
 ROOT_USER?=            root
 ROOT_GROUP?=   wheel
+ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
+ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 
 # imake installs manpages in weird places
 IMAKE_MAN_SOURCE_PATH= man/man
@@ -86,5 +94,3 @@
 GAMEMODE=              2555
 GAMEDIRMODE=           0775
 .endif
-
-.include "${.PARSEDIR}/defaults.mk"
diff -r a38893433481 -r b1c94437440c mk/platform/HPUX.mk
--- a/mk/platform/HPUX.mk       Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/HPUX.mk       Fri Oct 19 13:41:34 2007 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: HPUX.mk,v 1.9 2007/10/18 21:52:23 rillig Exp $
+# $NetBSD: HPUX.mk,v 1.10 2007/10/19 13:41:35 rillig Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
 CPP?=          /opt/langtools/lbin/cpp
 ECHO_N?=       /usr/bin/printf         # echo doesn't understand -n
+IMAKE_MAKE?=   ${MAKE}                 # program which gets invoked by imake
+PKGLOCALEDIR=  share
 PS?=           /bin/ps
 SU?=           /usr/bin/su
 TYPE?=         type                    # Shell builtin
@@ -11,14 +13,19 @@
 USERADD?=      /usr/sbin/useradd
 GROUPADD?=     /usr/sbin/groupadd
 
+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
 NOLOGIN?=              /etc/nologin
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             ${SU} - root -c
 ROOT_USER?=            root
 ROOT_GROUP?=           sys
 TOUCH_FLAGS?=                          # touch doesn't understand -f
-
+ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
+ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 # imake installs manpages in weird places
 # these values from /usr/X11R6/lib/X11/config/NetBSD.cf
 IMAKE_MAN_SOURCE_PATH= man/cat
@@ -71,7 +78,5 @@
 PREFER.openssl?=       pkgsrc
 PREFER.zlib?=          pkgsrc
 
-_STRIPFLAG_CC?=                # none; XXX: why?
-_STRIPFLAG_INSTALL?=   # none; XXX: why?
-
-.include "${.PARSEDIR}/defaults.mk"
+_STRIPFLAG_CC?=                ${_INSTALL_UNSTRIPPED:D:U}      # cc(1) option to strip
+_STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U}      # install(1) option to strip
diff -r a38893433481 -r b1c94437440c mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/IRIX.mk       Fri Oct 19 13:41:34 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: IRIX.mk,v 1.31 2007/10/18 21:52:24 rillig Exp $
+# $NetBSD: IRIX.mk,v 1.32 2007/10/19 13:41:35 rillig Exp $
 #
 # Variable definitions for the IRIX operating system.
 
 ECHO_N?=       ${ECHO} -n
+IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 IMAKEOPTS+=    -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
 IMAKEOPTS+=    -DManUsr=${PREFIX}
 .if empty(OS_VERSION:M6*)
@@ -10,10 +11,13 @@
 IMAKEOPTS+=    -DOptimizerLevel="${CFLAGS}"
 IMAKEOPTS+=    -DManPath=${PREFIX}/man
 .endif
+PKGLOCALEDIR?= share
 PS?=           /sbin/ps
 SU?=           /sbin/su
 TYPE?=         /sbin/type
 
+CPP_PRECOMP_FLAGS?=    # unset
+DEF_UMASK?=            022
 DEFAULT_SERIAL_DEVICE?=        /dev/null
 EXPORT_SYMBOLS_LDFLAGS?=       # Don't add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=   dt              # default 2.0 compatible libs type
@@ -22,6 +26,8 @@
 ROOT_GROUP?=           sys
 ROOT_USER?=            root
 SERIAL_DEVICES?=       /dev/null
+ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=        ulimit -v `ulimit -H -v`
 
 # imake installs manpages in weird places
@@ -115,5 +121,3 @@
 #GAMEMODE=             2555
 #GAMEDIRMODE=          0775
 #.endif
-
-.include "${.PARSEDIR}/defaults.mk"
diff -r a38893433481 -r b1c94437440c mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Fri Oct 19 13:33:24 2007 +0000
+++ b/mk/platform/Interix.mk    Fri Oct 19 13:41:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.53 2007/10/18 21:52:24 rillig Exp $
+# $NetBSD: Interix.mk,v 1.54 2007/10/19 13:41:35 rillig Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -79,7 +79,9 @@
 ###
 



Home | Main Index | Thread Index | Old Index