summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf>1998-04-25 22:42:16 +0000
committerhubertf <hubertf>1998-04-25 22:42:16 +0000
commit5632e3ff0deb70a59b1e9201ac13adff079ec92f (patch)
treeaf38dfd4d7ea64bc3da2866adeb2b165f951d883
parentb59faa2c73d44db1ac543c54481570c323778c8f (diff)
downloadpkgsrc-5632e3ff0deb70a59b1e9201ac13adff079ec92f.tar.gz
Make PORTSDIR still be an absolute patch, but don't require it to
be hardcoded to /usr/pkgsrc. Use ${.CURDIR} instead. Inspired by Jaromir Dolecek's PR 5360.
-rw-r--r--mk/bsd.pkg.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 22008c0564d..6108b9a0b24 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $NetBSD: bsd.pkg.mk,v 1.77 1998/04/25 00:01:21 hubertf Exp $
+# $NetBSD: bsd.pkg.mk,v 1.78 1998/04/25 22:42:16 hubertf Exp $
#
# This file is derived from bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -42,7 +42,8 @@ NetBSD_MAINTAINER= agc@netbsd.org
# "FreeBSD," "NetBSD," or "OpenBSD" as appropriate.
# PORTSDIR - The root of the ports tree. Defaults:
# FreeBSD/OpenBSD: /usr/ports
-# NetBSD: /usr/pkgsrc
+# NetBSD: current pkgsrc-tree's root (most
+# likely /usr/pkgsrc)
# DISTDIR - Where to get gzip'd, tarballed copies of original sources
# (default: ${PORTSDIR}/distfiles).
# PREFIX - Where to install things in general Defaults:
@@ -366,7 +367,7 @@ DEF_UMASK?= 0022
# 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/pkgsrc
+PORTSDIR?= ${.CURDIR}/../..
LOCALBASE?= ${DESTDIR}/usr/pkg
.else
PORTSDIR?= /usr/ports