PERFORCE change 118306 for review
Gabor Kovesdan
gabor at FreeBSD.org
Tue Apr 17 14:01:11 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=118306
Change 118306 by gabor at gabor_server on 2007/04/17 14:00:09
- Pull out general command variables from bsd.port.mk into
bsd.commands.mk, while I think it makes bsd.port.mk cleaner and it
is more suitable for the DESTDIR layout
- Add a NOOP framework for DESTDIR, I'll do the necessary operations in
the new if statement, but it is a NOOP for now
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#1 add
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#12 edit
Differences ...
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#12 (text+ko) ====
@@ -1043,6 +1043,18 @@
# Most port authors should not need to understand anything after this point.
#
+.include "${PORTSDIR}/Mk/bsd.commands.mk"
+
+#
+# DESTDIR section to start a chrooted process if incoked with DESTDIR set
+#
+
+.if defined(DESTDIR) && !empty(DESTDIR)
+.BEGIN:
+ ${ECHO_CMD} "===> DESTDIR support coming soon..."; \
+ ${FALSE}
+.else
+
# Look for ${WRKSRC}/.../*.orig files, and (re-)create
# ${FILEDIR}/patch-* files from them.
@@ -1072,77 +1084,6 @@
.endif
.endif
-AWK?= /usr/bin/awk
-BASENAME?= /usr/bin/basename
-BRANDELF?= /usr/bin/brandelf
-BZCAT?= /usr/bin/bzcat
-BZIP2_CMD?= /usr/bin/bzip2
-CAT?= /bin/cat
-CHGRP?= /usr/bin/chgrp
-CHMOD?= /bin/chmod
-CHOWN?= /usr/sbin/chown
-CHROOT?= /usr/sbin/chroot
-COMM?= /usr/bin/comm
-CP?= /bin/cp
-CPIO?= /usr/bin/cpio
-CUT?= /usr/bin/cut
-DC?= /usr/bin/dc
-DIALOG?= /usr/bin/dialog
-DIFF?= /usr/bin/diff
-DIRNAME?= /usr/bin/dirname
-EGREP?= /usr/bin/egrep
-EXPR?= /bin/expr
-FALSE?= false # Shell builtin
-FILE?= /usr/bin/file
-FIND?= /usr/bin/find
-FMT?= /usr/bin/fmt
-GREP?= /usr/bin/grep
-GUNZIP_CMD?= /usr/bin/gunzip -f
-GZCAT?= /usr/bin/gzcat
-GZIP?= -9
-GZIP_CMD?= /usr/bin/gzip -nf ${GZIP}
-HEAD?= /usr/bin/head
-ID?= /usr/bin/id
-IDENT?= /usr/bin/ident
-LDCONFIG?= /sbin/ldconfig
-LN?= /bin/ln
-LS?= /bin/ls
-MKDIR?= /bin/mkdir -p
-MKTEMP?= /usr/bin/mktemp
-MV?= /bin/mv
-OBJCOPY?= /usr/bin/objcopy
-OBJDUMP?= /usr/bin/objdump
-PASTE?= /usr/bin/paste
-PAX?= /bin/pax
-PRINTF?= /usr/bin/printf
-REALPATH?= /bin/realpath
-RM?= /bin/rm
-RMDIR?= /bin/rmdir
-SED?= /usr/bin/sed
-SETENV?= /usr/bin/env
-SH?= /bin/sh
-SORT?= /usr/bin/sort
-STRIP_CMD?= /usr/bin/strip
-SU_CMD?= /usr/bin/su root -c
-SYSCTL?= /sbin/sysctl
-TAIL?= /usr/bin/tail
-TEST?= test # Shell builtin
-TR?= LANG=C /usr/bin/tr
-TRUE?= true # Shell builtin
-UNAME?= /usr/bin/uname
-UNZIP_CMD?= ${LOCALBASE}/bin/unzip
-WHICH?= /usr/bin/which
-XARGS?= /usr/bin/xargs
-YACC?= /usr/bin/yacc
-
-# ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
-# or "true" if the make flag -s is given. Use ECHO_CMD where you mean
-# the echo command.
-ECHO_CMD?= echo # Shell builtin
-
-# Used to print all the '===>' style prompts - override this to turn them off.
-ECHO_MSG?= ${ECHO_CMD}
-
# Get the default maintainer
MAINTAINER?= ports at FreeBSD.org
@@ -5738,3 +5679,6 @@
.endif
# End of post-makefile section.
+
+.endif
+# End of the DESTDIR if statement
More information about the p4-projects
mailing list