- Add linux_base-{f7,f8} support.

- Separate out gtk module part to textproc/linux-scim-gtk.

7 files changed, 79 insertions, 12 deletions

diff --git a/textproc/linux-f10-scim-libs/Makefile b/textproc/linux-f10-scim-libs/Makefile
index 0fe27db0fa8c..f4159156d85d 100644
--- a/textproc/linux-f10-scim-libs/Makefile
+++ b/textproc/linux-f10-scim-libs/Makefile
@@ -6,25 +6,54 @@
 #
 
 PORTNAME=	scim-libs
-PORTVERSION=	1.4.4
+PORTVERSION=	# defined below
+PORTREVISION=	1
 CATEGORIES=	textproc linux
-MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
-MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc4
+MASTER_SITE_SUBDIR=	# defined below
+PKGNAMESUFFIX=	-fc${LINUX_DIST_VER}
+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
-SRC_DISTFILES=	scim-${PORTVERSION}-1.fc4${SRC_SUFX}
-LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 PLIST_SUB=	LINUX_RPM_ARCH=${LINUX_RPM_ARCH}
+PLIST=		${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER}
+MD5_FILE=	${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER}
+
+.if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == f8
+PORTVERSION=	1.4.7
+PORTSUBVERSION=	7
+LINUX_DIST_VER=	8
+MASTER_SITE_SUBDIR=	../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages
+MASTER_SITE_SRC_SUBDIR=	../releases/${LINUX_DIST_VER}/Everything/source/SRPMS
+.elif defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == f7
+PORTVERSION=	1.4.5
+PORTSUBVERSION=	18
+LINUX_DIST_VER=	7
+MASTER_SITE_SUBDIR=	../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Fedora
+MASTER_SITE_SRC_SUBDIR=	../releases/${LINUX_DIST_VER}/Everything/source/SRPMS
+.else
+PORTVERSION=	1.4.4
+PORTSUBVERSION=	1
+LINUX_DIST_VER=	4
+MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
+post-extract:
+	cd ${WRKDIR}/usr/lib && ${RM} -rf gtk-2.0
+.endif
 
-post-install:
-	@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/${LINUX_RPM_ARCH}-redhat-linux-gnu/gtk.immodules
+.for V in fc4 f7 f8
+makesum-${V}:
+	${MAKE} PACKAGE_BUILDING=yes OVERRIDE_LINUX_BASE_PORT=${V} makesum
+.endfor
+makesum-all: makesum-fc4 makesum-f7 makesum-f8
 
 .include <bsd.port.mk>
diff --git a/textproc/linux-f10-scim-libs/distinfo.i386 b/textproc/linux-f10-scim-libs/distinfo.i386.fc4
index 25cea5323143..25cea5323143 100644
--- a/textproc/linux-f10-scim-libs/distinfo.i386
+++ b/textproc/linux-f10-scim-libs/distinfo.i386.fc4
diff --git a/textproc/linux-f10-scim-libs/distinfo.i386.fc7 b/textproc/linux-f10-scim-libs/distinfo.i386.fc7
new file mode 100644
index 000000000000..d273782bc000
--- /dev/null
+++ b/textproc/linux-f10-scim-libs/distinfo.i386.fc7
@@ -0,0 +1,6 @@
+MD5 (rpm/i386/fedora/7/scim-libs-1.4.5-18.fc7.i386.rpm) = 31bf4ef2d5037ceeee313f6ae119c067
+SHA256 (rpm/i386/fedora/7/scim-libs-1.4.5-18.fc7.i386.rpm) = c717a1638417875f1f1885a156a60292e9f942145bb0d1c215f58aaa8dd9e742
+SIZE (rpm/i386/fedora/7/scim-libs-1.4.5-18.fc7.i386.rpm) = 414690
+MD5 (rpm/i386/fedora/7/scim-1.4.5-18.fc7.src.rpm) = c11057bfaaff7fc6fcc278bdf3bec899
+SHA256 (rpm/i386/fedora/7/scim-1.4.5-18.fc7.src.rpm) = 4dbe60d2962e53c54cb237e82d152604a15b7b17166c8300075991512ef867b1
+SIZE (rpm/i386/fedora/7/scim-1.4.5-18.fc7.src.rpm) = 3210779
diff --git a/textproc/linux-f10-scim-libs/distinfo.i386.fc8 b/textproc/linux-f10-scim-libs/distinfo.i386.fc8
new file mode 100644
index 000000000000..ca97ba9f21c6
--- /dev/null
+++ b/textproc/linux-f10-scim-libs/distinfo.i386.fc8
@@ -0,0 +1,6 @@
+MD5 (rpm/i386/fedora/8/scim-libs-1.4.7-7.fc8.i386.rpm) = 40e88d73860a41263e0797cc8a5e4572
+SHA256 (rpm/i386/fedora/8/scim-libs-1.4.7-7.fc8.i386.rpm) = 707e17dfb2c56119fc361c92fbde55eae6b23bd4a98ee2ab234c4923d3e865b9
+SIZE (rpm/i386/fedora/8/scim-libs-1.4.7-7.fc8.i386.rpm) = 420339
+MD5 (rpm/i386/fedora/8/scim-1.4.7-7.fc8.src.rpm) = 983f86fa040f81be8e8aae227cf35cb1
+SHA256 (rpm/i386/fedora/8/scim-1.4.7-7.fc8.src.rpm) = 93faafef3ad42a8349007e7d28988dac23fea212ff55e9f957a07e4a54f12276
+SIZE (rpm/i386/fedora/8/scim-1.4.7-7.fc8.src.rpm) = 3121068
diff --git a/textproc/linux-f10-scim-libs/pkg-plist b/textproc/linux-f10-scim-libs/pkg-plist.fc4
index 1957c50edc7a..6a55553006d5 100644
--- a/textproc/linux-f10-scim-libs/pkg-plist
+++ b/textproc/linux-f10-scim-libs/pkg-plist.fc4
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-usr/lib/gtk-2.0/immodules/im-scim.so
 usr/lib/libscim-1.0.so.8
 usr/lib/libscim-1.0.so.8.1.0
 usr/lib/libscim-gtkutils-1.0.so.8
@@ -17,7 +16,6 @@ usr/lib/scim-1.0/1.4.0/IMEngine/socket.so
 usr/lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.so
 usr/lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.so
 usr/lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.so
-@dirrmtry usr/lib/gtk-2.0/immodules
 @dirrm usr/lib/scim-1.0/1.4.0/Config
 @dirrm usr/lib/scim-1.0/1.4.0/Filter
 @dirrm usr/lib/scim-1.0/1.4.0/FrontEnd
@@ -26,5 +24,3 @@ usr/lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.so
 @dirrm usr/lib/scim-1.0/1.4.0/SetupUI
 @dirrm usr/lib/scim-1.0/1.4.0
 @dirrm usr/lib/scim-1.0
-@exec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/%%LINUX_RPM_ARCH%%-redhat-linux-gnu/gtk.immodules
-@unexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/%%LINUX_RPM_ARCH%%-redhat-linux-gnu/gtk.immodules
diff --git a/textproc/linux-f10-scim-libs/pkg-plist.fc7 b/textproc/linux-f10-scim-libs/pkg-plist.fc7
new file mode 100644
index 000000000000..95dc018c3a1d
--- /dev/null
+++ b/textproc/linux-f10-scim-libs/pkg-plist.fc7
@@ -0,0 +1,14 @@
+@comment $FreeBSD$
+usr/lib/libscim-1.0.so.8
+usr/lib/libscim-1.0.so.8.1.1
+usr/lib/libscim-gtkutils-1.0.so.8
+usr/lib/libscim-gtkutils-1.0.so.8.1.1
+usr/lib/libscim-x11utils-1.0.so.8
+usr/lib/libscim-x11utils-1.0.so.8.1.1
+usr/lib/scim-1.0/1.4.0/Config/simple.so
+usr/lib/scim-1.0/1.4.0/Config/socket.so
+usr/lib/scim-1.0/1.4.0/IMEngine/socket.so
+@dirrm usr/lib/scim-1.0/1.4.0/Config
+@dirrm usr/lib/scim-1.0/1.4.0/IMEngine
+@dirrm usr/lib/scim-1.0/1.4.0
+@dirrm usr/lib/scim-1.0
diff --git a/textproc/linux-f10-scim-libs/pkg-plist.fc8 b/textproc/linux-f10-scim-libs/pkg-plist.fc8
new file mode 100644
index 000000000000..8f0499370f45
--- /dev/null
+++ b/textproc/linux-f10-scim-libs/pkg-plist.fc8
@@ -0,0 +1,16 @@
+@comment $FreeBSD$
+usr/lib/libscim-1.0.so.8
+usr/lib/libscim-1.0.so.8.2.3
+usr/lib/libscim-gtkutils-1.0.so.8
+usr/lib/libscim-gtkutils-1.0.so.8.2.3
+usr/lib/libscim-x11utils-1.0.so.8
+usr/lib/libscim-x11utils-1.0.so.8.2.3
+usr/lib/scim-1.0/1.4.0/Config/simple.so
+usr/lib/scim-1.0/1.4.0/Config/socket.so
+usr/lib/scim-1.0/1.4.0/IMEngine/socket.so
+@dirrm usr/lib/scim-1.0/1.4.0/Config
+@dirrm usr/lib/scim-1.0/1.4.0/FrontEnd
+@dirrm usr/lib/scim-1.0/1.4.0/IMEngine
+@dirrm usr/lib/scim-1.0/1.4.0/SetupUI
+@dirrm usr/lib/scim-1.0/1.4.0
+@dirrm usr/lib/scim-1.0