From owner-svn-ports-all@FreeBSD.ORG Mon Jun 16 12:19:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74EC275E; Mon, 16 Jun 2014 12:19:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 439E72AA7; Mon, 16 Jun 2014 12:19:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5GCJiBe072342; Mon, 16 Jun 2014 12:19:44 GMT (envelope-from nobutaka@svn.freebsd.org) Received: (from nobutaka@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5GCJflI072309; Mon, 16 Jun 2014 12:19:41 GMT (envelope-from nobutaka@svn.freebsd.org) Message-Id: <201406161219.s5GCJflI072309@svn.freebsd.org> From: MANTANI Nobutaka Date: Mon, 16 Jun 2014 12:19:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357974 - in head: japanese/uim-anthy textproc/uim textproc/uim-el textproc/uim-el-emacs21 textproc/uim-el-emacs22 textproc/uim-gtk textproc/uim-gtk3 textproc/uim-kde4 textproc/uim-m17n... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 12:19:44 -0000 Author: nobutaka Date: Mon Jun 16 12:19:41 2014 New Revision: 357974 URL: http://svnweb.freebsd.org/changeset/ports/357974 QAT: https://qat.redports.org/buildarchive/r357974/ Log: Update to 1.8.6. Support staging. Modified: head/japanese/uim-anthy/Makefile head/textproc/uim-el-emacs21/Makefile head/textproc/uim-el-emacs22/Makefile head/textproc/uim-el/Makefile head/textproc/uim-el/distinfo head/textproc/uim-gtk/Makefile head/textproc/uim-gtk3/Makefile head/textproc/uim-kde4/Makefile head/textproc/uim-m17nlib/Makefile head/textproc/uim-qt4/Makefile head/textproc/uim/Makefile head/textproc/uim/distinfo head/textproc/uim/pkg-plist Modified: head/japanese/uim-anthy/Makefile ============================================================================== --- head/japanese/uim-anthy/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/japanese/uim-anthy/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -14,8 +14,8 @@ COMMENT= Uim plugin using Anthy input me USE_GNOME= gtk20 .endif -LIB_DEPENDS= anthy:${PORTSDIR}/japanese/anthy \ - uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libanthy.so:${PORTSDIR}/japanese/anthy \ + libuim.so:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} @@ -30,7 +30,6 @@ UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_dict_Makefile.in -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy.la) (cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy-utf8.la) @@ -40,14 +39,10 @@ do-build: do-install: (cd ${WRKSRC}/uim && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) + ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ + ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) .if !defined(WITHOUT_X11) - (cd ${WRKSRC}/gtk2/dict && ${GMAKE} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) + (cd ${WRKSRC}/gtk2/dict && ${GMAKE} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) .endif -post-install: - ${LOCALBASE}/bin/uim-module-manager --register anthy - ${LOCALBASE}/bin/uim-module-manager --register anthy-utf8 - .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim-el-emacs21/Makefile ============================================================================== --- head/textproc/uim-el-emacs21/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-el-emacs21/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -16,5 +16,4 @@ DESCR= ${MASTERDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../uim-el -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim-el-emacs22/Makefile ============================================================================== --- head/textproc/uim-el-emacs22/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-el-emacs22/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -16,5 +16,4 @@ DESCR= ${MASTERDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../uim-el -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim-el/Makefile ============================================================================== --- head/textproc/uim-el/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-el/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= uim-el -PORTVERSION= 1.8.5 +PORTVERSION= 1.8.6 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMESUFFIX= -${EMACS_PORT_NAME} @@ -24,7 +24,6 @@ USE_GNOME= intltool USES= iconv gmake perl5 USE_EMACS= yes GNU_CONFIGURE= yes -NO_STAGE= yes BUILD_WRKSRC= ${WRKSRC}/emacs INSTALL_WRKSRC= ${WRKSRC}/emacs @@ -39,10 +38,10 @@ PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^ .if !defined(NOPORTDOCS) post-install: - ${MKDIR} ${DOCSDIR} - ${MKDIR} ${DOCSDIR_JA} - ${INSTALL_DATA} ${WRKSRC}/emacs/README ${DOCSDIR}/README - ${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${DOCSDIR_JA}/README.ja + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} + ${INSTALL_DATA} ${WRKSRC}/emacs/README ${STAGEDIR}${DOCSDIR}/README + ${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.ja .endif .include Modified: head/textproc/uim-el/distinfo ============================================================================== --- head/textproc/uim-el/distinfo Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-el/distinfo Mon Jun 16 12:19:41 2014 (r357974) @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.5.tar.bz2) = f74550b42d22a1e2bbc581039585541f7784eb6652a06ec17aa88bcf5f0f3d58 -SIZE (uim-1.8.5.tar.bz2) = 6497675 +SHA256 (uim-1.8.6.tar.bz2) = 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f +SIZE (uim-1.8.6.tar.bz2) = 6500739 Modified: head/textproc/uim-gtk/Makefile ============================================================================== --- head/textproc/uim-gtk/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-gtk/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -gtk COMMENT= GTK+ modules of uim input method USE_GNOME= gtk20 -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} @@ -24,7 +24,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-g IGNORE= requires X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk2/immodule && ${GMAKE}) @@ -34,10 +33,10 @@ do-build: (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE}) do-install: - (cd ${WRKSRC}/gtk2/immodule && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/pad && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/pref && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/switcher && ${GMAKE} install) - (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE} install) + (cd ${WRKSRC}/gtk2/immodule && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/pad && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/pref && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/switcher && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim-gtk3/Makefile ============================================================================== --- head/textproc/uim-gtk3/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-gtk3/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -gtk3 COMMENT= GTK+ 3.x modules of uim input method USE_GNOME= gtk30 -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} @@ -26,12 +26,11 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-g IGNORE= requires X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk3 && ${GMAKE}) do-install: - (cd ${WRKSRC}/gtk3 && ${GMAKE} install) + (cd ${WRKSRC}/gtk3 && ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim-kde4/Makefile ============================================================================== --- head/textproc/uim-kde4/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-kde4/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -kde4 COMMENT= KDE4 panel applet of uim input method BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim RUN_DEPENDS= uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4 USE_GCC= any @@ -30,11 +30,10 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-q IGNORE= requires X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE}) do-install: - (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE} install) + (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim-m17nlib/Makefile ============================================================================== --- head/textproc/uim-m17nlib/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-m17nlib/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -10,8 +10,8 @@ PKGNAMESUFFIX= -m17nlib COMMENT= Uim plugin using m17n library input method BUILD_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db -LIB_DEPENDS= m17n:${PORTSDIR}/devel/m17n-lib \ - uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libm17n.so:${PORTSDIR}/devel/m17n-lib \ + libuim.so:${PORTSDIR}/textproc/uim RUN_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db .if !defined(WITHOUT_M17NCONTRIB) @@ -26,18 +26,16 @@ UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${GMAKE} libuim-m17nlib.la) do-install: (cd ${WRKSRC}/uim && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ - ${MKDIR} ${PREFIX}/share/uim/pixmaps && \ - DESTDIR="" ${SH} ../pixmaps/uim-m17nlib-relink-icons) + ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/uim/pixmaps && \ + DESTDIR="${STAGEDIR}" ${SH} ../pixmaps/uim-m17nlib-relink-icons) post-install: - ${LOCALBASE}/bin/uim-module-manager --register m17nlib @${FIND} ${LOCALBASE}/share/m17n/icons/ -name '*.png' -execdir ${ECHO} share/uim/pixmaps/m17n-{} \; >>${TMPPLIST} .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim-qt4/Makefile ============================================================================== --- head/textproc/uim-qt4/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim-qt4/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -qt4 COMMENT= Qt4 modules of uim input method -LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim +LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim USE_QT4= qmake_build moc_build qt3support uic USE_AUTOTOOLS= libtool @@ -25,13 +25,12 @@ UIM_SLAVE= yes IGNORE= cannot be built without X11. Please, unset WITHOUT_X11 .endif -NO_STAGE= yes do-build: (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${GMAKE} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${GMAKE}) (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE}) do-install: - (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE} install) + (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Modified: head/textproc/uim/Makefile ============================================================================== --- head/textproc/uim/Makefile Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim/Makefile Mon Jun 16 12:19:41 2014 (r357974) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= uim -PORTVERSION= 1.8.5 +PORTVERSION= 1.8.6 CATEGORIES?= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) @@ -22,7 +22,7 @@ USE_PERL5= build GNU_CONFIGURE= yes .if !defined(WITHOUT_X11) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +LIB_DEPENDS+= libXft.so:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --with-x --with-xft .endif @@ -39,9 +39,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include .if !defined(UIM_SLAVE) -.if !defined(WITHOUT_X11) -MAN1= uim-xim.1 -.endif DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim DOCSDIR_SIGSCHEME= ${PREFIX}/share/doc/uim/sigscheme PLIST_SUB= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \ @@ -54,7 +51,6 @@ PLIST_SUB+= X11="@comment " PLIST_SUB+= X11="" .endif -NO_STAGE= yes .include .if ${ARCH} == "ia64" @@ -91,26 +87,26 @@ do-build: do-install: .if !defined(UIM_SLAVE) - cd ${WRKSRC} && ${GMAKE} install-data-am + cd ${WRKSRC} && ${GMAKE} DESTDIR=${STAGEDIR} install-data-am .for d in sigscheme uim scm xim po fep emacs pixmaps tables - cd ${WRKSRC}/${d} && ${GMAKE} install + cd ${WRKSRC}/${d} && ${GMAKE} DESTDIR=${STAGEDIR} install .endfor .if !defined(WITHOUT_X11) - cd ${WRKSRC}/gtk2/candwin && ${GMAKE} install + cd ${WRKSRC}/gtk2/candwin && ${GMAKE} DESTDIR=${STAGEDIR} install .endif .endif .if !defined(UIM_SLAVE) post-install: - ${MKDIR} ${DATADIR}/helperdata + ${MKDIR} ${STAGEDIR}${DATADIR}/helperdata .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${MKDIR} ${DOCSDIR_JA} - ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DOCSDIR}/KEY - ${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.fep - ${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.key - ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DOCSDIR_JA}/README.fep - ${INSTALL_DATA} ${WRKSRC}/xim/README ${DOCSDIR}/README.xim + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} + ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${STAGEDIR}${DOCSDIR}/KEY + ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.fep + ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.key + ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.fep + ${INSTALL_DATA} ${WRKSRC}/xim/README ${STAGEDIR}${DOCSDIR}/README.xim .endif .endif Modified: head/textproc/uim/distinfo ============================================================================== --- head/textproc/uim/distinfo Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim/distinfo Mon Jun 16 12:19:41 2014 (r357974) @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.5.tar.bz2) = f74550b42d22a1e2bbc581039585541f7784eb6652a06ec17aa88bcf5f0f3d58 -SIZE (uim-1.8.5.tar.bz2) = 6497675 +SHA256 (uim-1.8.6.tar.bz2) = 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f +SIZE (uim-1.8.6.tar.bz2) = 6500739 Modified: head/textproc/uim/pkg-plist ============================================================================== --- head/textproc/uim/pkg-plist Mon Jun 16 12:18:26 2014 (r357973) +++ head/textproc/uim/pkg-plist Mon Jun 16 12:19:41 2014 (r357974) @@ -64,6 +64,7 @@ libdata/pkgconfig/uim.pc %%X11%%libexec/uim-candwin-horizontal-gtk %%X11%%libexec/uim-candwin-tbl-gtk libexec/uim-helper-server +%%X11%%man/man1/uim-xim.1.gz share/applications/uim.desktop share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim.mo