11 files changed, 26 insertions, 23 deletions

diff --git a/devel/9base/Makefile b/devel/9base/Makefile
index 03bde2994797..dc4b81730007 100644
--- a/devel/9base/Makefile
+++ b/devel/9base/Makefile
@@ -12,6 +12,9 @@ COMMENT=	Port of various original plan9 tools
 
 LICENSE=	MIT
 
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
+ONLY_FOR_ARCHS_REASON=	has low-level code unavailable for ${ARCH}
+
 USES=		shebangfix
 SHEBANG_FILES=	troff/tmac/sendcover \
 		troff/font/devutf/mkMAP
@@ -29,9 +32,6 @@ APPS=		ascii awk basename bc cal cat cleanname cmp date dc du dd diff echo ed \
 		primes rc read sam sha1sum sed seq sleep sort split strings tail tee test \
 		touch tr troff unicode uniq unutf yacc
 
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
-ONLY_FOR_ARCHS_REASON=	has low-level code unavailable for ${ARCH}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|PREFIX|"${PREFIX}/9"|' ${WRKSRC}/lib9/get9root.c
 	@${REINPLACE_CMD} -e '/OBJTYPE!=/s|!=.*|=${ARCH:S,i386,386,:S,amd64,x86_64,:S,sparc64,sun4u,}|' ${WRKSRC}/lib9/Makefile
diff --git a/devel/libpeak/Makefile b/devel/libpeak/Makefile
index b23248a784e0..9e197d763603 100644
--- a/devel/libpeak/Makefile
+++ b/devel/libpeak/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Parallel Events and Asynchronous tasKing Library
 
 LICENSE=	BSD2CLAUSE
 
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index e7c4de452b86..723999ddf782 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -16,8 +16,11 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libIlmImf.so:graphics/OpenEXR
 
-BROKEN_powerpc=	does not build
-BROKEN_sparc64=	does not build
+BROKEN_powerpc=		does not build
+BROKEN_sparc64=		does not build
+
+# see src/nvcore/nvcore.h
+ONLY_FOR_ARCHS=		amd64 i386 powerpc powerpc64
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	castano
@@ -31,9 +34,6 @@ CXXFLAGS+=	-fPIC
 
 PORTDOCS=	NVIDIA_Texture_Tools_README.txt ChangeLog
 
-# see src/nvcore/nvcore.h
-ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64
-
 OPTIONS_DEFINE=	COMPRESSUI DOCS
 OPTIONS_SUB=	yes
 
diff --git a/lang/cilkplus/Makefile b/lang/cilkplus/Makefile
index f0e0d1871f7f..75b1a6504ca6 100644
--- a/lang/cilkplus/Makefile
+++ b/lang/cilkplus/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Intel Cilk Runtime
 
 LICENSE=	BSD3CLAUSE
 
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
+
 HG_REVISION=	004467
 
 USE_GCC=	yes
 
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
-
 USE_LDCONFIG=	yes
 WRKSRC=	${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-src-${HG_REVISION}
 
diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile
index 908ca6752b17..809aaf4b9d3e 100644
--- a/lang/seed7/Makefile
+++ b/lang/seed7/Makefile
@@ -19,14 +19,14 @@ LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		mysql:client ncurses pgsql sqlite tar:tgz
 USE_XORG=	x11
 WANT_PGSQL=	client
 
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
-
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 MAKE_ENV+=	S7_LIB_DIR=${S7_LIB_DIR} \
 		SEED7_LIBRARY=${SEED7_LIBRARY} \
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 78bd77af296f..ebc2df7b7540 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -12,8 +12,8 @@ MASTER_SITES=	http://www.squeakvm.org/unix/release/:vmsrc \
 DISTFILES=	Squeak-${VM_VERSION}-src${EXTRACT_SUFX}:vmsrc \
 		Squeak${IMAGE_FULL_VERSION}.zip:src \
 		${SQUEAK_SRC}.zip:sqsrc
-EXTRACT_ONLY=	Squeak-${VM_VERSION}-src${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	Squeak-${VM_VERSION}-src${EXTRACT_SUFX}
 
 MAINTAINER=	takeshi.mutoh@gmail.com
 COMMENT=	Full Smalltalk 80 with portability to Unix, Mac, and Windows
@@ -29,7 +29,7 @@ LIB_DEPENDS=	libaudio.so:audio/nas \
 		libpulse-simple.so:audio/pulseaudio \
 		libv4l2.so:multimedia/libv4l
 
-ONLY_FOR_ARCHS=	i386 amd64 powerpc
+ONLY_FOR_ARCHS=		amd64 i386 powerpc
 
 USES=		pkgconfig
 USE_GNOME=	cairo pango
diff --git a/misc/compat6x/Makefile b/misc/compat6x/Makefile
index fba51874383d..caa1a72539a8 100644
--- a/misc/compat6x/Makefile
+++ b/misc/compat6x/Makefile
@@ -13,9 +13,10 @@ DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convenience package to install the compat6x libraries
 
-USES=	tar:bzip2
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
+
+USES=		tar:bzip2
 NO_BUILD=	yes
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
 PLIST=		${PKGDIR}/pkg-plist.${ARCH}
 TARGET_DIR=	${PREFIX}/lib/compat
 TARGET32_DIR=	${PREFIX}/lib32/compat
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index 568df9b39dc4..4eb3e7b5257f 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -17,6 +17,8 @@ COMMENT=	Digium/Asterisk Hardware Device Interface
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:misc/dahdi
 
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
+
 DAHDI_VERSION=		2.4.0-rc5
 DAHDI_TOOLS_VERSION=	2.4.0-rc1
 OSLEC_VERSION=		2.6.35.4
@@ -39,7 +41,6 @@ USE_RC_SUBR=	dahdi
 MAKE_ARGS=	ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes DEPEND_MP=
 GROUPS=		dahdi
 
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
 CONFLICTS=	zaptel-[0-9]* dahdi-kmod26-*
 
 USES=		kmod uidfix
@@ -48,7 +49,7 @@ KMODDIR=	${PREFIX}/lib/dahdi
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
 PLIST_SUB+=	X86=""
 _vpmadt032=	VPMADT032
 .else
diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile
index 25973aa0a17a..f230dab09f67 100644
--- a/misc/dahdi-kmod26/Makefile
+++ b/misc/dahdi-kmod26/Makefile
@@ -18,6 +18,8 @@ COMMENT=	Digium/Asterisk Hardware Device Interface
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:misc/dahdi
 
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
+
 DAHDI_VERSION=		2.6.1-r10747
 DAHDI_TOOLS_VERSION=	2.4.0-rc1
 OSLEC_VERSION=		2.6.35.4
@@ -44,14 +46,13 @@ USE_RC_SUBR=	dahdi
 MAKE_ARGS=	NO_FETCH=yes WITHOUT_HEADERS=yes #ADDITIONAL_DRIVERS="wcb1xxp"
 GROUPS=		dahdi
 
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
 CONFLICTS=	zaptel-[0-9]* dahdi-kmod-*
 
 KMODDIR=	${PREFIX}/lib/dahdi
 USES=		kmod uidfix
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
 PLIST_SUB+=	X86=""
 _vpmadt032=	VPMADT032
 .else
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 60c57d380ea1..64df3e8eb945 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	pgpin:security/pgpin
 
 PORTSCOUT=	skipv:1.0
 
-ONLY_FOR_ARCHS=	i386 amd64 sparc64
+ONLY_FOR_ARCHS=		amd64 i386 sparc64
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/mono-kmod/Makefile b/sysutils/mono-kmod/Makefile
index 19f91e048910..fee2e19bb5e6 100644
--- a/sysutils/mono-kmod/Makefile
+++ b/sysutils/mono-kmod/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.alpha-tierchen.de/pub/FreeBSD/ports/distfiles/
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Execute .NET applications from command line
 
-ONLY_FOR_ARCHS=	i386 amd64 arm
+ONLY_FOR_ARCHS=		amd64 arm i386
 
 SUB_FILES=	pkg-message