diff options
| author | agc <agc@pkgsrc.org> | 1997-11-19 16:41:21 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1997-11-19 16:41:21 +0000 |
| commit | 4eed590d5b240a0865413a50305339ff9e813392 (patch) | |
| tree | 508d2e69a6369ec5e79cff27e045aab3bfaac0ef /mk | |
| parent | f6023952a10694f2b7dcaeba4bf713cf0d99875e (diff) | |
| download | pkgsrc-4eed590d5b240a0865413a50305339ff9e813392.tar.gz | |
Eliminate a nasty and horrible kluge by using the BSD.x11.dist when
checking the directory tree for an X11 package.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b8d5981c950..e7f29634f1a 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.17 1997/11/10 08:07:29 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.18 1997/11/19 16:41:21 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -505,12 +505,7 @@ EXTRACT_BEFORE_ARGS?= -xzf # Figure out where the local mtree file is .if !defined(MTREE_FILE) .if defined(USE_IMAKE) || defined(USE_X11) -.if (${OPSYS} == "NetBSD") -# XXX - agc - this is temporary, and will change when NetBSD has an X11 mtree file -MTREE_FILE= /etc/mtree/BSD.pkg.dist -.else MTREE_FILE= /etc/mtree/BSD.x11.dist -.endif .else .if (${OPSYS} == "NetBSD") MTREE_FILE= /etc/mtree/BSD.pkg.dist diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index f35e6c64ac6..f5b809fba0a 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.17 1997/11/10 08:07:29 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.18 1997/11/19 16:41:21 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -505,12 +505,7 @@ EXTRACT_BEFORE_ARGS?= -xzf # Figure out where the local mtree file is .if !defined(MTREE_FILE) .if defined(USE_IMAKE) || defined(USE_X11) -.if (${OPSYS} == "NetBSD") -# XXX - agc - this is temporary, and will change when NetBSD has an X11 mtree file -MTREE_FILE= /etc/mtree/BSD.pkg.dist -.else MTREE_FILE= /etc/mtree/BSD.x11.dist -.endif .else .if (${OPSYS} == "NetBSD") MTREE_FILE= /etc/mtree/BSD.pkg.dist |