Date: Sat, 15 Apr 2006 13:09:19 +0900 (JST) From: NIIMI Satoshi <sa2c@sa2c.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95785: textproc/uim: split plugins into slave ports Message-ID: <20060415040919.93BAE1145A@berkeley.l.sa2c.net> Resent-Message-ID: <200604150410.k3F4A97b014167@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95785 >Category: ports >Synopsis: textproc/uim: split plugins into slave ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 15 04:10:08 GMT 2006 >Closed-Date: >Last-Modified: >Originator: NIIMI Satoshi >Release: FreeBSD 6.1-RC i386 >Organization: >Environment: System: FreeBSD berkeley.l.sa2c.net 6.1-RC FreeBSD 6.1-RC #1: Wed Apr 12 08:46:01 JST 2006 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Optional features of uim which are currently configured with OPTIONS knob can be installed separately. This patch split such features into several slave ports. >How-To-Repeat: >Fix: --- uim.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/uim/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 23 Feb 2006 10:39:32 -0000 1.47 +++ Makefile 26 Mar 2006 23:00:00 -0000 @@ -7,7 +7,7 @@ PORTNAME= uim PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://uim.freedesktop.org/releases/ @@ -18,30 +18,24 @@ USE_REINPLACE= yes INSTALLS_SHLIB= yes WANT_GNOME= yes -USE_GNOME= gnometarget glib20 +USE_GNOME+= gnometarget glib20 USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft +LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +.if !defined(UIM_SLAVE) CONFIGURE_ARGS= --enable-emacs -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ +.endif +CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" -OPTIONS= GTK "Enable GTK support" off \ - QT "Enable QT support" off \ - GNOME "Enable GNOME support" off \ - ANTHY "Enable Anthy support" off \ - CANNA "Enable Canna support" off \ - M17NLIB "Enable m17lib support" off \ - PRIME "Enable PRIME support" off \ - SCIM "Enable SCIM support" off \ - SKK "Enable SKK support" off - +.if !defined(UIM_SLAVE) MAN1= uim-xim.1 DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim PLIST_SUB= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" +.endif .include <bsd.port.pre.mk> @@ -56,90 +50,19 @@ CONFIGURE_ENV+= INTLTOOL_PERL="${LOCALBASE}/bin/perl" .endif -.if defined(WITH_GTK) -USE_GNOME+= gtk20 -CONFIGURE_ARGS+=--with-gtk2 -PLIST_SUB+= GTK="" -.else -CONFIGURE_ARGS+=--without-gtk2 -PLIST_SUB+= GTK="@comment " -.endif - -.if defined(WITH_QT) -LIB_DEPENDS+= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 -CONFIGURE_ARGS+=--with-qt -CONFIGURE_ENV+= QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \ - CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include" LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib" -PLIST_SUB+= QT="" -.else -CONFIGURE_ARGS+=--without-qt -PLIST_SUB+= QT="@comment " -.endif - -.if defined(WITH_GNOME) -USE_GNOME+= gnomepanel -CONFIGURE_ARGS+=--with-gnome2 --enable-applet -PLIST_SUB+= GNOME="" -.else -CONFIGURE_ARGS+=--without-gnome2 --disable-applet -PLIST_SUB+= GNOME="@comment " -.endif - -.if defined(WITH_ANTHY) -LIB_DEPENDS+= anthy.1:${PORTSDIR}/japanese/anthy -CONFIGURE_ARGS+=--with-anthy -PLIST_SUB+= ANTHY="" -.else -CONFIGURE_ARGS+=--without-anthy -PLIST_SUB+= ANTHY="@comment " -.endif - -.if defined(WITH_CANNA) -LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna -CONFIGURE_ARGS+=--with-canna -PLIST_SUB+= CANNA="" -.else -CONFIGURE_ARGS+=--without-canna -PLIST_SUB+= CANNA="@comment " -.endif - -.if defined(WITH_M17NLIB) -LIB_DEPENDS+= m17n.1:${PORTSDIR}/devel/m17n-lib -CONFIGURE_ARGS+=--with-m17nlib -PLIST_SUB+= M17NLIB="" -.else -CONFIGURE_ARGS+=--without-m17nlib -PLIST_SUB+= M17NLIB="@comment " -.endif - -.if defined(WITH_PRIME) -BUILD_DEPENDS+= prime:${PORTSDIR}/japanese/prime -RUN_DEPENDS+= ${BUILD_DEPENDS} -CONFIGURE_ARGS+=--with-prime -PLIST_SUB+= PRIME="" -.else -CONFIGURE_ARGS+=--without-prime -PLIST_SUB+= PRIME="@comment " -.endif - -.if defined(WITH_SCIM) -USE_GCC= 3.4 -LIB_DEPENDS+= scim-1.0.9:${PORTSDIR}/textproc/scim -CONFIGURE_ARGS+=--with-scim -PLIST_SUB+= SCIM="" -.else -CONFIGURE_ARGS+=--without-scim -PLIST_SUB+= SCIM="@comment " -.endif - -.if defined(WITH_SKK) -RUN_DEPENDS+= ${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo +.for _x in gtk2 qt gnome2 anthy canna m17nlib prime scim +.if ${CONFIGURE_ARGS:M--with-${_x}} == "" +CONFIGURE_ARGS+=--without-${_x} +.endif +.endfor +.if ${CONFIGURE_ARGS:M--enable-applet} == "" +CONFIGURE_ARGS+=--disable-applet .endif post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm -.if !defined(NOPORTDOCS) +.if !defined(UIM_SLAVE) && !defined(NOPORTDOCS) post-install: ${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR_JA} Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/textproc/uim/pkg-plist,v retrieving revision 1.24 diff -u -r1.24 pkg-plist --- pkg-plist 23 Feb 2006 10:39:32 -0000 1.24 +++ pkg-plist 26 Mar 2006 23:00:00 -0000 @@ -1,19 +1,8 @@ -%%QT%%bin/uim-chardict-qt bin/uim-el-agent bin/uim-fep bin/uim-fep-tick -%%GTK%%bin/uim-helper-toolbar-gtk -%%GTK%%bin/uim-helper-toolbar-gtk-systray -%%GTK%%bin/uim-im-switcher-gtk -%%QT%%bin/uim-im-switcher-qt -%%GTK%%bin/uim-input-pad-ja bin/uim-module-manager -%%GTK%%bin/uim-pref-gtk -%%QT%%bin/uim-pref-qt bin/uim-sh -%%GTK%%bin/uim-toolbar-gtk -%%GTK%%bin/uim-toolbar-gtk-systray -%%QT%%bin/uim-toolbar-qt bin/uim-xim include/uim/plugin.h include/uim/uim-compat-scm.h @@ -23,10 +12,6 @@ include/uim/uim-scm.h include/uim/uim-util.h include/uim/uim.h -%%GNOME%%libdata/bonobo/servers/GNOME_UimApplet.server -%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.a -%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.la -%%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.so lib/libuim-custom.a lib/libuim-custom.la lib/libuim-custom.so @@ -35,33 +20,14 @@ lib/libuim.la lib/libuim.so lib/libuim.so.1 -%%ANTHY%%lib/uim/plugin/libuim-anthy.a -%%ANTHY%%lib/uim/plugin/libuim-anthy.la -%%ANTHY%%lib/uim/plugin/libuim-anthy.so -%%CANNA%%lib/uim/plugin/libuim-canna.a -%%CANNA%%lib/uim/plugin/libuim-canna.la -%%CANNA%%lib/uim/plugin/libuim-canna.so lib/uim/plugin/libuim-custom-enabler.a lib/uim/plugin/libuim-custom-enabler.la lib/uim/plugin/libuim-custom-enabler.so -%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.a -%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.la -%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.so -%%PRIME%%lib/uim/plugin/libuim-prime.a -%%PRIME%%lib/uim/plugin/libuim-prime.la -%%PRIME%%lib/uim/plugin/libuim-prime.so -%%SCIM%%lib/uim/plugin/libuim-scim.a -%%SCIM%%lib/uim/plugin/libuim-scim.la -%%SCIM%%lib/uim/plugin/libuim-scim.so lib/uim/plugin/libuim-skk.a lib/uim/plugin/libuim-skk.la lib/uim/plugin/libuim-skk.so libdata/pkgconfig/uim.pc -%%GTK%%libexec/uim-candwin-gtk -%%QT%%libexec/uim-candwin-qt libexec/uim-helper-server -%%GNOME%%libexec/uim-helper-applet -%%GNOME%%libexec/uim-toolbar-applet share/applications/uim.desktop share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim.mo @@ -93,7 +59,6 @@ %%DATADIR%%/hangul.scm %%DATADIR%%/hangul2.scm %%DATADIR%%/hangul3.scm -%%GNOME%%%%DATADIR%%/helperdata/bushu.t %%DATADIR%%/i18n.scm %%DATADIR%%/im-custom.scm %%DATADIR%%/im.scm @@ -148,10 +113,7 @@ @dirrm lib/uim/plugin @dirrm lib/uim @dirrmtry share/applications -%%GNOME%%@dirrm %%DATADIR%%/helperdata %%PORTDOCS%%@dirrm %%DOCSDIR_JA%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% -%%GTK%%@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules -%%GTK%%@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules --- uim.diff ends here --- begin 644 uim-slave-ports.tar.gz M'XL(`&$>)T0``^U=;7.:2A3N5_D5.VW2+QT44'%NYJ93$DFNDVA2-4T^=,8A M2I2*8&!MFNGDO]]=0*("OF1P,<EYQ@DO>V`/[)[#>?8LY)<VUBS=U0L38\1K M%AX\?D@=@B!4RF5$EK)0$F:7(9`HE$11%N6B+"!!+$FB]`&5TU<EBHF+-8>H MXFI2=YG<JO+@.L+E*\&O2/L7ZMI0OS-,/;4ZR/V02Z7$]A=%:;']RQ6I^`$) MJ6FP!.^\_3^AAOZ`QK:#7=2U35/O8L.VT"CH`^C.=@X00K\T/NP@W"=4U;". MNHY.%CU:[*$H(F72)_<328)0)%+7`WL4EDY15QIMI5%##?MV@K6AAOZU@K5O M)XZN'[6J>=OI?^4^D1/L!7OVR!9W>7;:4.IJZ^KDI'9SF`MTJ2NMMMJLUIJ' MN;V_^>,KNOI4R.?I#^M_\-BQN[1OT\,]J1DQKGG5Z%352[51;1WFZ/6-[-[$ MU/F19FE]W3G8^QN>_HD[KQT]"WN5YT4B<7G1;+>\2D-3\C4[OFB<U$ZOFFI' M:9Z20WC^P<"#0&WNJE;OM,Z5'^IA[E%W.:YG\X9%NJ)I'G"Y;@_M_;UNGK6: MQT]4>?3Y,_K)$<U/Z\J9^H3(KL[8G/0-JW/>)GHUE69-;1V:QFW82'E30\$) M^6?Q&6F.&]LNGJDT>OV(YQV];[B8K`9JYPVK:TYZ.OHX>V]"E_&1R[H_`S9# MC/\?#_M\3W>[3EIUK/#_Y`%06O#_LB!7P/^S`/4NOF]`$]>P^DBA?8"XCO$$ MHY&.!W8OSW'7U]<':(#Q^*!`.TK^COAETD6&V!Y3;UUX,(9&`6S_%2+!_L<F M<?MIU;'*_B4Y8O]B40#[9P$2,]"F+_@^H#`70FC<LE)S>;%K<]_T/WH7K1-7 M?)M8R;(3:T$ZZWOVEC!G_UW-LK3TZW@!_Q=+%>#_+!!M_YW@_[(,_I\)-N/_ M7@?9$?[OZY(1__<J3^+_QYYF"?S?5WN;_-_7+67^'Z@-_/^-(<;_[P3_ETK@ M_UD@PO\]YP7\_[T@P?ZSYO^"7`;[9X%X"N^'$$D$?QI@+"U>D__[<<6Z_-^7 MSOJ>O27,V?_8,4;IT;X0+\G_"T7@_RP0;?\,^'^Y$LW_R^#_66`S_N]UD!WA M_[XN[/C_T57MO/HL[E4?S_]]S69._H4J-W?\4]+P@'_L-H<'O!K2'AX(U(;A M@=>&&/^_$_P?QG_9(,+_+YNUN@K\_[T@P?ZSYO^B)(+]LT`\A?=CA"2"/XT@ MEA:OR?_]P&%=_N]+9WW/WA)F8V2^;]F[PO_+,O!_%HBV/WO^+\A2A/]7(/_# M!&OR_[!W[`CY]W5A1_ZO6FKGM'%1)WR\CX>2@#P%:.AD)C%Y*H>FZU2:;NF6 M=DOJT,9C4\>;T/R!;H[)`W"!Z6NC3D>]4=6;=J=X&!)Z5W=^ZTY5:2OA+O)H MI@_8R^;%:5.IM\+]="<_L.UAJ!)0^'>%&/^?`?]?]/^R6(3XGPD\IX9\XW>1 M?4<]/;#_]X,$^V?*_\52,6+_%1C_8P(2&/0TK!5N;1*)V04_='`+GEOH7!DC MQ?,,>7\_%X017F?Q(Y)IW#!;@FW;O-7"HJPO$;`$\_:/A]NH8W/^7ZP4@?\S MP6+[I\_^5_M_TMB+_+\DP_O_3+`)_\?#76'_1)/LN/\RPK\)I2?RE,^'9#X0 M2R3^$<$TN'K$_E-G?^OP/S'R_H\(\1\3G+;/OB"_]P/]>X>(M?]4V=]J^Y?E MJ/V78?XW$]P:UBR;FU(W^H1-+N+=1Q<[VF,H0GXN>09V!_K\H9XGX<=:C_^E MA3O'CGXW)Q57:5QM--U,MZ6\4)#R)?+7&`6NBZS1>6Q!RGJ%D+F6E&O/D=JN M9O4>#,M3TD]LT^/O)[KSR(?'TO.AKVB_6M!Q-ZR`+/.A2)CK?N'A*;?_G/V/ MQ(I%KCGE*EZ2_RU)\/TW)HAK_[0YX*K\KR@M\C]9+,'X/Q-LP/^"WK$C''"J M348O@-/J%][_[NF_=;-`"VBZ-8DE3O7>YA3OH(ZT)WF'JD..^,T@UO^G/`:P MDO]+D?R/5('OOS%!9/XW[0.(=`)'<^`S<&\?B?:?XAC`*ON7*I'XKUB"\7\F MB)_"/0T@DJ9X/P<8*P36G`4^C2S6G0<^E<_Z[KU^S-G_?8J#?C-X0?ZW7"D# M_V>!A?;?1OIW)?^7RI'\;U&"_`\3;,#_[_&.4'^B2":L_\MA[A[S(YPOSO'^ M/Z+H#5</#>P6[G&QF$3]B=[/)6KCQV'N>YLJM_?W1A2/E);Z1!^?Z'N[UCA> MV#\EW#^Y7.[XYN;D7"'G)>Q[NOZ$B$;M_YJJ4NT<!WOX6O0$'Q&Y'N](NIP] MRM_FS^>5^;C).,4]SCZ?#=@,B_Y_"^G_U?Q?B'S_HU2&]W^8X'L;LO_O&7'V MGW+Z?S7_+T7>_RL+,/['!--\>W>@.3VCBVF0$I?5G]GMY>]GMJ>I^GL<FS`G MN_?WZ<MHY%F^OQ\\__TYYQ-W,,EC[EO/<)P1BI<"U[)5S-F_VS5&6ZCC!?E_ ML@G\GP4B[;^%$8"5^?_H^]\R_/\W-MB`_]/>L2,C`)XJ&67^:=V\F!?R_\R- M`H0U>KHEC`!X91%&?=2\.%,;1+^>3<)PR\;HP7:&B!Z!6L>U.O)J2W6&`%4D M[>D!_L4!AW]5B/K_]$<`5O)_<3'_7Z[`]]_8()+_]QP.C`&\%\3;?[HC`"OY M?^3[O_#_'U@A/GWOA0=)N?T@=EA6NF;:WXL8ULWY>\)9WRX````````````` ?`````````````````````````&"G\#_!GC6,`*`````` ` end >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060415040919.93BAE1145A>