From owner-freebsd-ports  Sat Jan  4 04:46:29 1997
Return-Path: <owner-ports>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id EAA16563
          for ports-outgoing; Sat, 4 Jan 1997 04:46:29 -0800 (PST)
Received: from dfw-ix8.ix.netcom.com (dfw-ix8.ix.netcom.com [206.214.98.8])
          by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id EAA16557
          for <ports@freebsd.org>; Sat, 4 Jan 1997 04:46:27 -0800 (PST)
Received: from baloon.mimi.com (sjx-ca72-38.ix.netcom.com [207.92.177.166]) by dfw-ix8.ix.netcom.com (8.6.13/8.6.12) with ESMTP id EAA18788; Sat, 4 Jan 1997 04:45:46 -0800
Received: (from asami@localhost) by baloon.mimi.com (8.8.4/8.6.12) id EAA06777; Sat, 4 Jan 1997 04:45:42 -0800 (PST)
Date: Sat, 4 Jan 1997 04:45:42 -0800 (PST)
Message-Id: <199701041245.EAA06777@baloon.mimi.com>
To: imp@village.org
CC: ports@freebsd.org
In-reply-to: <199612260538.VAA03999@baloon.mimi.com> (asami@cs.berkeley.edu)
Subject: OpenBSD support in bsd.port.mk
From: asami@cs.berkeley.edu (Satoshi Asami)
Sender: owner-ports@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

Sorry for being late.  Here's a diff from the -current version based
on our recent discussion.  There shouldn't be any change of
functionality for FreeBSD.

For the directory orderings, I generally went from "root/system" to
"usr/user".  I didn't put back the NOMANCOMPRESS, you need to tell me
how it works in OpenBSD first (is it a positive logic with
MANCOMPRESS?).

Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.243
diff -u -r1.243 bsd.port.mk
--- bsd.port.mk	1996/12/26 01:02:29	1.243
+++ bsd.port.mk	1997/01/04 12:39:03
@@ -11,14 +11,15 @@
 # Please view me with 4 column tabs!
 
 # This is for this file, not for the ports that includes it, so it's
-# commented out -- the person to contact if you have questions/
+# not called MAINTAINER -- the person to contact if you have questions/
 # suggestions about bsd.port.mk.
 #
 # If you are not him, you are not allowed to commit to this file without
 # his permission. :)
 #
-# MAINTAINER=	asami@FreeBSD.ORG
-#
+
+FreeBSD_MAINTAINER=	asami@FreeBSD.ORG
+OpenBSD_MAINTAINER=	imp@OpenBSD.ORG
 
 # Supported Variables and their behaviors:
 #
@@ -26,10 +27,10 @@
 # 
 # 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
-#					NetBSD: /usr/opt
+#					FreeBSD/OpenBSD: /usr/ports
+#					NetBSD:          /usr/opt
 # DISTDIR 		- Where to get gzip'd, tarballed copies of original sources
 #				  (default: ${PORTSDIR}/distfiles).
 # PREFIX		- Where to install things in general (default: /usr/local).
@@ -317,10 +318,14 @@
 # Miscellaneous overridable commands:
 GMAKE?=			gmake
 XMKMF?=			xmkmf -a
-.if (${OPSYS} == "NetBSD")
+.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?=			/sbin/md5
+MD5?=			md5
 .endif
 MD5_FILE?=		${FILESDIR}/md5
 
@@ -328,7 +333,11 @@
 MAKEFILE?=		Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
 
+.if exists(/usr/bin/fetch)
 FETCH_CMD?=		/usr/bin/fetch
+.else
+FETCH_CMD?=		/usr/bin/ftp
+.endif
 
 TOUCH?=			/usr/bin/touch
 TOUCH_FLAGS?=	-f
@@ -355,7 +364,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)