tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

inputmethod/uim dependency reduction



This makes inputmethod/uim depend on sysutils/desktop-file-utils only
when one of gtk/gnome options is enabled.  Idea from obache@.

Index: inputmethod/uim/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/uim/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- inputmethod/uim/Makefile    18 Feb 2012 11:46:14 -0000      1.58
+++ inputmethod/uim/Makefile    20 Mar 2012 12:49:57 -0000
@@ -50,10 +50,12 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim
        ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim
        ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim
+.if !defined(PLIST.desktop)
+       ${RM} ${DESTDIR}${PREFIX}/share/applications/uim.desktop
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgcroots+=     libgcroots>=0.2.3
 .include "../../devel/libgcroots/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
Index: inputmethod/uim/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/uim/PLIST,v
retrieving revision 1.19
diff -u -r1.19 PLIST
--- inputmethod/uim/PLIST       18 Feb 2012 11:46:14 -0000      1.19
+++ inputmethod/uim/PLIST       20 Mar 2012 12:49:57 -0000
@@ -74,7 +74,7 @@
 ${PLIST.gnome3}libexec/uim-toolbar-applet-gnome3
 ${PLIST.xim}man/man1/uim-xim.1
 ${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la
-share/applications/uim.desktop
+${PLIST.desktop}share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
 share/doc/uim/DOT-UIM
Index: inputmethod/uim/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/uim/options.mk,v
retrieving revision 1.25
diff -u -r1.25 options.mk
--- inputmethod/uim/options.mk  18 Feb 2012 11:46:14 -0000      1.25
+++ inputmethod/uim/options.mk  20 Mar 2012 12:49:57 -0000
@@ -21,7 +21,7 @@
 .endif
 
 PLIST_VARS+=           helperdata uim-dict-gtk uim-dict-gtk3 
uim-dict-helperdata fep
-PLIST_VARS+=           anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 
m17nlib openssl qt qt3 sqlite wnn xim
+PLIST_VARS+=           anthy curl desktop eb expat ffi gnome gnome3 gtk gtk3 
kde kde3 m17nlib openssl qt qt3 sqlite wnn xim
 
 .if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libX11/buildlink3.mk"
@@ -221,3 +221,9 @@
 .elif !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)
 CONFIGURE_ARGS+=       --enable-default-toolkit=qt
 .endif
+
+.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome) || \
+    !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+PLIST.desktop=         yes
+.endif


Home | Main Index | Thread Index | Old Index