Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jan 2014 16:12:39 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339153 - in head/chinese: fcitx-chewing fcitx-cloudpinyin fcitx-configtool fcitx-googlepinyin fcitx-libpinyin fcitx-rime fcitx-table-extra fcitx-ui-light librime
Message-ID:  <201401081612.s08GCdnX053809@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Wed Jan  8 16:12:38 2014
New Revision: 339153
URL: http://svnweb.freebsd.org/changeset/ports/339153

Log:
  Add stagedir support.
  
  Approved by:	portmgr (blanket infrastructure)

Modified:
  head/chinese/fcitx-chewing/Makefile
  head/chinese/fcitx-chewing/pkg-plist
  head/chinese/fcitx-cloudpinyin/Makefile
  head/chinese/fcitx-configtool/Makefile
  head/chinese/fcitx-googlepinyin/Makefile
  head/chinese/fcitx-googlepinyin/pkg-plist
  head/chinese/fcitx-libpinyin/Makefile
  head/chinese/fcitx-rime/Makefile
  head/chinese/fcitx-rime/pkg-plist
  head/chinese/fcitx-table-extra/Makefile
  head/chinese/fcitx-table-extra/pkg-plist
  head/chinese/fcitx-ui-light/Makefile
  head/chinese/fcitx-ui-light/pkg-plist
  head/chinese/librime/Makefile
  head/chinese/librime/pkg-plist

Modified: head/chinese/fcitx-chewing/Makefile
==============================================================================
--- head/chinese/fcitx-chewing/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-chewing/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -19,5 +19,4 @@ USE_XZ=		yes
 USES=		cmake gettext pkgconfig
 USE_GNOME=	intltool
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/chinese/fcitx-chewing/pkg-plist
==============================================================================
--- head/chinese/fcitx-chewing/pkg-plist	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-chewing/pkg-plist	Wed Jan  8 16:12:38 2014	(r339153)
@@ -2,8 +2,8 @@ lib/fcitx/fcitx-chewing.so
 share/fcitx/addon/fcitx-chewing.conf
 share/fcitx/configdesc/fcitx-chewing.desc
 share/fcitx/inputmethod/chewing.conf
-share/fcitx/skin/default/chewing.png
 share/fcitx/skin/classic/chewing.png
 share/fcitx/skin/dark/chewing.png
+share/fcitx/skin/default/chewing.png
 share/locale/zh_CN/LC_MESSAGES/fcitx-chewing.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx-chewing.mo

Modified: head/chinese/fcitx-cloudpinyin/Makefile
==============================================================================
--- head/chinese/fcitx-cloudpinyin/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-cloudpinyin/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -20,5 +20,4 @@ USE_GNOME=	intltool
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/chinese/fcitx-configtool/Makefile
==============================================================================
--- head/chinese/fcitx-configtool/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-configtool/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -22,7 +22,6 @@ USES=		cmake gettext pkgconfig
 OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}

Modified: head/chinese/fcitx-googlepinyin/Makefile
==============================================================================
--- head/chinese/fcitx-googlepinyin/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-googlepinyin/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -19,5 +19,4 @@ USE_GNOME=	intltool
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/chinese/fcitx-googlepinyin/pkg-plist
==============================================================================
--- head/chinese/fcitx-googlepinyin/pkg-plist	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-googlepinyin/pkg-plist	Wed Jan  8 16:12:38 2014	(r339153)
@@ -1,9 +1,9 @@
 lib/fcitx/fcitx-googlepinyin.so
 share/fcitx/addon/fcitx-googlepinyin.conf
-share/fcitx/inputmethod/googlepinyin.conf
 share/fcitx/imicon/googlepinyin.png
-share/fcitx/skin/default/googlepinyin.png
+share/fcitx/inputmethod/googlepinyin.conf
 share/fcitx/skin/classic/googlepinyin.png
+share/fcitx/skin/default/googlepinyin.png
 share/icons/hicolor/16x16/apps/fcitx-googlepinyin.png
 share/icons/hicolor/48x48/apps/fcitx-googlepinyin.png
 share/locale/zh_CN/LC_MESSAGES/fcitx-googlepinyin.mo

Modified: head/chinese/fcitx-libpinyin/Makefile
==============================================================================
--- head/chinese/fcitx-libpinyin/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-libpinyin/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -22,7 +22,6 @@ USES=		cmake gettext pkgconfig
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${LN} -s ${_DISTDIR}/model.text.${MDVER}.tar.gz ${WRKSRC}/data
 

Modified: head/chinese/fcitx-rime/Makefile
==============================================================================
--- head/chinese/fcitx-rime/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-rime/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -22,5 +22,4 @@ INSTALLS_ICONS=	yes
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/chinese/fcitx-rime/pkg-plist
==============================================================================
--- head/chinese/fcitx-rime/pkg-plist	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-rime/pkg-plist	Wed Jan  8 16:12:38 2014	(r339153)
@@ -1,7 +1,7 @@
 lib/fcitx/fcitx-rime.so
 share/fcitx/addon/fcitx-rime.conf
-share/fcitx/inputmethod/rime.conf
 share/fcitx/imicon/rime.png
+share/fcitx/inputmethod/rime.conf
 share/fcitx/skin/classic/rime.png
 share/fcitx/skin/dark/rime.png
 share/fcitx/skin/default/rime.png

Modified: head/chinese/fcitx-table-extra/Makefile
==============================================================================
--- head/chinese/fcitx-table-extra/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-table-extra/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -20,5 +20,4 @@ STRIP=
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/chinese/fcitx-table-extra/pkg-plist
==============================================================================
--- head/chinese/fcitx-table-extra/pkg-plist	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-table-extra/pkg-plist	Wed Jan  8 16:12:38 2014	(r339153)
@@ -1,55 +1,55 @@
+share/fcitx/imicon/array30-big.png
+share/fcitx/imicon/array30.png
+share/fcitx/imicon/boshiamy.png
+share/fcitx/imicon/cantonese.png
 share/fcitx/imicon/cantonhk.png
+share/fcitx/imicon/easy-big.png
 share/fcitx/imicon/jyutping.png
+share/fcitx/imicon/quick-classic.png
 share/fcitx/imicon/quick3.png
 share/fcitx/imicon/quick5.png
-share/fcitx/imicon/quick-classic.png
 share/fcitx/imicon/scj6.png
+share/fcitx/imicon/stroke5.png
 share/fcitx/imicon/wu.png
 share/fcitx/imicon/zhengma.png
-share/fcitx/imicon/boshiamy.png
-share/fcitx/imicon/cantonese.png
-share/fcitx/imicon/easy-big.png
-share/fcitx/imicon/array30.png
-share/fcitx/imicon/array30-big.png
-share/fcitx/imicon/stroke5.png
+share/fcitx/table/array30-big.conf
+share/fcitx/table/array30-big.mb
+share/fcitx/table/array30.conf
+share/fcitx/table/array30.mb
 share/fcitx/table/boshiamy.conf
-share/fcitx/table/zhengma.conf
+share/fcitx/table/boshiamy.mb
+share/fcitx/table/cangjie-big.conf
+share/fcitx/table/cangjie-big.mb
 share/fcitx/table/cangjie3.conf
+share/fcitx/table/cangjie3.mb
 share/fcitx/table/cangjie5.conf
-share/fcitx/table/cangjie-big.conf
-share/fcitx/table/quick3.conf
-share/fcitx/table/quick5.conf
-share/fcitx/table/quick-classic.conf
-share/fcitx/table/scj6.conf
-share/fcitx/table/easy-big.conf
-share/fcitx/table/wu.conf
+share/fcitx/table/cangjie5.mb
 share/fcitx/table/cantonese.conf
+share/fcitx/table/cantonese.mb
 share/fcitx/table/cantonhk.conf
+share/fcitx/table/cantonhk.mb
+share/fcitx/table/easy-big.conf
+share/fcitx/table/easy-big.mb
 share/fcitx/table/jyutping.conf
-share/fcitx/table/stroke5.conf
-share/fcitx/table/array30.conf
-share/fcitx/table/array30-big.conf
-share/fcitx/table/wubi-large.conf
-share/fcitx/table/zhengma-large.conf
-share/fcitx/table/boshiamy.mb
-share/fcitx/table/zhengma.mb
-share/fcitx/table/cangjie3.mb
-share/fcitx/table/cangjie5.mb
-share/fcitx/table/cangjie-big.mb
+share/fcitx/table/jyutping.mb
+share/fcitx/table/quick-classic.conf
+share/fcitx/table/quick-classic.mb
+share/fcitx/table/quick3.conf
 share/fcitx/table/quick3.mb
+share/fcitx/table/quick5.conf
 share/fcitx/table/quick5.mb
-share/fcitx/table/quick-classic.mb
+share/fcitx/table/scj6.conf
 share/fcitx/table/scj6.mb
-share/fcitx/table/easy-big.mb
-share/fcitx/table/wu.mb
-share/fcitx/table/cantonese.mb
-share/fcitx/table/cantonhk.mb
-share/fcitx/table/jyutping.mb
+share/fcitx/table/stroke5.conf
 share/fcitx/table/stroke5.mb
-share/fcitx/table/array30.mb
-share/fcitx/table/array30-big.mb
+share/fcitx/table/wu.conf
+share/fcitx/table/wu.mb
+share/fcitx/table/wubi-large.conf
 share/fcitx/table/wubi-large.mb
+share/fcitx/table/zhengma-large.conf
 share/fcitx/table/zhengma-large.mb
+share/fcitx/table/zhengma.conf
+share/fcitx/table/zhengma.mb
 share/icons/hicolor/48x48/apps/fcitx-cantonhk.png
 share/icons/hicolor/48x48/apps/fcitx-jyutping.png
 share/icons/hicolor/48x48/apps/fcitx-quick-classic.png

Modified: head/chinese/fcitx-ui-light/Makefile
==============================================================================
--- head/chinese/fcitx-ui-light/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-ui-light/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -21,8 +21,4 @@ USE_GNOME=	intltool
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>

Modified: head/chinese/fcitx-ui-light/pkg-plist
==============================================================================
--- head/chinese/fcitx-ui-light/pkg-plist	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/fcitx-ui-light/pkg-plist	Wed Jan  8 16:12:38 2014	(r339153)
@@ -1,6 +1,6 @@
 lib/fcitx/fcitx-light-ui.so
+share/applications/fcitx-light.desktop
 share/fcitx/addon/fcitx-light-ui.conf
 share/fcitx/configdesc/fcitx-light-ui.desc
-share/applications/fcitx-light.desktop
 share/locale/zh_CN/LC_MESSAGES/fcitx-light-ui.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx-light-ui.mo

Modified: head/chinese/librime/Makefile
==============================================================================
--- head/chinese/librime/Makefile	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/librime/Makefile	Wed Jan  8 16:12:38 2014	(r339153)
@@ -30,7 +30,6 @@ post-patch:     .SILENT
 	${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
 		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' '{}' \;
 
-NO_STAGE=	yes
 post-build:
 	@echo "building rime data."
 	@${MKDIR} ${DATASRC}
@@ -39,8 +38,8 @@ post-build:
 	${WRKSRC}/bin/rime_deployer --build ${DATASRC}
 
 post-install:
-	${MKDIR} ${DATADIR}/data
-	${INSTALL_DATA} ${DATASRC}/*.kct ${DATASRC}/*.bin ${DATADIR}/data/
+	${MKDIR} ${STAGEDIR}${DATADIR}/data
+	${INSTALL_DATA} ${DATASRC}/*.kct ${DATASRC}/*.bin ${STAGEDIR}${DATADIR}/data/
 
 PROJECTHOST=	rimeime
 DATA_VER=	0.16

Modified: head/chinese/librime/pkg-plist
==============================================================================
--- head/chinese/librime/pkg-plist	Wed Jan  8 15:47:09 2014	(r339152)
+++ head/chinese/librime/pkg-plist	Wed Jan  8 16:12:38 2014	(r339153)
@@ -6,15 +6,15 @@ lib/librime.so.0
 lib/librime.so.%%VER%%
 libdata/pkgconfig/rime.pc
 share/cmake/rime/RimeConfig.cmake
-share/rime/data/cangjie5.prism.bin
-share/rime/data/cangjie5.reverse.bin
-share/rime/data/cangjie5.table.bin
-share/rime/data/essay.kct
-share/rime/data/luna_pinyin.prism.bin
-share/rime/data/luna_pinyin.reverse.bin
-share/rime/data/luna_pinyin.table.bin
-share/rime/data/luna_pinyin_fluency.prism.bin
-share/rime/data/luna_pinyin_simp.prism.bin
-@dirrmtry share/rime/data
-@dirrmtry share/rime
+%%DATADIR%%/data/cangjie5.prism.bin
+%%DATADIR%%/data/cangjie5.reverse.bin
+%%DATADIR%%/data/cangjie5.table.bin
+%%DATADIR%%/data/essay.kct
+%%DATADIR%%/data/luna_pinyin.prism.bin
+%%DATADIR%%/data/luna_pinyin.reverse.bin
+%%DATADIR%%/data/luna_pinyin.table.bin
+%%DATADIR%%/data/luna_pinyin_fluency.prism.bin
+%%DATADIR%%/data/luna_pinyin_simp.prism.bin
+@dirrmtry %%DATADIR%%/data
+@dirrmtry %%DATADIR%%
 @dirrm share/cmake/rime



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401081612.s08GCdnX053809>