2 files changed, 56 insertions, 55 deletions

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 91907f007d81..c6fedfe8bcbf 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -44,7 +44,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include \
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \
 		-L${BDB_LIB_DIR} -L${LUA_LIBDIR}
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${PORTVERSION} \
+		OPSYS=${OPSYS:tl}
 
 PORTDOCS=	*
 
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index 9e61bb2fdce7..7606572966c3 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -114,60 +114,60 @@ lib/rpm/perl.prov
 lib/rpm/perl.req
 lib/rpm/perldeps.pl
 lib/rpm/pkgconfigdeps.sh
-lib/rpm/platform/aarch64-freebsd/macros
-lib/rpm/platform/alpha-freebsd/macros
-lib/rpm/platform/alphaev5-freebsd/macros
-lib/rpm/platform/alphaev56-freebsd/macros
-lib/rpm/platform/alphaev6-freebsd/macros
-lib/rpm/platform/alphaev67-freebsd/macros
-lib/rpm/platform/alphapca56-freebsd/macros
-lib/rpm/platform/amd64-freebsd/macros
-lib/rpm/platform/armv3l-freebsd/macros
-lib/rpm/platform/armv4b-freebsd/macros
-lib/rpm/platform/armv4l-freebsd/macros
-lib/rpm/platform/armv5tejl-freebsd/macros
-lib/rpm/platform/armv5tel-freebsd/macros
-lib/rpm/platform/armv6hl-freebsd/macros
-lib/rpm/platform/armv6l-freebsd/macros
-lib/rpm/platform/armv7hl-freebsd/macros
-lib/rpm/platform/armv7hnl-freebsd/macros
-lib/rpm/platform/armv7l-freebsd/macros
-lib/rpm/platform/athlon-freebsd/macros
-lib/rpm/platform/geode-freebsd/macros
-lib/rpm/platform/i386-freebsd/macros
-lib/rpm/platform/i486-freebsd/macros
-lib/rpm/platform/i586-freebsd/macros
-lib/rpm/platform/i686-freebsd/macros
-lib/rpm/platform/ia32e-freebsd/macros
-lib/rpm/platform/ia64-freebsd/macros
-lib/rpm/platform/m68k-freebsd/macros
-lib/rpm/platform/noarch-freebsd/macros
-lib/rpm/platform/pentium3-freebsd/macros
-lib/rpm/platform/pentium4-freebsd/macros
-lib/rpm/platform/ppc-freebsd/macros
-lib/rpm/platform/ppc32dy4-freebsd/macros
-lib/rpm/platform/ppc64-freebsd/macros
-lib/rpm/platform/ppc64iseries-freebsd/macros
-lib/rpm/platform/ppc64le-freebsd/macros
-lib/rpm/platform/ppc64p7-freebsd/macros
-lib/rpm/platform/ppc64pseries-freebsd/macros
-lib/rpm/platform/ppc8260-freebsd/macros
-lib/rpm/platform/ppc8560-freebsd/macros
-lib/rpm/platform/ppciseries-freebsd/macros
-lib/rpm/platform/ppcpseries-freebsd/macros
-lib/rpm/platform/s390-freebsd/macros
-lib/rpm/platform/s390x-freebsd/macros
-lib/rpm/platform/sh-freebsd/macros
-lib/rpm/platform/sh3-freebsd/macros
-lib/rpm/platform/sh4-freebsd/macros
-lib/rpm/platform/sh4a-freebsd/macros
-lib/rpm/platform/sparc-freebsd/macros
-lib/rpm/platform/sparc64-freebsd/macros
-lib/rpm/platform/sparc64v-freebsd/macros
-lib/rpm/platform/sparcv8-freebsd/macros
-lib/rpm/platform/sparcv9-freebsd/macros
-lib/rpm/platform/sparcv9v-freebsd/macros
-lib/rpm/platform/x86_64-freebsd/macros
+lib/rpm/platform/aarch64-%%OPSYS%%/macros
+lib/rpm/platform/alpha-%%OPSYS%%/macros
+lib/rpm/platform/alphaev5-%%OPSYS%%/macros
+lib/rpm/platform/alphaev56-%%OPSYS%%/macros
+lib/rpm/platform/alphaev6-%%OPSYS%%/macros
+lib/rpm/platform/alphaev67-%%OPSYS%%/macros
+lib/rpm/platform/alphapca56-%%OPSYS%%/macros
+lib/rpm/platform/amd64-%%OPSYS%%/macros
+lib/rpm/platform/armv3l-%%OPSYS%%/macros
+lib/rpm/platform/armv4b-%%OPSYS%%/macros
+lib/rpm/platform/armv4l-%%OPSYS%%/macros
+lib/rpm/platform/armv5tejl-%%OPSYS%%/macros
+lib/rpm/platform/armv5tel-%%OPSYS%%/macros
+lib/rpm/platform/armv6hl-%%OPSYS%%/macros
+lib/rpm/platform/armv6l-%%OPSYS%%/macros
+lib/rpm/platform/armv7hl-%%OPSYS%%/macros
+lib/rpm/platform/armv7hnl-%%OPSYS%%/macros
+lib/rpm/platform/armv7l-%%OPSYS%%/macros
+lib/rpm/platform/athlon-%%OPSYS%%/macros
+lib/rpm/platform/geode-%%OPSYS%%/macros
+lib/rpm/platform/i386-%%OPSYS%%/macros
+lib/rpm/platform/i486-%%OPSYS%%/macros
+lib/rpm/platform/i586-%%OPSYS%%/macros
+lib/rpm/platform/i686-%%OPSYS%%/macros
+lib/rpm/platform/ia32e-%%OPSYS%%/macros
+lib/rpm/platform/ia64-%%OPSYS%%/macros
+lib/rpm/platform/m68k-%%OPSYS%%/macros
+lib/rpm/platform/noarch-%%OPSYS%%/macros
+lib/rpm/platform/pentium3-%%OPSYS%%/macros
+lib/rpm/platform/pentium4-%%OPSYS%%/macros
+lib/rpm/platform/ppc-%%OPSYS%%/macros
+lib/rpm/platform/ppc32dy4-%%OPSYS%%/macros
+lib/rpm/platform/ppc64-%%OPSYS%%/macros
+lib/rpm/platform/ppc64iseries-%%OPSYS%%/macros
+lib/rpm/platform/ppc64le-%%OPSYS%%/macros
+lib/rpm/platform/ppc64p7-%%OPSYS%%/macros
+lib/rpm/platform/ppc64pseries-%%OPSYS%%/macros
+lib/rpm/platform/ppc8260-%%OPSYS%%/macros
+lib/rpm/platform/ppc8560-%%OPSYS%%/macros
+lib/rpm/platform/ppciseries-%%OPSYS%%/macros
+lib/rpm/platform/ppcpseries-%%OPSYS%%/macros
+lib/rpm/platform/s390-%%OPSYS%%/macros
+lib/rpm/platform/s390x-%%OPSYS%%/macros
+lib/rpm/platform/sh-%%OPSYS%%/macros
+lib/rpm/platform/sh3-%%OPSYS%%/macros
+lib/rpm/platform/sh4-%%OPSYS%%/macros
+lib/rpm/platform/sh4a-%%OPSYS%%/macros
+lib/rpm/platform/sparc-%%OPSYS%%/macros
+lib/rpm/platform/sparc64-%%OPSYS%%/macros
+lib/rpm/platform/sparc64v-%%OPSYS%%/macros
+lib/rpm/platform/sparcv8-%%OPSYS%%/macros
+lib/rpm/platform/sparcv9-%%OPSYS%%/macros
+lib/rpm/platform/sparcv9v-%%OPSYS%%/macros
+lib/rpm/platform/x86_64-%%OPSYS%%/macros
 lib/rpm/pythondeps.sh
 lib/rpm/rpm.daily
 lib/rpm/rpm.log