Date: Mon, 23 Dec 1996 08:30:03 -0700 From: Warner Losh <imp@village.org> To: ports@freebsd.org Subject: Re: Need a quick review of some bsd.port.mk changes Message-ID: <E0vcCKJ-0003O8-00@rover.village.org> In-Reply-To: Your message of "Mon, 23 Dec 1996 11:06:13 %2B0100." <199612231006.LAA02493@uriah.heep.sax.de> References: <199612231006.LAA02493@uriah.heep.sax.de>
next in thread | previous in thread | raw e-mail | index | archive | help
Re: Why do things have to live in different locations?
Because the criteria for different directories isn't as clear as it
could be, and the long, dead hand of the past is guiding many of our
actions when things are clear...
Re: tar in /bin in OpenBSD
tar and cpio have been replaced by pax, which groks them all. I
think, but am not sure, that it also has something to do with the
installation process (not having a machine that had a supported
install disk at the time, I don't know for sure).
In message <199612231006.LAA02493@uriah.heep.sax.de> J Wunsch writes:
: And, to continue with this, it should IMHO be expressed as:
OK, based on this and other feedback, here's the latest diffs. I've
tested this on OpenBSD and FreeBSD, but not NetBSD. Don't think it
should break there. I've also added a bit about me maintaining the
OpenBSD version as well as the exists() changes suggested by Joerge.
I've now build arc, unzip, and zip w/o problems, and gshar+gunshar
with only a minor problem with the master site failing over to
freefall (I've seen ${MAINTANER} mail on this, so the problem is being
worked on). Now, to build other things too.... Wish I had that T1
rather than the 33.6 link at 2.3kB/s...
Warner
BTW, My company folded on Friday (Merry Christmas!), so I'm looking
for consulting work. Drop me a line if you want more info.
Index: bsd.port.mk
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/share/mk/bsd.port.mk,v
retrieving revision 1.240
diff -u -r1.240 bsd.port.mk
--- bsd.port.mk 1996/12/18 02:27:44 1.240
+++ bsd.port.mk 1996/12/23 15:18:45
@@ -16,6 +16,8 @@
#
# MAINTAINER= asami@FreeBSD.ORG
#
+# OPENBSD_MAINTAINER= imp@OpenBSD.ORG
+#
# Supported Variables and their behaviors:
#
@@ -23,9 +25,9 @@
#
# OPSYS - Portability clause. This is the operating system the
# makefile is being used on. Automatically set to
-# "FreeBSD" or "NetBSD" as appropriate.
+# "FreeBSD," "NetBSD," or "OpenBSD" as appropriate.
# PORTSDIR - The root of the ports tree. Defaults:
-# FreeBSD: /usr/ports
+# OpenBSD/FreeBSD: /usr/ports
# NetBSD: /usr/opt
# DISTDIR - Where to get gzip'd, tarballed copies of original sources
# (default: ${PORTSDIR}/distfiles).
@@ -251,6 +253,10 @@
.include "${.CURDIR}/../Makefile.inc"
.endif
+.if (${OPSYS} == "OpenBSD")
+.include <bsd.own.mk>
+NOMANCOMPRESS?=yes
+.endif
# These need to be absolute since we don't know how deep in the ports
# tree we are and thus can't go relative. They can, of course, be overridden
@@ -314,8 +320,12 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
XMKMF?= xmkmf -a
-.if (${OPSYS} == "NetBSD")
+.if exists(/usr/bin/md5)
MD5?= /usr/bin/md5
+.elif exists(/bin/md5)
+MD5?= /bin/md5
+.elif exists(/usr/local/bin/md5)
+MD5?= /usr/local/bin/md5
.else
MD5?= /sbin/md5
.endif
@@ -325,7 +335,11 @@
MAKEFILE?= Makefile
MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
+.if (${OPSYS} == "OpenBSD")
+FETCH_CMD?= /usr/bin/ftp
+.else
FETCH_CMD?= /usr/bin/fetch
+.endif
TOUCH?= /usr/bin/touch
TOUCH_FLAGS?= -f
@@ -352,7 +366,11 @@
PATCH_DIST_ARGS+= -C
.endif
+.if exists(/bin/tar)
+EXTRACT_CMD?= /bin/tar
+.else
EXTRACT_CMD?= /usr/bin/tar
+.endif
EXTRACT_SUFX?= .tar.gz
# Backwards compatability.
.if defined(EXTRACT_ARGS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E0vcCKJ-0003O8-00>