kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

+ Move inclusion of bsd.own.mk to the end of bsd.port.mk.

Browse source 
<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.
This commit is contained in:
agc 1997-10-03 09:16:15 +00:00
parent 1da945548d
commit 82e85dd37b
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mk/bsd.pkg.mk
View file

@ -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

21
mk/bsd.port.mk
View file

@ -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