20 files changed, 81 insertions, 220 deletions

diff --git a/audio/linux-alsa-lib/Makefile b/audio/linux-alsa-lib/Makefile
index ae38a7e8d5df..dbc8f4d56cc3 100644
--- a/audio/linux-alsa-lib/Makefile
+++ b/audio/linux-alsa-lib/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	The Advanced Linux Sound Architecture libraries
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
-DESCR=		${PKGDIR}/pkg-descr
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile
index bb0dc74d20d8..47081a22e1cd 100644
--- a/audio/linux-arts/Makefile
+++ b/audio/linux-arts/Makefile
@@ -9,12 +9,14 @@ PORTNAME=		arts
 DISTVERSION=		1.3.0-4
 PORTREVISION=		1
 CATEGORIES=		audio kde linux
-MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
 
 MAINTAINER=		jylefort@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop (Linux version)
 
 ONLY_FOR_ARCHS=		i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=		yes
+INSTALLS_SHLIB=		yes
+AUTOMATIC_PLIST=	yes
+DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile
index ae38a7e8d5df..dbc8f4d56cc3 100644
--- a/audio/linux-f10-alsa-lib/Makefile
+++ b/audio/linux-f10-alsa-lib/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	The Advanced Linux Sound Architecture libraries
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
-DESCR=		${PKGDIR}/pkg-descr
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile
index bb0dc74d20d8..47081a22e1cd 100644
--- a/audio/linux-f10-arts/Makefile
+++ b/audio/linux-f10-arts/Makefile
@@ -9,12 +9,14 @@ PORTNAME=		arts
 DISTVERSION=		1.3.0-4
 PORTREVISION=		1
 CATEGORIES=		audio kde linux
-MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
 
 MAINTAINER=		jylefort@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop (Linux version)
 
 ONLY_FOR_ARCHS=		i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=		yes
+INSTALLS_SHLIB=		yes
+AUTOMATIC_PLIST=	yes
+DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-libogg/Makefile b/audio/linux-f10-libogg/Makefile
index bdcd59b169c7..ce05b2b0ee86 100644
--- a/audio/linux-f10-libogg/Makefile
+++ b/audio/linux-f10-libogg/Makefile
@@ -15,6 +15,9 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile
index 9d5b43760c9f..a10c4b002d42 100644
--- a/audio/linux-f10-libvorbis/Makefile
+++ b/audio/linux-f10-libvorbis/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	libvorbis
 DISTVERSION=	1.1.0-1
 PORTREVISION=	1
 CATEGORIES=	audio linux
-MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
@@ -17,6 +16,9 @@ COMMENT=	Audio compression codec library (Linux version)
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 139ca448e91f..30987b7b5719 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -23,6 +23,9 @@ RUN_DEPENDS=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
 		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-openal/bsd.linux.mk b/audio/linux-f10-openal/bsd.linux.mk
deleted file mode 100644
index f87b26c533fe..000000000000
--- a/audio/linux-f10-openal/bsd.linux.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# $FreeBSD$
-# bsd.linux.mk - support for RPM packages which install in ${LINUXBASE}
-# Maintainer: Jean-Yves Lefort <jylefort@FreeBSD.org>
-
-MASTER_SITES?=	${MASTER_SITE_FEDORA_LINUX}
-PKGNAMEPREFIX?=	linux-
-EXTRACT_SUFX?=	.${LINUX_ARCH}.rpm
-
-EXTRACT_DEPENDS+=	rpm2cpio:${PORTSDIR}/archivers/rpm
-
-EXTRACT_CMD?=	rpm2cpio
-EXTRACT_BEFORE_ARGS?=
-EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
-
-USE_LINUX=	yes
-USE_LINUX_PREFIX=	yes
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-
-DESCR?=		${.CURDIR}/../${PORTNAME}/pkg-descr
-MD5_FILE?=	${MASTERDIR}/distinfo.${LINUX_ARCH}
-PLIST?=		${WRKDIR}/.plist
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-LINUX_ARCH?=	i386	# the linuxulator does not yet support amd64 code
-.elif ${ARCH} == "powerpc"
-LINUX_ARCH?=	ppc
-.else
-LINUX_ARCH?=	${ARCH}
-.endif
-
-.if !target(pre-install)
-pre-install:
-	@${RM} -f ${PLIST}
-	@cd ${WRKSRC} && \
-	${FIND} * ! -type d | ${SORT} >> ${PLIST} && \
-	${FIND} * -type d | ${SORT} -r \
-		| ${GREP} -Ev '^(etc|lib|usr|usr/bin|usr/lib|usr/sbin|usr/share|usr/share/doc|usr/share/info|usr/share/man|usr/share/man/man[1-9n])$$' \
-		| ${SED} -e 's|^|@dirrm |' >> ${PLIST}
-.  if defined(INSTALLS_LINUX_SHLIB)
-	@${ECHO_CMD} '@exec ${LINUXBASE}/sbin/ldconfig 2>/dev/null || true' >> ${PLIST}
-	@${ECHO_CMD} '@unexec ${LINUXBASE}/sbin/ldconfig 2>/dev/null || true' >> ${PLIST}
-.  endif
-.endif
-
-.if !target(do-install)
-do-install:
-	cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/{}" \;
-	cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${PREFIX}
-.  if defined(INSTALLS_LINUX_SHLIB)
-	-${LINUXBASE}/sbin/ldconfig
-.  endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/audio/linux-f8-alsa-lib/Makefile b/audio/linux-f8-alsa-lib/Makefile
index ae38a7e8d5df..dbc8f4d56cc3 100644
--- a/audio/linux-f8-alsa-lib/Makefile
+++ b/audio/linux-f8-alsa-lib/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	The Advanced Linux Sound Architecture libraries
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
-DESCR=		${PKGDIR}/pkg-descr
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile
index bb0dc74d20d8..47081a22e1cd 100644
--- a/audio/linux-f8-arts/Makefile
+++ b/audio/linux-f8-arts/Makefile
@@ -9,12 +9,14 @@ PORTNAME=		arts
 DISTVERSION=		1.3.0-4
 PORTREVISION=		1
 CATEGORIES=		audio kde linux
-MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
 
 MAINTAINER=		jylefort@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop (Linux version)
 
 ONLY_FOR_ARCHS=		i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=		yes
+INSTALLS_SHLIB=		yes
+AUTOMATIC_PLIST=	yes
+DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f8-libogg/Makefile b/audio/linux-f8-libogg/Makefile
index bdcd59b169c7..ce05b2b0ee86 100644
--- a/audio/linux-f8-libogg/Makefile
+++ b/audio/linux-f8-libogg/Makefile
@@ -15,6 +15,9 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f8-libvorbis/Makefile b/audio/linux-f8-libvorbis/Makefile
index 9d5b43760c9f..a10c4b002d42 100644
--- a/audio/linux-f8-libvorbis/Makefile
+++ b/audio/linux-f8-libvorbis/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	libvorbis
 DISTVERSION=	1.1.0-1
 PORTREVISION=	1
 CATEGORIES=	audio linux
-MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
@@ -17,6 +16,9 @@ COMMENT=	Audio compression codec library (Linux version)
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile
index 139ca448e91f..30987b7b5719 100644
--- a/audio/linux-f8-openal/Makefile
+++ b/audio/linux-f8-openal/Makefile
@@ -23,6 +23,9 @@ RUN_DEPENDS=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
 		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-f8-openal/bsd.linux.mk b/audio/linux-f8-openal/bsd.linux.mk
deleted file mode 100644
index f87b26c533fe..000000000000
--- a/audio/linux-f8-openal/bsd.linux.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# $FreeBSD$
-# bsd.linux.mk - support for RPM packages which install in ${LINUXBASE}
-# Maintainer: Jean-Yves Lefort <jylefort@FreeBSD.org>
-
-MASTER_SITES?=	${MASTER_SITE_FEDORA_LINUX}
-PKGNAMEPREFIX?=	linux-
-EXTRACT_SUFX?=	.${LINUX_ARCH}.rpm
-
-EXTRACT_DEPENDS+=	rpm2cpio:${PORTSDIR}/archivers/rpm
-
-EXTRACT_CMD?=	rpm2cpio
-EXTRACT_BEFORE_ARGS?=
-EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
-
-USE_LINUX=	yes
-USE_LINUX_PREFIX=	yes
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-
-DESCR?=		${.CURDIR}/../${PORTNAME}/pkg-descr
-MD5_FILE?=	${MASTERDIR}/distinfo.${LINUX_ARCH}
-PLIST?=		${WRKDIR}/.plist
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-LINUX_ARCH?=	i386	# the linuxulator does not yet support amd64 code
-.elif ${ARCH} == "powerpc"
-LINUX_ARCH?=	ppc
-.else
-LINUX_ARCH?=	${ARCH}
-.endif
-
-.if !target(pre-install)
-pre-install:
-	@${RM} -f ${PLIST}
-	@cd ${WRKSRC} && \
-	${FIND} * ! -type d | ${SORT} >> ${PLIST} && \
-	${FIND} * -type d | ${SORT} -r \
-		| ${GREP} -Ev '^(etc|lib|usr|usr/bin|usr/lib|usr/sbin|usr/share|usr/share/doc|usr/share/info|usr/share/man|usr/share/man/man[1-9n])$$' \
-		| ${SED} -e 's|^|@dirrm |' >> ${PLIST}
-.  if defined(INSTALLS_LINUX_SHLIB)
-	@${ECHO_CMD} '@exec ${LINUXBASE}/sbin/ldconfig 2>/dev/null || true' >> ${PLIST}
-	@${ECHO_CMD} '@unexec ${LINUXBASE}/sbin/ldconfig 2>/dev/null || true' >> ${PLIST}
-.  endif
-.endif
-
-.if !target(do-install)
-do-install:
-	cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/{}" \;
-	cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${PREFIX}
-.  if defined(INSTALLS_LINUX_SHLIB)
-	-${LINUXBASE}/sbin/ldconfig
-.  endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/audio/linux-libogg/Makefile b/audio/linux-libogg/Makefile
index bdcd59b169c7..ce05b2b0ee86 100644
--- a/audio/linux-libogg/Makefile
+++ b/audio/linux-libogg/Makefile
@@ -15,6 +15,9 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile
index 9d5b43760c9f..a10c4b002d42 100644
--- a/audio/linux-libvorbis/Makefile
+++ b/audio/linux-libvorbis/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	libvorbis
 DISTVERSION=	1.1.0-1
 PORTREVISION=	1
 CATEGORIES=	audio linux
-MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
@@ -17,6 +16,9 @@ COMMENT=	Audio compression codec library (Linux version)
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile
index 139ca448e91f..30987b7b5719 100644
--- a/audio/linux-openal/Makefile
+++ b/audio/linux-openal/Makefile
@@ -23,6 +23,9 @@ RUN_DEPENDS=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
 		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
 
 ONLY_FOR_ARCHS=	i386 amd64
-INSTALLS_LINUX_SHLIB=	yes
+USE_LINUX_RPM=	yes
+INSTALLS_SHLIB=	yes
+AUTOMATIC_PLIST=yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/audio/linux-openal/bsd.linux.mk b/audio/linux-openal/bsd.linux.mk
deleted file mode 100644
index f87b26c533fe..000000000000
--- a/audio/linux-openal/bsd.linux.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# $FreeBSD$
-# bsd.linux.mk - support for RPM packages which install in ${LINUXBASE}
-# Maintainer: Jean-Yves Lefort <jylefort@FreeBSD.org>
-
-MASTER_SITES?=	${MASTER_SITE_FEDORA_LINUX}
-PKGNAMEPREFIX?=	linux-
-EXTRACT_SUFX?=	.${LINUX_ARCH}.rpm
-
-EXTRACT_DEPENDS+=	rpm2cpio:${PORTSDIR}/archivers/rpm
-
-EXTRACT_CMD?=	rpm2cpio
-EXTRACT_BEFORE_ARGS?=
-EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
-
-USE_LINUX=	yes
-USE_LINUX_PREFIX=	yes
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-
-DESCR?=		${.CURDIR}/../${PORTNAME}/pkg-descr
-MD5_FILE?=	${MASTERDIR}/distinfo.${LINUX_ARCH}
-PLIST?=		${WRKDIR}/.plist
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-LINUX_ARCH?=	i386	# the linuxulator does not yet support amd64 code
-.elif ${ARCH} == "powerpc"
-LINUX_ARCH?=	ppc
-.else
-LINUX_ARCH?=	${ARCH}
-.endif
-
-.if !target(pre-install)
-pre-install:
-	@${RM} -f ${PLIST}
-	@cd ${WRKSRC} && \
-	${FIND} * ! -type d | ${SORT} >> ${PLIST} && \
-	${FIND} * -type d | ${SORT} -r \
-		| ${GREP} -Ev '^(etc|lib|usr|usr/bin|usr/lib|usr/sbin|usr/share|usr/share/doc|usr/share/info|usr/share/man|usr/share/man/man[1-9n])$$' \
-		| ${SED} -e 's|^|@dirrm |' >> ${PLIST}
-.  if defined(INSTALLS_LINUX_SHLIB)
-	@${ECHO_CMD} '@exec ${LINUXBASE}/sbin/ldconfig 2>/dev/null || true' >> ${PLIST}
-	@${ECHO_CMD} '@unexec ${LINUXBASE}/sbin/ldconfig 2>/dev/null || true' >> ${PLIST}
-.  endif
-.endif
-
-.if !target(do-install)
-do-install:
-	cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/{}" \;
-	cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${PREFIX}
-.  if defined(INSTALLS_LINUX_SHLIB)
-	-${LINUXBASE}/sbin/ldconfig
-.  endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/lang/linux-libgcc/Makefile b/lang/linux-libgcc/Makefile
index 425860b66729..6a8b228e74ac 100644
--- a/lang/linux-libgcc/Makefile
+++ b/lang/linux-libgcc/Makefile
@@ -16,12 +16,13 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Linux libgcc support library
 
 ONLY_FOR_ARCHS=	i386 amd64
-DESCR=		${PKGDIR}/pkg-descr
+USE_LINUX_RPM=	yes
+AUTOMATIC_PLIST=yes
 
 # Do not conflict with linux_base's libgcc: install in /lib/libgcc
-# (note that we do not set INSTALLS_LINUX_SHLIB because we must
-# prepend /lib/libgcc to /etc/ld.so.conf before running ldconfig,
-# which we do in pkg-install).
+# (note that we do not set INSTALLS_SHLIB because we must prepend
+# /lib/libgcc to /etc/ld.so.conf before running ldconfig, which we do
+# in pkg-install).
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/lib/libgcc
@@ -30,4 +31,4 @@ post-extract:
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/linux-gtk-bluecurve-theme/Makefile b/x11-themes/linux-gtk-bluecurve-theme/Makefile
index c187f4c346ca..a66f11dd99cf 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/Makefile
+++ b/x11-themes/linux-gtk-bluecurve-theme/Makefile
@@ -8,13 +8,14 @@
 PORTNAME=	gtk-bluecurve-theme
 DISTVERSION=	0.117-1
 CATEGORIES=	x11-themes linux
-MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
 DISTNAME=	redhat-artwork-${DISTVERSION}
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	The Bluecurve GTK+ 1.x and 2.x themes (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX_RPM=	yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 # GTK+ 1.x theme engine
 GTK1_RCDIR=	gtk
@@ -56,4 +57,4 @@ do-install:
 .  endfor
 .endfor
 
-.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
+.include <bsd.port.mk>