summaryrefslogtreecommitdiff
path: root/pkgtools/pkgin
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2012-10-02 11:28:42 +0000
committerjperkin <jperkin@pkgsrc.org>2012-10-02 11:28:42 +0000
commit62c8c7fe77f1144b3f0ede8f71c4ce60b382af25 (patch)
tree5d440ee484290449aa444016d005300009570589 /pkgtools/pkgin
parentda944ca9e66e2997637892c4c9a09062b5b233c1 (diff)
downloadpkgsrc-62c8c7fe77f1144b3f0ede8f71c4ce60b382af25.tar.gz
Ensure that MACHINE_ARCH from pkgsrc is used rather than the default
value from make or uname. Removes "x86_64 != i386" warnings from pkgin on 64-bit Solaris. Bump PKGREVISION.
Diffstat (limited to 'pkgtools/pkgin')
-rw-r--r--pkgtools/pkgin/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index 0de7319eb60..acfaf23375e 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2012/09/11 23:19:38 asau Exp $
+# $NetBSD: Makefile,v 1.29 2012/10/02 11:28:42 jperkin Exp $
#
DISTNAME= pkgin-0.6.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= pkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/
@@ -28,11 +28,14 @@ SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g"
SUBST_SED.path+= -e "s|/var|${VARBASE}|g"
SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g"
+SUBST_SED.path+= -e "s|!=.*uname -p|= ${MACHINE_ARCH}|g"
GNU_CONFIGURE= yes
USE_FEATURES= nbcompat
USE_TOOLS+= nroff
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+
DEPENDS+= pkg_install>=20110215:../../pkgtools/pkg_install
.include "../../mk/bsd.prefs.mk"