Date: Tue, 22 Jan 2008 11:35:09 +1100 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/119879: [patch] Mk/bsd.commands.mk - add SHA256, MD5, GMAKE and XMKMF Message-ID: <20080122003509.18E0E350@k7.mavetju> Resent-Message-ID: <200801220040.m0M0e42A024724@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119879
>Category: ports
>Synopsis: [patch] Mk/bsd.commands.mk - add SHA256, MD5, GMAKE and XMKMF
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 22 00:40:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 6.2-RELEASE-p4 i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:55:55 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/SMP i386
As requested by gabor@ to improve the contents of bsd.commands.mk.
>Description:
>How-To-Repeat:
>Fix:
Index: bsd.commands.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.commands.mk,v
retrieving revision 1.1
diff -u -r1.1 bsd.commands.mk
--- bsd.commands.mk 4 Aug 2007 11:37:23 -0000 1.1
+++ bsd.commands.mk 22 Jan 2008 00:28:20 -0000
@@ -42,6 +42,7 @@
FILE?= /usr/bin/file
FIND?= /usr/bin/find
FMT?= /usr/bin/fmt
+GMAKE?= ${LOCALBASE}/bin/gmake
GREP?= /usr/bin/grep
GUNZIP_CMD?= /usr/bin/gunzip -f
GZCAT?= /usr/bin/gzcat
@@ -86,8 +87,22 @@
UNZIP_CMD?= ${LOCALBASE}/bin/unzip
WHICH?= /usr/bin/which
XARGS?= /usr/bin/xargs
+XMKMF?= ${LOCALBASE}/bin/xmkmf -a
YACC?= /usr/bin/yacc
+.if exists(/sbin/md5)
+MD5?= /sbin/md5
+.else
+MD5?= md5
+.endif
+.if exists(/sbin/sha256)
+SHA256?= /sbin/sha256
+.elif exists(${LOCALBASE}/sbin/sha256)
+SHA256?= ${LOCALBASE}/sbin/sha256
+.else
+SHA256?= NO
+.endif
+
# 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.
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.589
diff -u -r1.589 bsd.port.mk
--- bsd.port.mk 17 Oct 2007 10:12:24 -0000 1.589
+++ bsd.port.mk 22 Jan 2008 00:28:28 -0000
@@ -2121,22 +2121,6 @@
# Use this as the first operand to always build dependency.
NONEXISTENT?= /nonexistent
-# Miscellaneous overridable commands:
-GMAKE?= gmake
-XMKMF?= xmkmf -a
-.if exists(/sbin/md5)
-MD5?= /sbin/md5
-.else
-MD5?= md5
-.endif
-.if exists(/sbin/sha256)
-SHA256?= /sbin/sha256
-.elif exists(${LOCALBASE}/sbin/sha256)
-SHA256?= ${LOCALBASE}/sbin/sha256
-.else
-SHA256?= NO
-.endif
-
CHECKSUM_ALGORITHMS?= md5 sha256
MD5_FILE?= ${MASTERDIR}/distinfo
@@ -2144,9 +2128,9 @@
MAKE_FLAGS?= -f
MAKEFILE?= Makefile
MAKE_ENV+= PREFIX=${PREFIX} \
- LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
- MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
- CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
+ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+ MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
PTHREAD_CFLAGS?=
PTHREAD_LIBS?= -pthread
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080122003509.18E0E350>