pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/platform First pass at converting pkgsrc to use the...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1bbe1923a25a
branches: trunk
changeset: 493347:1bbe1923a25a
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue May 03 18:30:12 2005 +0000
description:
First pass at converting pkgsrc to use the new tools framework (still
not on by default). Separate out the variable defintions that are
now made by the new tools framework. Some of the trickier platforms
(AIX, IRIX, Interix, OSF1) still need more work.
diffstat:
mk/platform/AIX.mk | 37 ++++++++++++++++++++-----------------
mk/platform/BSDOS.mk | 33 ++++++++++++++++++---------------
mk/platform/Darwin.mk | 31 +++++++++++++++++--------------
mk/platform/DragonFly.mk | 21 ++++++++++++---------
mk/platform/FreeBSD.mk | 19 +++++++++++--------
mk/platform/IRIX.mk | 21 ++++++++++++---------
mk/platform/Interix.mk | 20 ++++++++++++--------
mk/platform/Linux.mk | 23 +++++++++++++----------
mk/platform/NetBSD.mk | 25 ++++++++++++++-----------
mk/platform/OSF1.mk | 23 +++++++++++++----------
mk/platform/OpenBSD.mk | 21 ++++++++++++---------
mk/platform/SunOS.mk | 21 ++++++++++++---------
mk/platform/UnixWare.mk | 21 ++++++++++++---------
13 files changed, 178 insertions(+), 138 deletions(-)
diffs (truncated from 948 to 300 lines):
diff -r 683e11b22158 -r 1bbe1923a25a mk/platform/AIX.mk
--- a/mk/platform/AIX.mk Tue May 03 18:06:30 2005 +0000
+++ b/mk/platform/AIX.mk Tue May 03 18:30:12 2005 +0000
@@ -1,7 +1,25 @@
-# $NetBSD: AIX.mk,v 1.14 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: AIX.mk,v 1.15 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the AIX operating system.
+CPP?= ${LOCALBASE}/bin/cpp
+ECHO_N?= ${ECHO} -n
+#.if ${INSTALL} == "install"
+INSTALL= ${LOCALBASE}/bin/install-sh
+#.endif
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+# AIX strip fails too easily. Use a wrapper script instead
+.if exists(${LOCALBASE}/bin/strip)
+STRIP?= ${LOCALBASE}/bin/strip
+.endif
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -10,12 +28,10 @@
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-CPP?= ${LOCALBASE}/bin/cpp
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
.if exists(${LOCALBASE}/bin/gegrep)
EGREP?= ${LOCALBASE}/bin/gegrep
.else
@@ -52,9 +68,6 @@
HEAD?= /usr/bin/head
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
-#.if ${INSTALL} == "install"
-INSTALL= ${LOCALBASE}/bin/install-sh
-#.endif
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
@@ -75,14 +88,9 @@
.else
PERL5?= /usr/bin/perl
.endif
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
.if exists(${LOCALBASE}/bin/nbsed)
SED?= ${LOCALBASE}/bin/nbsed
.else
@@ -92,11 +100,6 @@
SH?= /bin/sh
SHLOCK= /usr/bin/shlock
SORT?= /usr/bin/sort
-# AIX strip fails too easily. Use a wrapper script instead
-.if exists(${LOCALBASE}/bin/strip)
-STRIP?= ${LOCALBASE}/bin/strip
-.endif
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(${LOCALBASE}/bin/tar)
TAR?= ${LOCALBASE}/bin/tar
@@ -109,9 +112,9 @@
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 0022
diff -r 683e11b22158 -r 1bbe1923a25a mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk Tue May 03 18:06:30 2005 +0000
+++ b/mk/platform/BSDOS.mk Tue May 03 18:30:12 2005 +0000
@@ -1,7 +1,23 @@
-# $NetBSD: BSDOS.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the BSD/OS operating system.
+#CPP= /usr/bin/cpp
+# BSD/OS doesn't have c++ command
+.if !exists(${CXX})
+CXX= /usr/bin/g++
+.endif
+ECHO_N?= ${ECHO} -n
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+# sh doesn't have built-in type
+TYPE?= which
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -10,16 +26,10 @@
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-#CPP= /usr/bin/cpp
-# BSD/OS doesn't have c++ command
-.if !exists(${CXX})
-CXX= /usr/bin/g++
-.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -60,14 +70,9 @@
# native /bin/pax doesn't support -O
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
# native sh and ksh both have problems under BSD/OS 4.3.1
@@ -75,7 +80,6 @@
SH?= /bin/bash
SHLOCK= ${LOCALBASE}/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(/bin/tar)
TAR?= /bin/tar
@@ -88,10 +92,9 @@
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-# sh doesn't have built-in type
-TYPE?= which
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 0022
diff -r 683e11b22158 -r 1bbe1923a25a mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk Tue May 03 18:06:30 2005 +0000
+++ b/mk/platform/Darwin.mk Tue May 03 18:30:12 2005 +0000
@@ -1,7 +1,22 @@
-# $NetBSD: Darwin.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the Darwin operating system.
+.if !defined(CPP) || ${CPP} == "cpp"
+CPP= ${CC} -E ${CPP_PRECOMP_FLAGS}
+.endif
+ECHO_N?= ${ECHO} -n
+LDD?= /usr/bin/otool -L
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+IMAKEOPTS+= -DBuildHtmlManPages=NO
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -10,14 +25,10 @@
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-.if !defined(CPP) || ${CPP} == "cpp"
-CPP= ${CC} -E ${CPP_PRECOMP_FLAGS}
-.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -34,9 +45,7 @@
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DBuildHtmlManPages=NO
LDCONFIG?= /sbin/ldconfig
-LDD?= /usr/bin/otool -L
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
@@ -52,20 +61,14 @@
PAX?= /bin/pax
.endif
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
SHLOCK= /usr/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(${LOCALBASE}/bin/tar)
TAR?= ${LOCALBASE}/bin/tar
@@ -78,9 +81,9 @@
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
.if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
CPP_PRECOMP_FLAGS?= -no-cpp-precomp # use the GNU cpp, not the OS X cpp
diff -r 683e11b22158 -r 1bbe1923a25a mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk Tue May 03 18:06:30 2005 +0000
+++ b/mk/platform/DragonFly.mk Tue May 03 18:30:12 2005 +0000
@@ -1,10 +1,19 @@
-# $NetBSD: DragonFly.mk,v 1.12 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: DragonFly.mk,v 1.13 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the DragonFly operating system.
+BRANDELF?= /usr/bin/brandelf # used by linux compat layer
+ECHO_N?= ${ECHO} -n
+IMAKEOPTS+= -DBuildHtmlManPages=NO
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
-BRANDELF?= /usr/bin/brandelf # used by linux compat layer
CAT?= /bin/cat
CHMOD?= /bin/chmod
CHOWN?= /usr/sbin/chown
@@ -15,7 +24,6 @@
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= /usr/bin/false
@@ -36,7 +44,6 @@
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DBuildHtmlManPages=NO
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
@@ -57,18 +64,14 @@
PAX?= /bin/pax
.endif
PERL5?= ${LOCALBASE}/bin/perl
Home |
Main Index |
Thread Index |
Old Index