diff options
| author | agc <agc> | 1998-11-16 21:02:20 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-11-16 21:02:20 +0000 |
| commit | 07b931552c36227f84abd975b3427e9ba3df087d (patch) | |
| tree | eb83991afbe9197b00e528805a834f922e7bb1db /parallel | |
| parent | d8f78a54a90200fcac92f13a48f7afb3de382c79 (diff) | |
| download | pkgsrc-07b931552c36227f84abd975b3427e9ba3df087d.tar.gz | |
Don't recalculate the value of `uname -m` - just use ${MACHINE}.
Make sure the glunix group exists before the package is built, otherwise
things fail when making dependencies within the package.
Diffstat (limited to 'parallel')
| -rw-r--r-- | parallel/glunix/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 270296287aa..31557bcaf1a 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +# $NetBSD: Makefile,v 1.2 1998/11/16 21:02:20 agc Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -23,19 +23,26 @@ MESSAGE_FILE= ${WRKDIR}/MESSAGE NOW_ROOT= ${LOCALBASE}/now -MACHINE_ARCH!= uname -m - -.if (${MACHINE_ARCH} == "i386") +.if (${MACHINE} == "i386") FLAGS= "-m486 -DL_ENDIAN" .endif -MAKE_ENV+= OPSYS=${OPSYS} ARCH=${MACHINE_ARCH} NOW_ROOT=${NOW_ROOT} +MAKE_ENV+= OPSYS=${OPSYS} ARCH=${MACHINE} NOW_ROOT=${NOW_ROOT} MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS=${FLAGS} -SCRIPTS_ENV+= ARCH=${MACHINE_ARCH} RM=${RM} NOW_ROOT=${NOW_ROOT} +SCRIPTS_ENV+= ARCH=${MACHINE} RM=${RM} NOW_ROOT=${NOW_ROOT} +# the glunix group needs to exist before building. pre-configure: ${CP} ${FILESDIR}/Makefile-2 ${WRKSRC}/Makefile + @addgroup=`${AWK} -F: 'BEGIN { found = gid = 0; } \ + $$1 == "glunix" { found = 1; exit 0; } \ + $$1 != "glunix" && $$1 != "nogroup" { if ($$3 > gid) { gid = $$3; } } \ + END { if (found) { printf("--exists--"); } else { printf("glunix:*:%d:\n", gid + 1); }}' /etc/group`;\ + if [ "$$addgroup" != "--exists--" ]; then \ + ${ECHO} "Adding group $$addgroup"; \ + ${ECHO} "$$addgroup" >> /etc/group; \ + fi pre-install: ${SED} -e 's|\$${NOW_ROOT}|${NOW_ROOT}|g' ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} |