Tue Oct 2 11:28:43 2012 UTC ()
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.


(jperkin)
diff -r1.28 -r1.29 pkgsrc/pkgtools/pkgin/Makefile
cvs diff -r1.28 -r1.29 pkgsrc/pkgtools/pkgin/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Makefile 2012/09/11 23:19:38 1.28
+++ pkgsrc/pkgtools/pkgin/Makefile 2012/10/02 11:28:42 1.29
@@ -1,48 +1,51 @@ @@ -1,48 +1,51 @@
1# $NetBSD: Makefile,v 1.28 2012/09/11 23:19:38 asau Exp $ 1# $NetBSD: Makefile,v 1.29 2012/10/02 11:28:42 jperkin Exp $
2# 2#
3 3
4DISTNAME= pkgin-0.6.2.2 4DISTNAME= pkgin-0.6.2.2
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= pkgtools 6CATEGORIES= pkgtools
7MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/ 7MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/
8 8
9MAINTAINER= imil@NetBSD.org 9MAINTAINER= imil@NetBSD.org
10HOMEPAGE= http://pkgin.net/ 10HOMEPAGE= http://pkgin.net/
11COMMENT= Apt / yum like tool for managing pkgsrc binary packages 11COMMENT= Apt / yum like tool for managing pkgsrc binary packages
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14EGDIR= ${PREFIX}/share/examples/${PKGBASE} 14EGDIR= ${PREFIX}/share/examples/${PKGBASE}
15CONF_FILES= ${EGDIR}/repositories.conf.example \ 15CONF_FILES= ${EGDIR}/repositories.conf.example \
16 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf 16 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
17 17
18OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE} 18OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE}
19INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR} 19INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR}
20 20
21WRKSRC= ${WRKDIR}/pkgin 21WRKSRC= ${WRKDIR}/pkgin
22 22
23SUBST_CLASSES+= path 23SUBST_CLASSES+= path
24SUBST_STAGE.path= pre-configure 24SUBST_STAGE.path= pre-configure
25SUBST_MESSAGE.path= Adjusting path. 25SUBST_MESSAGE.path= Adjusting path.
26SUBST_FILES.path= Makefile.in actions.c pkgin.1 26SUBST_FILES.path= Makefile.in actions.c pkgin.1
27SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g" 27SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
28SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g" 28SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g"
29SUBST_SED.path+= -e "s|/var|${VARBASE}|g" 29SUBST_SED.path+= -e "s|/var|${VARBASE}|g"
30SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g" 30SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g"
 31SUBST_SED.path+= -e "s|!=.*uname -p|= ${MACHINE_ARCH}|g"
31 32
32GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
33USE_FEATURES= nbcompat 34USE_FEATURES= nbcompat
34USE_TOOLS+= nroff 35USE_TOOLS+= nroff
35 36
 37MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
 38
36DEPENDS+= pkg_install>=20110215:../../pkgtools/pkg_install 39DEPENDS+= pkg_install>=20110215:../../pkgtools/pkg_install
37 40
38.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
39 42
40# those have official repositories 43# those have official repositories
41.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix" 44.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix"
42pre-install: 45pre-install:
43 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \ 46 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \
44 ${WRKSRC}/repositories.conf 47 ${WRKSRC}/repositories.conf
45.endif 48.endif
46 49
47do-install: 50do-install:
48 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin 51 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin