Date: Sun, 16 Mar 2014 13:39:50 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348407 - head/textproc/scim-table-imengine Message-ID: <201403161339.s2GDdoon080902@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Mar 16 13:39:50 2014 New Revision: 348407 URL: http://svnweb.freebsd.org/changeset/ports/348407 QAT: https://qat.redports.org/buildarchive/r348407/ Log: - 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) Modified: head/textproc/scim-table-imengine/Makefile head/textproc/scim-table-imengine/pkg-message head/textproc/scim-table-imengine/pkg-plist Modified: head/textproc/scim-table-imengine/Makefile ============================================================================== --- head/textproc/scim-table-imengine/Makefile Sun Mar 16 13:29:50 2014 (r348406) +++ head/textproc/scim-table-imengine/Makefile Sun Mar 16 13:39:50 2014 (r348407) @@ -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 e 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> Modified: head/textproc/scim-table-imengine/pkg-message ============================================================================== --- head/textproc/scim-table-imengine/pkg-message Sun Mar 16 13:29:50 2014 (r348406) +++ head/textproc/scim-table-imengine/pkg-message Sun Mar 16 13:39:50 2014 (r348407) @@ -3,10 +3,6 @@ The installation of SCIM table-based im 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: Modified: head/textproc/scim-table-imengine/pkg-plist ============================================================================== --- head/textproc/scim-table-imengine/pkg-plist Sun Mar 16 13:29:50 2014 (r348406) +++ head/textproc/scim-table-imengine/pkg-plist Sun Mar 16 13:39:50 2014 (r348407) @@ -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. 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403161339.s2GDdoon080902>