Date: Fri, 4 Nov 2005 17:04:45 GMT From: Tilman Linneweh <arved@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/88493: bsd.port.mk: cleanup cruft Message-ID: <200511041704.jA4H4jqB072594@freefall.freebsd.org> Resent-Message-ID: <200511041710.jA4HAFLo077518@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88493
>Category: ports
>Synopsis: bsd.port.mk: cleanup cruft
>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: Fri Nov 04 17:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Tilman Linneweh
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 4.11-STABLE FreeBSD 4.11-STABLE #16: Sat Feb 26 00:02:03 GMT 2005 kensmith@freefall.freebsd.org:/c/src/sys/compile/FREEFALL i386
>Description:
Note: This is a patch against devel/portmk/Mk/bsd.port.mk
Changelog:
- unzip was never part of the basesystem, I think this was a
c&pasto from bunzip
- sysctl moved to /sbin 6 years ago, so don't look for it in /usr/sbin
- Remove support for OpenBSD (committed in 1997, unlikely to work
nowadays), they have tar and md5 in different directories.
- Remove a leftover code about "broken for elf", there is no matching
code anymore.
>How-To-Repeat:
>Fix:
--- patch-bpm begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/devel/portmk/Mk/bsd.port.mk,v
retrieving revision 1.6
diff -u -r1.6 bsd.port.mk
--- bsd.port.mk 3 Nov 2005 21:18:09 -0000 1.6
+++ bsd.port.mk 4 Nov 2005 16:53:49 -0000
@@ -1021,12 +1021,7 @@
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
UNAME?= /usr/bin/uname
-.if exists(/usr/bin/unzip)
-UNZIP_CMD?= /usr/bin/unzip
-.else
UNZIP_CMD?= ${LOCALBASE}/bin/unzip
-ZIPDEPENDS= yes
-.endif
WHICH?= /usr/bin/which
XARGS?= /usr/bin/xargs
YACC?= /usr/bin/yacc
@@ -1062,11 +1057,7 @@
# Get __FreeBSD_version
.if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
OSVERSION!= /sbin/sysctl -n kern.osreldate
-.else
-OSVERSION!= /usr/sbin/sysctl -n kern.osreldate
-.endif
.endif
# Get the object format.
@@ -1454,7 +1445,7 @@
.if ${PATCHFILES:M*.bz2}x != x && defined(BZIP2DEPENDS)
PATCH_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
.endif
-.if ${PATCHFILES:M*.zip}x != x && defined(ZIPDEPENDS)
+.if ${PATCHFILES:M*.zip}x != x
PATCH_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
.endif
.endif
@@ -1462,7 +1453,7 @@
.if defined(USE_BZIP2) && defined(BZIP2DEPENDS)
EXTRACT_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
.endif
-.if defined(USE_ZIP) && defined(ZIPDEPENDS)
+.if defined(USE_ZIP)
EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
.endif
.if defined(USE_GMAKE)
@@ -1839,10 +1830,6 @@
XMKMF?= xmkmf -a
.if exists(/sbin/md5)
MD5?= /sbin/md5
-.elif exists(/bin/md5)
-MD5?= /bin/md5
-.elif exists(/usr/bin/md5)
-MD5?= /usr/bin/md5
.else
MD5?= md5
.endif
@@ -1931,11 +1918,7 @@
PATCH_DIST_ARGS+= --suffix .orig
.endif
-.if exists(/bin/tar)
-TAR?= /bin/tar
-.else
TAR?= /usr/bin/tar
-.endif
# EXTRACT_SUFX is defined in .pre.mk section
.if defined(USE_ZIP)
@@ -2580,11 +2563,7 @@
.if defined(GNU_CONFIGURE)
# Maximum command line length
.if !defined(CONFIGURE_MAX_CMD_LEN)
-.if exists(/sbin/sysctl)
CONFIGURE_MAX_CMD_LEN!= /sbin/sysctl -n kern.argmax
-.else
-CONFIGURE_MAX_CMD_LEN!= /usr/sbin/sysctl -n kern.argmax
-.endif
.endif
CONFIGURE_ARGS+= --prefix=${PREFIX} ${CONFIGURE_TARGET}
CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
@@ -2741,8 +2720,6 @@
# Don't build a port if it's restricted and we don't want to get
# into that.
#
-# Don't build a port on an ELF machine if it's broken for ELF.
-#
# Don't build a port if it's broken, unless we're running a parallel
# build (in case it's fixed).
#
--- patch-bpm ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511041704.jA4H4jqB072594>