diff options
| author | agc <agc@pkgsrc.org> | 1997-10-03 09:16:15 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1997-10-03 09:16:15 +0000 |
| commit | 82e85dd37b20dab85968b1054cf6323eee8af0f5 (patch) | |
| tree | 9015ae784068417d37c9926412358714412a65ee /mk | |
| parent | 1da945548d34471771c704db83af6b7824a39d47 (diff) | |
| download | pkgsrc-82e85dd37b20dab85968b1054cf6323eee8af0f5.tar.gz | |
+ Move inclusion of bsd.own.mk to the end of bsd.port.mk.
<bsd.own.mk> defines its own `install' target if none is defined,
which conflicts with the default one we define later on in bsd.port.mk.
This may nuke any WRKOBJDIR definitions (which I have yet to encounter),
but enables "make install" to work as expected.
+ Add temporary mtree file for any X11 packages (like xpm, jpeg etc),
which require a default X11 tree. This will change when we get a NetBSD
x11.dist mtree file.
+ Define SHAREOWN, SHAREGRP and SHAREMODE (in NetBSD) to be the same as
DOCOWN, DOCGRP and DOCMODE respectively.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 21 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 21 |
2 files changed, 32 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3ace584136e..bc2aec50976 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.pkg.mk,v 1.8 1997/10/01 23:38:34 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.9 1997/10/03 09:16:15 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -350,10 +350,6 @@ WRKSRC?= ${WRKDIR} WRKSRC?= ${WRKDIR}/${DISTNAME} .endif -.if (${OPSYS} == "NetBSD") -.include <bsd.own.mk> -.endif - .if defined(WRKOBJDIR) # XXX Is pwd -P available in FreeBSD's /bin/sh? __canonical_PORTSDIR!= cd ${PORTSDIR}; pwd -P @@ -501,7 +497,12 @@ 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 @@ -1805,3 +1806,13 @@ tags: .endif .endif + +.if (${OPSYS} == "NetBSD") +.include <bsd.own.mk> + +SHAREOWN = ${DOCOWN} +SHAREGRP = ${DOCGRP} +SHAREMODE = ${DOCMODE} + +.endif + diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index 33dbde08c36..8ce344fbeb8 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.port.mk,v 1.8 1997/10/01 23:38:34 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.9 1997/10/03 09:16:15 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -350,10 +350,6 @@ WRKSRC?= ${WRKDIR} WRKSRC?= ${WRKDIR}/${DISTNAME} .endif -.if (${OPSYS} == "NetBSD") -.include <bsd.own.mk> -.endif - .if defined(WRKOBJDIR) # XXX Is pwd -P available in FreeBSD's /bin/sh? __canonical_PORTSDIR!= cd ${PORTSDIR}; pwd -P @@ -501,7 +497,12 @@ 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 @@ -1805,3 +1806,13 @@ tags: .endif .endif + +.if (${OPSYS} == "NetBSD") +.include <bsd.own.mk> + +SHAREOWN = ${DOCOWN} +SHAREGRP = ${DOCGRP} +SHAREMODE = ${DOCMODE} + +.endif + |