Date: Fri, 16 Jan 2004 00:39:30 +0100 (CET) From: Markus Brueffer <brueffer@phoenix-systems.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61401: Remove PORTSDIR for Net/OpenBSD from bsd.port.mk Message-ID: <20040115233930.052C91FE@maquis.hitnet.rwth-aachen.de> Resent-Message-ID: <200401152340.i0FNeD3a049385@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61401
>Category: ports
>Synopsis: Remove PORTSDIR for Net/OpenBSD from bsd.port.mk
>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: Thu Jan 15 15:40:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Markus Brueffer
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD cheops.phoenix 5.2-CURRENT FreeBSD 5.2-CURRENT #16: Mon Dec 22 00:35:14 CET 2003 root@cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386
>Description:
PORTSDIR was removed years ago from NetBSD (now called PKGSRCDIR).
Furthermore it is set to /usr/pkgsrc, not /usr/opt on NetBSD.
Remove the special case for it from bsd.port.mk as well as related
comments.
Discussed with: will
>How-To-Repeat:
>Fix:
--- bsd.port.mk.diff begins here ---
--- bsd.port.mk.orig Thu Jan 15 19:14:41 2004
+++ bsd.port.mk Thu Jan 15 23:58:15 2004
@@ -510,9 +510,7 @@
# MASTERDIR - Where the port finds patches, package files, etc. Define
# this is you have two or more ports that share most of the
# files (default: ${.CURDIR}).
-# PORTSDIR - The root of the ports tree. Defaults:
-# FreeBSD/OpenBSD: /usr/ports
-# NetBSD: /usr/opt
+# PORTSDIR - The root of the ports tree. (default: /usr/ports)
# DISTDIR - Where to get gzip'd, tarballed copies of original sources
# (default: ${PORTSDIR}/distfiles).
# PACKAGES - A top level directory where all packages go (rather than
@@ -983,11 +981,7 @@
# 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
# by individual Makefiles or local system make configuration.
-.if (${OPSYS} == "NetBSD")
-PORTSDIR?= /usr/opt
-.else
PORTSDIR?= /usr/ports
-.endif
LOCALBASE?= ${DESTDIR}/usr/local
X11BASE?= ${DESTDIR}/usr/X11R6
LINUXBASE?= ${DESTDIR}/compat/linux
--- bsd.port.mk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040115233930.052C91FE>