From e3cc604e9c4c6098e18373ce4a21add0db834ee0 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 25 Jul 2014 12:19:07 +0000 Subject: [PATCH] - Convert texproc/uim and friends to USES=libtool, drop .la files - Bump ports dependent on uim as some .so versions have changed - While here, convert some USE_BZIP2 to USES=tar:bzip2 Approved by: portmgr blanket --- japanese/scim-uim/Makefile | 2 +- japanese/uim-anthy/pkg-plist | 4 ---- japanese/uim-tomoe-gtk/Makefile | 2 +- textproc/uim-el/Makefile | 4 ++-- textproc/uim-gtk/pkg-plist | 2 -- textproc/uim-gtk3/pkg-plist | 2 -- textproc/uim-m17nlib/pkg-plist | 2 -- textproc/uim-qt4/Makefile | 3 +-- textproc/uim/Makefile | 5 ++--- textproc/uim/pkg-plist | 33 +++++++-------------------------- x11/mlterm/Makefile | 1 + 11 files changed, 15 insertions(+), 45 deletions(-) diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile index 182f905d061a..93d3174d176b 100644 --- a/japanese/scim-uim/Makefile +++ b/japanese/scim-uim/Makefile @@ -3,7 +3,7 @@ PORTNAME= scim-uim PORTVERSION= 0.2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= japanese MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \ http://freedesktop.org/~suzhe/sources/ diff --git a/japanese/uim-anthy/pkg-plist b/japanese/uim-anthy/pkg-plist index 3b5b3256f009..1cb7b0989bcb 100644 --- a/japanese/uim-anthy/pkg-plist +++ b/japanese/uim-anthy/pkg-plist @@ -1,9 +1,5 @@ %%X11%%bin/uim-dict-gtk -lib/uim/plugin/libuim-anthy.a -lib/uim/plugin/libuim-anthy.la lib/uim/plugin/libuim-anthy.so -lib/uim/plugin/libuim-anthy-utf8.a -lib/uim/plugin/libuim-anthy-utf8.la lib/uim/plugin/libuim-anthy-utf8.so %%X11%%%%DATADIR%%/helperdata/uim-dict-ui.xml @dirrmtry %%X11%%%%DATADIR%%/helperdata diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile index bb25a95fe612..ff0af93893b4 100644 --- a/japanese/uim-tomoe-gtk/Makefile +++ b/japanese/uim-tomoe-gtk/Makefile @@ -3,7 +3,7 @@ PORTNAME= uim-tomoe-gtk PORTVERSION= 0.6.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= japanese MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index 5336469a66ed..28dee9db43f3 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -3,6 +3,7 @@ PORTNAME= uim-el PORTVERSION= 1.8.6 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMESUFFIX= -${EMACS_PORT_NAME} @@ -20,10 +21,9 @@ RUN_DEPENDS= uim-el-agent:${PORTSDIR}/textproc/uim OPTIONS_DEFINE= DOCS -USE_BZIP2= yes USE_PERL5= build USE_GNOME= intltool -USES= iconv gmake perl5 +USES= iconv gmake perl5 tar:bzip2 USE_EMACS= yes GNU_CONFIGURE= yes diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist index 4a6cd88bcdf1..773c01400da6 100644 --- a/textproc/uim-gtk/pkg-plist +++ b/textproc/uim-gtk/pkg-plist @@ -3,8 +3,6 @@ bin/uim-input-pad-ja bin/uim-pref-gtk bin/uim-toolbar-gtk bin/uim-toolbar-gtk-systray -lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.a -lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.la lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so @exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache @unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache diff --git a/textproc/uim-gtk3/pkg-plist b/textproc/uim-gtk3/pkg-plist index f1e5b16e5b0e..7b6f25c91b3b 100644 --- a/textproc/uim-gtk3/pkg-plist +++ b/textproc/uim-gtk3/pkg-plist @@ -3,8 +3,6 @@ bin/uim-input-pad-ja-gtk3 bin/uim-pref-gtk3 bin/uim-toolbar-gtk3 bin/uim-toolbar-gtk3-systray -lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.a -lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.la lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.so libexec/uim-candwin-gtk3 libexec/uim-candwin-horizontal-gtk3 diff --git a/textproc/uim-m17nlib/pkg-plist b/textproc/uim-m17nlib/pkg-plist index 0be7288b033e..01b8356ddf49 100644 --- a/textproc/uim-m17nlib/pkg-plist +++ b/textproc/uim-m17nlib/pkg-plist @@ -1,5 +1,3 @@ -lib/uim/plugin/libuim-m17nlib.a -lib/uim/plugin/libuim-m17nlib.la lib/uim/plugin/libuim-m17nlib.so @exec uim-module-manager --register m17nlib @unexec uim-module-manager --unregister m17nlib diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile index a8258a78570e..e2e7f202a427 100644 --- a/textproc/uim-qt4/Makefile +++ b/textproc/uim-qt4/Makefile @@ -8,8 +8,7 @@ COMMENT= Qt4 modules of uim input method LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim USE_QT4= qmake_build moc_build qt3support uic -USE_AUTOTOOLS= libtool -USES= iconv +USES= iconv libtool MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 1451d90b5128..9dbef5c88788 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -3,6 +3,7 @@ PORTNAME= uim PORTVERSION= 1.8.6 +PORTREVISION?= 1 CATEGORIES?= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) @@ -12,12 +13,10 @@ PKGNAMESUFFIX= -nox11 MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Input method library -USE_BZIP2= yes USE_LDCONFIG= yes WANT_GNOME= yes USE_GNOME+= glib20 intltool -USE_AUTOTOOLS= libtool -USES= gettext gmake iconv pkgconfig perl5 +USES= gettext gmake iconv libtool pkgconfig perl5 tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist index 315139b59eea..6c6b44f54fdc 100644 --- a/textproc/uim/pkg-plist +++ b/textproc/uim/pkg-plist @@ -19,44 +19,25 @@ include/uim/uim-util.h include/uim/uim.h include/uim/version.h lib/libgcroots.a -lib/libgcroots.la lib/libgcroots.so -lib/libgcroots.so.1 -lib/libuim-custom.a -lib/libuim-custom.la +lib/libgcroots.so.0 +lib/libgcroots.so.0.1.0 lib/libuim-custom.so -lib/libuim-custom.so.3 -lib/libuim-scm.a -lib/libuim-scm.la +lib/libuim-custom.so.2 +lib/libuim-custom.so.2.1.0 lib/libuim-scm.so -lib/libuim-scm.so.1 -lib/libuim.a -lib/libuim.la +lib/libuim-scm.so.0 +lib/libuim-scm.so.0.1.0 lib/libuim.so lib/libuim.so.8 -lib/uim/plugin/libuim-custom-enabler.a -lib/uim/plugin/libuim-custom-enabler.la +lib/libuim.so.8.0.0 lib/uim/plugin/libuim-custom-enabler.so -lib/uim/plugin/libuim-editline.a -lib/uim/plugin/libuim-editline.la lib/uim/plugin/libuim-editline.so -lib/uim/plugin/libuim-fileio.a -lib/uim/plugin/libuim-fileio.la lib/uim/plugin/libuim-fileio.so -lib/uim/plugin/libuim-lolevel.a -lib/uim/plugin/libuim-lolevel.la lib/uim/plugin/libuim-lolevel.so -lib/uim/plugin/libuim-look.a -lib/uim/plugin/libuim-look.la lib/uim/plugin/libuim-look.so -lib/uim/plugin/libuim-process.a -lib/uim/plugin/libuim-process.la lib/uim/plugin/libuim-process.so -lib/uim/plugin/libuim-skk.a -lib/uim/plugin/libuim-skk.la lib/uim/plugin/libuim-skk.so -lib/uim/plugin/libuim-socket.a -lib/uim/plugin/libuim-socket.la lib/uim/plugin/libuim-socket.so libdata/pkgconfig/gcroots.pc libdata/pkgconfig/uim.pc diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 9b7344384973..58d4116ea913 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -3,6 +3,7 @@ PORTNAME= mlterm PORTVERSION= 3.3.6 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION}