- Convert USE_AUTOTOOLS=libtool to USES=libtool.

- Remove USE_GNOME=intlhack.  Does not do anything.
- Staging.
- Remove SKIM support.  It depends on KDE3.
- Touch config.h.in in post-patch so the makefile doesn't think it's
  outdated and decides to run autoheader and other autotools.
- Remove references to FreeBSD 4.x from pkg-message.

PR:		ports/187011
Approved by:	maintainer timeout (3 weeks)

3 files changed, 6 insertions, 69 deletions

diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 579c3bf5e5ff..41bc1021f8e2 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-table-imengine
 PORTVERSION=	0.5.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/scim-tables/${PORTVERSION}
 DISTNAME=	scim-tables-${PORTVERSION}
@@ -14,51 +14,14 @@ COMMENT=	SCIM table based input method engine
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_GNOME=	intlhack
-USES=		gettext gmake pkgconfig
-
-MAN1=		scim-make-table.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+USES=		gettext gmake libtool pkgconfig
 
+CONFIGURE_ARGS=	--disable-skim-support
 CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
-
-CONFIGURE_ENV+=	PREFIX="${PREFIX}"
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-PLIST_SUB=	SKIM="@comment "
-
-pre-fetch:
-	@${ECHO_MSG} Define WITH_SKIM to enable skim support
-
-.if exists(${LOCALBASE}/bin/skim)
-WITH_SKIM=	yes
-pre-patch:
-	@${ECHO_MSG} Skim is detected, support enabled.
-.endif
-
-.if defined(WITH_SKIM)
-BUILD_DEPENDS+=	skim:${PORTSDIR}/textproc/skim
-CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
-PLIST_SUB=	SKIM=""
-USE_AUTOTOOLS=	libtool
 post-patch:
-	@${REINPLACE_CMD} -e "/^DIST_SUBDIRS/s/$$/ skim/" \
-		-e "/^@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR =/s/$$/ skim/" \
-		${WRKSRC}/Makefile.in
-post-configure:
-	${REINPLACE_CMD} \
-		-e 's,$$(top_builddir)/libtool --silent,${LIBTOOL},' \
-		${WRKSRC}/skim/Makefile ${WRKSRC}/skim/setupui/Makefile
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
-	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
-	@${ECHO}
+	@${TOUCH} ${WRKSRC}/config.h.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/scim-table-imengine/pkg-message b/textproc/scim-table-imengine/pkg-message
index 623134d7ff0b..f436f16671d0 100644
--- a/textproc/scim-table-imengine/pkg-message
+++ b/textproc/scim-table-imengine/pkg-message
@@ -3,10 +3,6 @@ The installation of SCIM table-based im engine has finished. Please note this
 port is only an engine for table-based input methods and does not contain any
 actual input methods.
 
-If you are using a 4.x system, please note there is no working scim-make-table
-command available in this port. Run `scim-make-table' command to get more
-information.
-
 The following ports can utilize this table-based imengine:
 
  Chinese:
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index feca0b094473..3ff96d17a482 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -5,6 +5,7 @@ lib/scim-1.0/1.4.0/IMEngine/table.so
 lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.a
 lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.la
 lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.so
+man/man1/scim-make-table.1.gz
 share/scim/icons/table.png
 share/locale/zh_CN/LC_MESSAGES/scim-tables.mo
 share/locale/zh_TW/LC_MESSAGES/scim-tables.mo
@@ -15,26 +16,3 @@ share/locale/fr/LC_MESSAGES/scim-tables.mo
 share/locale/it/LC_MESSAGES/scim-tables.mo
 share/locale/pa/LC_MESSAGES/scim-tables.mo
 share/locale/nl/LC_MESSAGES/scim-tables.mo
-%%SKIM%%@cwd %%LOCALBASE%%
-%%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.a
-%%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.la
-%%SKIM%%lib/kde3/kcm_skimplugin_scim_tables.so
-%%SKIM%%share/services/skimconfiguredialog/skimplugin_scim_table_config.desktop
-%%SKIM%%share/config.kcfg/generictable.kcfg
-%%SKIM%%share/locale/zh_CN/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/zh_TW/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/de/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/fr/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/ja/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/it/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/ko/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/pa/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/locale/nl/LC_MESSAGES/skim-scim-tables.mo
-%%SKIM%%share/apps/skim/pics/scim-tables.png
-%%SKIM%%@dirrmtry share/apps/skim/pics
-%%SKIM%%@dirrmtry share/apps/skim
-%%SKIM%%@dirrmtry share/config.kcfg
-%%SKIM%%@dirrmtry share/services/skimconfiguredialog
-@dirrmtry lib/scim-1.0/1.4.0/SetupUI
-@dirrmtry lib/scim-1.0/1.4.0/IMEngine
-@dirrmtry lib/scim-1.0