Index: Makefile
===================================================================
--- Makefile	(revision 315671)
+++ Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rpm
-# Date created:		30 April 1999
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	rpm
 PORTVERSION=	3.0.6
@@ -27,19 +23,40 @@
 USE_LDCONFIG=	yes
 MAKE_ENV=	OLD_PO_FILE_INPUT=1
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 MAN1=		gendiff.1
 MAN8=		rpm.8 rpm2cpio.8
 
+X86_SUB=	"@comment "
+AMD64_SUB=	"@comment "
+PPC_SUB=	"@comment "
+SPARC_SUB=	"@comment "
+IA64_SUB=	"@comment "
+.if ${ARCH} == i386
+X86_SUB=	""
+.elif ${ARCH} == amd64
+AMD64_SUB=	""
+.elif ${ARCH} == sparc64
+SPARC_SUB=	""
+.elif ${ARCH} == powerpc || ${ARCH} == powerpc64
+PPC_SUB=	""
+.elif ${ARCH} == ia64
+IA64_SUB=	""
+.endif
+
+PLIST_SUB+=	X86=${X86_SUB} PPC=${PPC_SUB} SPARC=${SPARC_SUB} IA64=${IA64_SUB} AMD64=${AMD64_SUB}
+
 post-patch:
 .for file in rpm.c doc/rpm.8 lib/macro.c lib/rpmrc.c
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 315671)
+++ pkg-plist	(working copy)
@@ -74,19 +74,19 @@
 @dirrmtry src/redhat/SRPMS
 @dirrmtry src/redhat/SPECS
 @dirrmtry src/redhat/SOURCES
-@dirrmtry src/redhat/RPMS/amd64
-@dirrmtry src/redhat/RPMS/athlon
-@dirrmtry src/redhat/RPMS/i386
-@dirrmtry src/redhat/RPMS/i486
-@dirrmtry src/redhat/RPMS/i586
-@dirrmtry src/redhat/RPMS/i686
-@dirrmtry src/redhat/RPMS/ia64
+%%AMD64%%@dirrmtry src/redhat/RPMS/amd64
+%%X86%%@dirrmtry src/redhat/RPMS/athlon
+%%X86%%@dirrmtry src/redhat/RPMS/i386
+%%X86%%@dirrmtry src/redhat/RPMS/i486
+%%X86%%@dirrmtry src/redhat/RPMS/i586
+%%X86%%@dirrmtry src/redhat/RPMS/i686
+%%IA64%%@dirrmtry src/redhat/RPMS/ia64
 @dirrmtry src/redhat/RPMS/noarch
-@dirrmtry src/redhat/RPMS/powerpc
-@dirrmtry src/redhat/RPMS/ppc
-@dirrmtry src/redhat/RPMS/sparc
-@dirrmtry src/redhat/RPMS/sparcv9
-@dirrmtry src/redhat/RPMS/sparc64
+%%PPC%%@dirrmtry src/redhat/RPMS/powerpc
+%%PPC%%@dirrmtry src/redhat/RPMS/ppc
+%%SPARC%%@dirrmtry src/redhat/RPMS/sparc
+%%SPARC%%@dirrmtry src/redhat/RPMS/sparcv9
+%%SPARC%%@dirrmtry src/redhat/RPMS/sparc64
 @dirrmtry src/redhat/RPMS
 @dirrmtry src/redhat/BUILD
 @dirrmtry src/redhat
@@ -99,19 +99,19 @@
 @exec mkdir -p %D/src/redhat
 @exec mkdir -p %D/src/redhat/BUILD
 @exec mkdir -p %D/src/redhat/RPMS
-@exec mkdir -p %D/src/redhat/RPMS/amd64
-@exec mkdir -p %D/src/redhat/RPMS/athlon
-@exec mkdir -p %D/src/redhat/RPMS/i386
-@exec mkdir -p %D/src/redhat/RPMS/i486
-@exec mkdir -p %D/src/redhat/RPMS/i586
-@exec mkdir -p %D/src/redhat/RPMS/i686
-@exec mkdir -p %D/src/redhat/RPMS/ia64
+%%AMD64%%@exec mkdir -p %D/src/redhat/RPMS/amd64
+%%X86%%@exec mkdir -p %D/src/redhat/RPMS/athlon
+%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i386
+%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i486
+%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i586
+%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i686
+%%IA64%%@exec mkdir -p %D/src/redhat/RPMS/ia64
 @exec mkdir -p %D/src/redhat/RPMS/noarch
-@exec mkdir -p %D/src/redhat/RPMS/powerpc
-@exec mkdir -p %D/src/redhat/RPMS/ppc
-@exec mkdir -p %D/src/redhat/RPMS/sparc
-@exec mkdir -p %D/src/redhat/RPMS/sparcv9
-@exec mkdir -p %D/src/redhat/RPMS/sparc64
+%%PPC%%@exec mkdir -p %D/src/redhat/RPMS/powerpc
+%%PPC%%@exec mkdir -p %D/src/redhat/RPMS/ppc
+%%SPARC%%@exec mkdir -p %D/src/redhat/RPMS/sparc
+%%SPARC%%@exec mkdir -p %D/src/redhat/RPMS/sparcv9
+%%SPARC%%@exec mkdir -p %D/src/redhat/RPMS/sparc64
 @exec mkdir -p %D/src/redhat/SOURCES
 @exec mkdir -p %D/src/redhat/SPECS
 @exec mkdir -p %D/src/redhat/SRPMS