Welcome to the new linux ports infrastructure which allows using

both current (fc4) and future linux (f8) distributions at one
ports tree.

The patch contains full changes to ports/Mk files and all ports involved.
But only infrastructure is changed. The resulting packages are the same as
before. Hence no need to bump PORTREVISIONs.

The idea was taken from bsd.gnome.mk and others.

More than 130 ports are switched to follow a new linux infrastructure
introduced by changes to bsd.port.mk, bsd.linux-rpm.mk and a new
bsd.linux-apps.mk.

Thanks for all who was involved and helped me with this work.
And help from Alexander Leidinger was incredible.

Other changes are coming. Stay tuned!

PR:		ports/132510
Submitted by:	bsam (me)
Exp-run by:	portmgr (pav)

6 files changed, 6 insertions, 15 deletions

diff --git a/textproc/linux-f10-scim-gtk/Makefile b/textproc/linux-f10-scim-gtk/Makefile
index fbdc0bca65ff..bc097f2150e7 100644
--- a/textproc/linux-f10-scim-gtk/Makefile
+++ b/textproc/linux-f10-scim-gtk/Makefile
@@ -15,14 +15,12 @@ DISTNAME=	# defined below
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, gtk module, Linux binary
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
-		${LINUXBASE}/usr/lib/libscim-1.0.so.8:${PORTSDIR}/textproc/linux-scim-libs
-
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	gtk2 scimlibs
 USE_LDCONFIG=	yes
 PLIST_SUB=	LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
 MD5_FILE=	${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-f10-scim-libs/Makefile b/textproc/linux-f10-scim-libs/Makefile
index f4159156d85d..d180ded8f0d2 100644
--- a/textproc/linux-f10-scim-libs/Makefile
+++ b/textproc/linux-f10-scim-libs/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, library part, Linux binary
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
-
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	gtk2
 USE_LDCONFIG=	yes
 PLIST_SUB=	LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
 PLIST=		${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-f8-scim-gtk/Makefile b/textproc/linux-f8-scim-gtk/Makefile
index fbdc0bca65ff..bc097f2150e7 100644
--- a/textproc/linux-f8-scim-gtk/Makefile
+++ b/textproc/linux-f8-scim-gtk/Makefile
@@ -15,14 +15,12 @@ DISTNAME=	# defined below
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, gtk module, Linux binary
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
-		${LINUXBASE}/usr/lib/libscim-1.0.so.8:${PORTSDIR}/textproc/linux-scim-libs
-
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	gtk2 scimlibs
 USE_LDCONFIG=	yes
 PLIST_SUB=	LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
 MD5_FILE=	${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-f8-scim-libs/Makefile b/textproc/linux-f8-scim-libs/Makefile
index f4159156d85d..d180ded8f0d2 100644
--- a/textproc/linux-f8-scim-libs/Makefile
+++ b/textproc/linux-f8-scim-libs/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, library part, Linux binary
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
-
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	gtk2
 USE_LDCONFIG=	yes
 PLIST_SUB=	LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
 PLIST=		${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-scim-gtk/Makefile b/textproc/linux-scim-gtk/Makefile
index fbdc0bca65ff..bc097f2150e7 100644
--- a/textproc/linux-scim-gtk/Makefile
+++ b/textproc/linux-scim-gtk/Makefile
@@ -15,14 +15,12 @@ DISTNAME=	# defined below
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, gtk module, Linux binary
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
-		${LINUXBASE}/usr/lib/libscim-1.0.so.8:${PORTSDIR}/textproc/linux-scim-libs
-
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	gtk2 scimlibs
 USE_LDCONFIG=	yes
 PLIST_SUB=	LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
 MD5_FILE=	${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER}
diff --git a/textproc/linux-scim-libs/Makefile b/textproc/linux-scim-libs/Makefile
index f4159156d85d..d180ded8f0d2 100644
--- a/textproc/linux-scim-libs/Makefile
+++ b/textproc/linux-scim-libs/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, library part, Linux binary
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
-
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	gtk2
 USE_LDCONFIG=	yes
 PLIST_SUB=	LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
 PLIST=		${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER}