From caf441c407ed5832ea320b384d117c6b84cafc03 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 25 Dec 1996 18:19:22 +0000
Subject: Integrate changes from OpenBSD's efforts to use the FreeBSD ports
 system. Generalize the selection of programs to run based on the existance of
 files rather than the OS names that we find.  Add comments about me being the
 keeper of the OpenBSD mods of this file.  Use ftp on OpenBSD rather than
 fetch since OpenBSD's FTP supports urls and there is no fetch.

Reviewed by:	Joerge Wunch, Jordan Hubbard, and others in ports I've forgotten
Obtained from:	OpenBSD with changes from me.
---
 Mk/bsd.port.mk | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index aae6baff20e5..bb2f6b6fff9f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -6,7 +6,7 @@
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
 #
-# $Id: bsd.port.mk,v 1.240 1996/12/18 02:27:44 asami Exp $
+# $Id: bsd.port.mk,v 1.241 1996/12/23 02:49:35 asami Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -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,9 @@ OPSYS!=	uname -s
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
+.if (${OPSYS} == "OpenBSD")
+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 +319,12 @@ DO_NADA?=		/usr/bin/true
 # 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 +334,11 @@ MAKE_FLAGS?=	-f
 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 +365,11 @@ PATCH_ARGS+=	-C
 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)
-- 
cgit v1.2.3