summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2000-06-14 02:10:57 +0000
committerhubertf <hubertf@pkgsrc.org>2000-06-14 02:10:57 +0000
commitaeca013e4d1cfa80dc0d3c5e5cafd185614d225a (patch)
treef18b392407c95d68ae6f59e6599dbf5cd67f6619
parent137cde977e17e2b53adc1c83eb438f3f12370ce7 (diff)
downloadpkgsrc-aeca013e4d1cfa80dc0d3c5e5cafd185614d225a.tar.gz
Use the defines from bsd.pkg.mk, don't start subshells.
(The values for uname etc. will probably be passed in from upper-level make processes).
-rw-r--r--devel/cscope/Makefile6
-rw-r--r--mail/mutt/Makefile6
-rw-r--r--net/mtr/Makefile6
-rw-r--r--plan9/9menu/Makefile5
4 files changed, 11 insertions, 12 deletions
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index a34cf73dec8..f0c5d1ec6c0 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/06/08 12:57:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/14 02:10:57 hubertf Exp $
DISTNAME= cscope-15.0bl2
PKGNAME= cscope-15.0.2
@@ -10,11 +10,11 @@ HOMEPAGE= http://cscope.sourceforge.net/
GNU_CONFIGURE= YES
-OSVER!= uname -r
+.include "../../mk/bsd.prefs.mk"
GOOD_CURSES= 1.4[S-Z] 1.4Z[A-Z] 1.[5-9]*
.for PATTERN in ${GOOD_CURSES}
-.if ${OSVER:M${PATTERN}} != ""
+.if ${OS_VERSION:M${PATTERN}} != ""
CURSES_GOOD?=
.endif
.endfor
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 7d34d80aa27..77eaeb87cf6 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2000/06/09 14:58:30 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2000/06/14 02:10:58 hubertf Exp $
DISTNAME= mutt-1.2i
CATEGORIES= mail
@@ -46,11 +46,11 @@ PLIST_SUBST+= LOCALEBASE=share
.endif
.if ${OPSYS} == "NetBSD"
-OSVER!= uname -r
+.include "../../mk/bsd.prefs.mk"
GOOD_CURSES= 1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]*
.for PATTERN in ${GOOD_CURSES}
-.if ${OSVER:M${PATTERN}} != ""
+.if ${OS_VERSION:M${PATTERN}} != ""
CURSES_GOOD?= # defined
.endif
.endfor
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index ed216981b2a..91fd21251ec 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/06/12 10:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/14 02:10:58 hubertf Exp $
# $FreeBSD: ports/net/mtr/Makefile,v 1.16 1999/10/28 08:06:00 mharo Exp $
DISTNAME= mtr-0.42
@@ -15,11 +15,11 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV+= CPPFLAGS=-I${PREFIX}/include
-OSVER!= uname -r
+.include "../../mk/bsd.prefs.mk"
GOOD_CURSES= 1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]*
.for PATTERN in ${GOOD_CURSES}
-.if ${OSVER:M${PATTERN}} != ""
+.if ${OS_VERSION:M${PATTERN}} != ""
CURSES_GOOD?= # defined
.endif
.endfor
diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile
index cbb0d110e11..24f3715156a 100644
--- a/plan9/9menu/Makefile
+++ b/plan9/9menu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/01 14:07:55 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/06/14 02:10:58 hubertf Exp $
# FreeBSD Id: Makefile,v 1.4 1997/09/08 12:23:55 tg Exp
#
@@ -9,8 +9,7 @@ EXTRACT_SUFX= .shar.gz
MAINTAINER= packages@netbsd.org
-OPSYS!= uname -s
-
+.include "../../mk/bsd.prefs.mk"
.if (${OPSYS} == "NetBSD")
MANCOMPRESSED= yes
.endif