@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/04/13 23:12:42 rodent Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/21 16:48:38 joerg Exp $
 #
 # any of ~* is fine, they are the same and just there for Ubuntu
 # so moneyguru's built for all releases
@@ -35,6 +35,15 @@
 REPLACE_PYTHON+=	run_template_qt.py
 
 INSTALLATION_DIRS=	bin share/applications share/moneyguru
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
+BASE_ARCH!=	uname -m
+.else
+BASE_ARCH=	${MACHINE_ARCH}
+.endif
+
+PLIST_SUBST+=	BASE_ARCH=${BASE_ARCH:Q}
 
 do-configure:
 	cd ${WRKSRC} && ${PYTHONBIN} configure.py

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/04/03 09:17:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/04/21 16:48:38 joerg Exp $
 bin/moneyguru
 share/applications/moneyguru.desktop
 share/moneyguru/ambuttonbar/AMButtonBar.h
@@ -213,7 +213,7 @@
 share/moneyguru/build/help/reconciliation.html
 share/moneyguru/build/help/search.html
 share/moneyguru/build/help/searchindex.js
-share/moneyguru/build/lib.${LOWER_OPSYS}-${OS_VERSION}-amd64-${PYVERSSUFFIX}/_amount.so
+share/moneyguru/build/lib.${LOWER_OPSYS}-${OS_VERSION}-${BASE_ARCH}-${PYVERSSUFFIX}/_amount.so
 share/moneyguru/build/locale/cs/LC_MESSAGES/columns.mo
 share/moneyguru/build/locale/cs/LC_MESSAGES/core.mo
 share/moneyguru/build/locale/cs/LC_MESSAGES/qtlib.mo
@@ -238,7 +238,7 @@
 share/moneyguru/build/locale/nl/LC_MESSAGES/core.mo
 share/moneyguru/build/locale/nl/LC_MESSAGES/qtlib.mo
 share/moneyguru/build/locale/nl/LC_MESSAGES/ui.mo
-share/moneyguru/build/temp.${LOWER_OPSYS}-${OS_VERSION}-amd64-${PYVERSSUFFIX}/core/modules/amount.o
+share/moneyguru/build/temp.${LOWER_OPSYS}-${OS_VERSION}-${BASE_ARCH}-${PYVERSSUFFIX}/core/modules/amount.o
 share/moneyguru/cocoa/InfoTemplate.plist
 share/moneyguru/cocoa/MGConst.h
 share/moneyguru/cocoa/controllers/MGAccountLookup.h