diff options
| -rw-r--r-- | Mk/bsd.gnome.mk | 31 | ||||
| -rw-r--r-- | editors/gedit2/Makefile | 1 | ||||
| -rw-r--r-- | editors/gedit2/pkg-plist | 26 |
3 files changed, 24 insertions, 34 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index c290c41219ea..8792602a8215 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -34,6 +34,10 @@ Gnome_Pre_Include= bsd.gnome.mk # add the following to your Makefile: # "GCONF_SCHEMAS=foo.schemas bar.schemas". # +# INSTALLS_OMF - If set, bsd.gnome.mk will automatically scan pkg-plist +# file and add apropriate @exec/@unexec directives for +# each .omf file found to track OMF registration database. +# # non-version specific components _USE_GNOME_ALL= gnomehack lthack gnomeprefix gnomehier esound gnomemimedata \ @@ -641,17 +645,28 @@ gnome-pre-install: . endif .endif -.if defined(GCONF_SCHEMAS) +.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) post-install: gnome-post-install gnome-post-install: -. for i in ${GCONF_SCHEMAS} - @${ECHO_CMD} "@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/$i > /dev/null || /usr/bin/true" \ - >> ${TMPPLIST} - @${ECHO_CMD} "etc/gconf/schemas/$i" >> ${TMPPLIST} - @${ECHO_CMD} "@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$i > /dev/null || /usr/bin/true" \ - >> ${TMPPLIST} -. endfor +. if defined(GCONF_SCHEMAS) + @for i in ${GCONF_SCHEMAS}; do \ + ${ECHO_CMD} "@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; \ + ${ECHO_CMD} "etc/gconf/schemas/$${i}" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; \ + done +. endif + +. if defined(INSTALLS_OMF) + @for i in `${GREP} "\.omf$$" ${TMPPLIST}`; do \ + ${ECHO_CMD} "@exec scrollkeeper-install -q %D/$${i} 2>/dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; \ + ${ECHO_CMD} "@unexec scrollkeeper-uninstall -q %D/$${i} 2>/dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; \ + done +. endif .endif .endif diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index c83962a35d43..80bc87f23c58 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -21,6 +21,7 @@ LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell USE_BZIP2= yes USE_X_PREFIX= yes +INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist index 4d33342cb12e..ca0397040eed 100644 --- a/editors/gedit2/pkg-plist +++ b/editors/gedit2/pkg-plist @@ -127,31 +127,18 @@ share/gnome/help/gedit/zh_TW/legal.xml share/gnome/idl/GNOME_Gedit.idl share/gnome/mime-info/gedit.keys share/gnome/omf/gedit/gedit-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-eu.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-eu.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-ro.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-zh_HK.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gedit-icon.png share/gnome/pixmaps/gedit-logo.png share/gnome/pixmaps/gedit-plugin-manager.png @@ -262,17 +249,4 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%POVERSION%%.mo @dirrm include/gedit-%%VERSION%%/gedit/recent-files @dirrm include/gedit-%%VERSION%%/gedit @dirrm include/gedit-%%VERSION%% -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-eu.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_HK.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true @unexec update-desktop-database > /dev/null || /usr/bin/true |