From owner-freebsd-ports Mon Dec 23 00:23:08 1996 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id AAA24581 for ports-outgoing; Mon, 23 Dec 1996 00:23:08 -0800 (PST) Received: from rover.village.org (rover.village.org [204.144.255.49]) by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id AAA24576 for ; Mon, 23 Dec 1996 00:23:05 -0800 (PST) Received: from rover.village.org [127.0.0.1] by rover.village.org with esmtp (Exim 0.56 #1) id E0vc5f0-0002nj-00; Mon, 23 Dec 1996 01:22:58 -0700 To: ports@freebsd.org Subject: Need a quick review of some bsd.port.mk changes Date: Mon, 23 Dec 1996 01:22:58 -0700 From: Warner Losh Message-Id: Sender: owner-ports@freebsd.org X-Loop: FreeBSD.org Precedence: bulk I have some low impact (should be zero impact) changes for some of the ports as well as bsd.port.mk from OpenBSD. Anybody wanna review my changes? I'd like to get them into the tree if possible. Should be just like NetBSD changes, with minor variations... Warner P.S. Since it is short, here it is... 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 08:21:52 @@ -23,9 +23,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 +251,10 @@ .include "${.CURDIR}/../Makefile.inc" .endif +.if (${OPSYS} == "OpenBSD") +.include +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 @@ -316,6 +320,8 @@ XMKMF?= xmkmf -a .if (${OPSYS} == "NetBSD") MD5?= /usr/bin/md5 +.elif (${OPSYS} == "OpenBSD") +MD5?= /bin/md5 .else MD5?= /sbin/md5 .endif @@ -325,7 +331,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 +362,11 @@ PATCH_DIST_ARGS+= -C .endif +.if (${OPSYS} == "OpenBSD") +EXTRACT_CMD?= /bin/tar +.else EXTRACT_CMD?= /usr/bin/tar +.endif EXTRACT_SUFX?= .tar.gz # Backwards compatability. .if defined(EXTRACT_ARGS)