diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index a214cb095e3..366881032ea 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.32 2011/04/06 12:12:59 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.33 2011/04/07 17:47:54 ajacoutot Exp $ COMMENT= user interface builder for the GTK2+ toolkit GNOME_VERSION = 3.8.0 GNOME_PROJECT = glade3 -REVISION = 0 +REVISION = 1 CATEGORIES = devel SHARED_LIBS += gladeui-1 1.0 # 10.0 @@ -51,4 +51,8 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ CONFIGURE_ENV= CPPFLAGS="-pthread -I${LOCALBASE}/include" \ LDFLAGS="-pthread -L${LOCALBASE}/lib" +# make it possible to install alongside devel/glade +MAKE_FLAGS= DOC_ID=glade3 \ + TARGET_DIR=${PREFIX}/share/gtk-doc/html/gladeui3 + .include diff --git a/devel/glade3/patches/patch-data_glade-3_desktop_in_in b/devel/glade3/patches/patch-data_glade-3_desktop_in_in new file mode 100644 index 00000000000..0d18a3646a0 --- /dev/null +++ b/devel/glade3/patches/patch-data_glade-3_desktop_in_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-data_glade-3_desktop_in_in,v 1.1 2011/04/07 17:47:54 ajacoutot Exp $ +--- data/glade-3.desktop.in.in.orig Thu Apr 7 19:39:00 2011 ++++ data/glade-3.desktop.in.in Thu Apr 7 19:40:00 2011 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-_Name=Glade ++Name=Glade3 + _GenericName=Interface Designer +-_X-GNOME-FullName=Glade Interface Designer +-_Comment=Create or open user interface designs for GTK+ applications ++X-GNOME-FullName=Glade3 Interface Designer ++Comment=Create or open user interface designs for GTK+2 applications + Exec=glade-3 %F + Terminal=false + StartupNotify=true diff --git a/devel/glade3/pkg/PLIST b/devel/glade3/pkg/PLIST index 07062baa457..9536f03eebe 100644 --- a/devel/glade3/pkg/PLIST +++ b/devel/glade3/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2011/04/06 12:12:59 ajacoutot Exp $ -@conflict glade-* +@comment $OpenBSD: PLIST,v 1.18 2011/04/07 17:47:54 ajacoutot Exp $ %%SHARED%% @bin bin/glade-3 include/libgladeui-1.0/ @@ -389,143 +388,143 @@ share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-window.png share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-windowgroup.png share/glade3/pixmaps/plus.png share/glade3/pixmaps/selector.png -share/gnome/help/glade/ -share/gnome/help/glade/C/ -share/gnome/help/glade/C/figures/ -share/gnome/help/glade/C/figures/main-window.png -share/gnome/help/glade/C/glade.xml -share/gnome/help/glade/C/legal.xml -share/gnome/help/glade/bg/ -share/gnome/help/glade/bg/figures/ -share/gnome/help/glade/bg/figures/main-window.png -share/gnome/help/glade/bg/glade.xml -share/gnome/help/glade/bg/legal.xml -share/gnome/help/glade/cs/ -share/gnome/help/glade/cs/figures/ -share/gnome/help/glade/cs/figures/main-window.png -share/gnome/help/glade/cs/glade.xml -share/gnome/help/glade/cs/legal.xml -share/gnome/help/glade/de/ -share/gnome/help/glade/de/figures/ -share/gnome/help/glade/de/figures/main-window.png -share/gnome/help/glade/de/glade.xml -share/gnome/help/glade/de/legal.xml -share/gnome/help/glade/el/ -share/gnome/help/glade/el/figures/ -share/gnome/help/glade/el/figures/main-window.png -share/gnome/help/glade/el/glade.xml -share/gnome/help/glade/el/legal.xml -share/gnome/help/glade/en_GB/ -share/gnome/help/glade/en_GB/figures/ -share/gnome/help/glade/en_GB/figures/main-window.png -share/gnome/help/glade/en_GB/glade.xml -share/gnome/help/glade/en_GB/legal.xml -share/gnome/help/glade/es/ -share/gnome/help/glade/es/figures/ -share/gnome/help/glade/es/figures/main-window.png -share/gnome/help/glade/es/glade.xml -share/gnome/help/glade/es/legal.xml -share/gnome/help/glade/eu/ -share/gnome/help/glade/eu/figures/ -share/gnome/help/glade/eu/figures/main-window.png -share/gnome/help/glade/eu/glade.xml -share/gnome/help/glade/eu/legal.xml -share/gnome/help/glade/fr/ -share/gnome/help/glade/fr/figures/ -share/gnome/help/glade/fr/figures/main-window.png -share/gnome/help/glade/fr/glade.xml -share/gnome/help/glade/fr/legal.xml -share/gnome/help/glade/hi/ -share/gnome/help/glade/hi/figures/ -share/gnome/help/glade/hi/figures/main-window.png -share/gnome/help/glade/hi/glade.xml -share/gnome/help/glade/hi/legal.xml -share/gnome/help/glade/it/ -share/gnome/help/glade/it/figures/ -share/gnome/help/glade/it/figures/main-window.png -share/gnome/help/glade/it/glade.xml -share/gnome/help/glade/it/legal.xml -share/gnome/help/glade/ja/ -share/gnome/help/glade/ja/figures/ -share/gnome/help/glade/ja/figures/main-window.png -share/gnome/help/glade/ja/glade.xml -share/gnome/help/glade/ja/legal.xml -share/gnome/help/glade/oc/ -share/gnome/help/glade/oc/figures/ -share/gnome/help/glade/oc/figures/main-window.png -share/gnome/help/glade/oc/glade.xml -share/gnome/help/glade/oc/legal.xml -share/gnome/help/glade/pt_BR/ -share/gnome/help/glade/pt_BR/figures/ -share/gnome/help/glade/pt_BR/figures/main-window.png -share/gnome/help/glade/pt_BR/glade.xml -share/gnome/help/glade/pt_BR/legal.xml -share/gnome/help/glade/ru/ -share/gnome/help/glade/ru/figures/ -share/gnome/help/glade/ru/figures/main-window.png -share/gnome/help/glade/ru/glade.xml -share/gnome/help/glade/ru/legal.xml -share/gnome/help/glade/sl/ -share/gnome/help/glade/sl/figures/ -share/gnome/help/glade/sl/figures/main-window.png -share/gnome/help/glade/sl/glade.xml -share/gnome/help/glade/sl/legal.xml -share/gnome/help/glade/sv/ -share/gnome/help/glade/sv/figures/ -share/gnome/help/glade/sv/figures/main-window.png -share/gnome/help/glade/sv/glade.xml -share/gnome/help/glade/sv/legal.xml -share/gnome/help/glade/uk/ -share/gnome/help/glade/uk/figures/ -share/gnome/help/glade/uk/figures/main-window.png -share/gnome/help/glade/uk/glade.xml -share/gnome/help/glade/uk/legal.xml -share/gnome/help/glade/zh_CN/ -share/gnome/help/glade/zh_CN/figures/ -share/gnome/help/glade/zh_CN/figures/main-window.png -share/gnome/help/glade/zh_CN/glade.xml -share/gnome/help/glade/zh_CN/legal.xml -share/gtk-doc/html/gladeui/ -share/gtk-doc/html/gladeui/GladeApp.html -share/gtk-doc/html/gladeui/GladeBaseEditor.html -share/gtk-doc/html/gladeui/GladeClipboard.html -share/gtk-doc/html/gladeui/GladeDesignView.html -share/gtk-doc/html/gladeui/GladeEditorProperty.html -share/gtk-doc/html/gladeui/GladeFixed.html -share/gtk-doc/html/gladeui/GladeInspector.html -share/gtk-doc/html/gladeui/GladePalette.html -share/gtk-doc/html/gladeui/GladePlaceholder.html -share/gtk-doc/html/gladeui/GladeProject.html -share/gtk-doc/html/gladeui/GladeProperty.html -share/gtk-doc/html/gladeui/GladeWidget.html -share/gtk-doc/html/gladeui/GladeWidgetAction.html -share/gtk-doc/html/gladeui/catalog.html -share/gtk-doc/html/gladeui/catalogintro.html -share/gtk-doc/html/gladeui/core.html -share/gtk-doc/html/gladeui/dockables.html -share/gtk-doc/html/gladeui/gladeui-Glade-Parameter.html -share/gtk-doc/html/gladeui/gladeui-Glade-Utils.html -share/gtk-doc/html/gladeui/gladeui-GladeClipboardView.html -share/gtk-doc/html/gladeui/gladeui-GladePropertyClass.html -share/gtk-doc/html/gladeui/gladeui-GladeSignalEditor.html -share/gtk-doc/html/gladeui/gladeui-Xml-Utils.html -share/gtk-doc/html/gladeui/gladeui-glade-command.html -share/gtk-doc/html/gladeui/gladeui-glade-editor.html -share/gtk-doc/html/gladeui/gladeui-glade-widget-adaptor.html -share/gtk-doc/html/gladeui/gladeui.devhelp -share/gtk-doc/html/gladeui/gladeui.devhelp2 -share/gtk-doc/html/gladeui/home.png -share/gtk-doc/html/gladeui/index.html -share/gtk-doc/html/gladeui/index.sgml -share/gtk-doc/html/gladeui/ix01.html -share/gtk-doc/html/gladeui/left.png -share/gtk-doc/html/gladeui/misc.html -share/gtk-doc/html/gladeui/properties.html -share/gtk-doc/html/gladeui/pythonsupport.html -share/gtk-doc/html/gladeui/right.png -share/gtk-doc/html/gladeui/style.css -share/gtk-doc/html/gladeui/up.png -share/gtk-doc/html/gladeui/widgetclasses.html +share/gnome/help/glade3/ +share/gnome/help/glade3/C/ +share/gnome/help/glade3/C/figures/ +share/gnome/help/glade3/C/figures/main-window.png +share/gnome/help/glade3/C/glade.xml +share/gnome/help/glade3/C/legal.xml +share/gnome/help/glade3/bg/ +share/gnome/help/glade3/bg/figures/ +share/gnome/help/glade3/bg/figures/main-window.png +share/gnome/help/glade3/bg/glade.xml +share/gnome/help/glade3/bg/legal.xml +share/gnome/help/glade3/cs/ +share/gnome/help/glade3/cs/figures/ +share/gnome/help/glade3/cs/figures/main-window.png +share/gnome/help/glade3/cs/glade.xml +share/gnome/help/glade3/cs/legal.xml +share/gnome/help/glade3/de/ +share/gnome/help/glade3/de/figures/ +share/gnome/help/glade3/de/figures/main-window.png +share/gnome/help/glade3/de/glade.xml +share/gnome/help/glade3/de/legal.xml +share/gnome/help/glade3/el/ +share/gnome/help/glade3/el/figures/ +share/gnome/help/glade3/el/figures/main-window.png +share/gnome/help/glade3/el/glade.xml +share/gnome/help/glade3/el/legal.xml +share/gnome/help/glade3/en_GB/ +share/gnome/help/glade3/en_GB/figures/ +share/gnome/help/glade3/en_GB/figures/main-window.png +share/gnome/help/glade3/en_GB/glade.xml +share/gnome/help/glade3/en_GB/legal.xml +share/gnome/help/glade3/es/ +share/gnome/help/glade3/es/figures/ +share/gnome/help/glade3/es/figures/main-window.png +share/gnome/help/glade3/es/glade.xml +share/gnome/help/glade3/es/legal.xml +share/gnome/help/glade3/eu/ +share/gnome/help/glade3/eu/figures/ +share/gnome/help/glade3/eu/figures/main-window.png +share/gnome/help/glade3/eu/glade.xml +share/gnome/help/glade3/eu/legal.xml +share/gnome/help/glade3/fr/ +share/gnome/help/glade3/fr/figures/ +share/gnome/help/glade3/fr/figures/main-window.png +share/gnome/help/glade3/fr/glade.xml +share/gnome/help/glade3/fr/legal.xml +share/gnome/help/glade3/hi/ +share/gnome/help/glade3/hi/figures/ +share/gnome/help/glade3/hi/figures/main-window.png +share/gnome/help/glade3/hi/glade.xml +share/gnome/help/glade3/hi/legal.xml +share/gnome/help/glade3/it/ +share/gnome/help/glade3/it/figures/ +share/gnome/help/glade3/it/figures/main-window.png +share/gnome/help/glade3/it/glade.xml +share/gnome/help/glade3/it/legal.xml +share/gnome/help/glade3/ja/ +share/gnome/help/glade3/ja/figures/ +share/gnome/help/glade3/ja/figures/main-window.png +share/gnome/help/glade3/ja/glade.xml +share/gnome/help/glade3/ja/legal.xml +share/gnome/help/glade3/oc/ +share/gnome/help/glade3/oc/figures/ +share/gnome/help/glade3/oc/figures/main-window.png +share/gnome/help/glade3/oc/glade.xml +share/gnome/help/glade3/oc/legal.xml +share/gnome/help/glade3/pt_BR/ +share/gnome/help/glade3/pt_BR/figures/ +share/gnome/help/glade3/pt_BR/figures/main-window.png +share/gnome/help/glade3/pt_BR/glade.xml +share/gnome/help/glade3/pt_BR/legal.xml +share/gnome/help/glade3/ru/ +share/gnome/help/glade3/ru/figures/ +share/gnome/help/glade3/ru/figures/main-window.png +share/gnome/help/glade3/ru/glade.xml +share/gnome/help/glade3/ru/legal.xml +share/gnome/help/glade3/sl/ +share/gnome/help/glade3/sl/figures/ +share/gnome/help/glade3/sl/figures/main-window.png +share/gnome/help/glade3/sl/glade.xml +share/gnome/help/glade3/sl/legal.xml +share/gnome/help/glade3/sv/ +share/gnome/help/glade3/sv/figures/ +share/gnome/help/glade3/sv/figures/main-window.png +share/gnome/help/glade3/sv/glade.xml +share/gnome/help/glade3/sv/legal.xml +share/gnome/help/glade3/uk/ +share/gnome/help/glade3/uk/figures/ +share/gnome/help/glade3/uk/figures/main-window.png +share/gnome/help/glade3/uk/glade.xml +share/gnome/help/glade3/uk/legal.xml +share/gnome/help/glade3/zh_CN/ +share/gnome/help/glade3/zh_CN/figures/ +share/gnome/help/glade3/zh_CN/figures/main-window.png +share/gnome/help/glade3/zh_CN/glade.xml +share/gnome/help/glade3/zh_CN/legal.xml +share/gtk-doc/html/gladeui3/ +share/gtk-doc/html/gladeui3/GladeApp.html +share/gtk-doc/html/gladeui3/GladeBaseEditor.html +share/gtk-doc/html/gladeui3/GladeClipboard.html +share/gtk-doc/html/gladeui3/GladeDesignView.html +share/gtk-doc/html/gladeui3/GladeEditorProperty.html +share/gtk-doc/html/gladeui3/GladeFixed.html +share/gtk-doc/html/gladeui3/GladeInspector.html +share/gtk-doc/html/gladeui3/GladePalette.html +share/gtk-doc/html/gladeui3/GladePlaceholder.html +share/gtk-doc/html/gladeui3/GladeProject.html +share/gtk-doc/html/gladeui3/GladeProperty.html +share/gtk-doc/html/gladeui3/GladeWidget.html +share/gtk-doc/html/gladeui3/GladeWidgetAction.html +share/gtk-doc/html/gladeui3/catalog.html +share/gtk-doc/html/gladeui3/catalogintro.html +share/gtk-doc/html/gladeui3/core.html +share/gtk-doc/html/gladeui3/dockables.html +share/gtk-doc/html/gladeui3/gladeui-Glade-Parameter.html +share/gtk-doc/html/gladeui3/gladeui-Glade-Utils.html +share/gtk-doc/html/gladeui3/gladeui-GladeClipboardView.html +share/gtk-doc/html/gladeui3/gladeui-GladePropertyClass.html +share/gtk-doc/html/gladeui3/gladeui-GladeSignalEditor.html +share/gtk-doc/html/gladeui3/gladeui-Xml-Utils.html +share/gtk-doc/html/gladeui3/gladeui-glade-command.html +share/gtk-doc/html/gladeui3/gladeui-glade-editor.html +share/gtk-doc/html/gladeui3/gladeui-glade-widget-adaptor.html +share/gtk-doc/html/gladeui3/gladeui.devhelp +share/gtk-doc/html/gladeui3/gladeui.devhelp2 +share/gtk-doc/html/gladeui3/home.png +share/gtk-doc/html/gladeui3/index.html +share/gtk-doc/html/gladeui3/index.sgml +share/gtk-doc/html/gladeui3/ix01.html +share/gtk-doc/html/gladeui3/left.png +share/gtk-doc/html/gladeui3/misc.html +share/gtk-doc/html/gladeui3/properties.html +share/gtk-doc/html/gladeui3/pythonsupport.html +share/gtk-doc/html/gladeui3/right.png +share/gtk-doc/html/gladeui3/style.css +share/gtk-doc/html/gladeui3/up.png +share/gtk-doc/html/gladeui3/widgetclasses.html share/icons/hicolor/16x16/ share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/glade-3.png @@ -610,26 +609,26 @@ share/locale/vi/LC_MESSAGES/glade3.mo share/locale/zh_CN/LC_MESSAGES/glade3.mo share/locale/zh_HK/LC_MESSAGES/glade3.mo share/locale/zh_TW/LC_MESSAGES/glade3.mo -share/omf/glade/ -share/omf/glade/glade-C.omf -share/omf/glade/glade-bg.omf -share/omf/glade/glade-cs.omf -share/omf/glade/glade-de.omf -share/omf/glade/glade-el.omf -share/omf/glade/glade-en_GB.omf -share/omf/glade/glade-es.omf -share/omf/glade/glade-eu.omf -share/omf/glade/glade-fr.omf -share/omf/glade/glade-hi.omf -share/omf/glade/glade-it.omf -share/omf/glade/glade-ja.omf -share/omf/glade/glade-oc.omf -share/omf/glade/glade-pt_BR.omf -share/omf/glade/glade-ru.omf -share/omf/glade/glade-sl.omf -share/omf/glade/glade-sv.omf -share/omf/glade/glade-uk.omf -share/omf/glade/glade-zh_CN.omf +share/omf/glade3/ +share/omf/glade3/glade-C.omf +share/omf/glade3/glade-bg.omf +share/omf/glade3/glade-cs.omf +share/omf/glade3/glade-de.omf +share/omf/glade3/glade-el.omf +share/omf/glade3/glade-en_GB.omf +share/omf/glade3/glade-es.omf +share/omf/glade3/glade-eu.omf +share/omf/glade3/glade-fr.omf +share/omf/glade3/glade-hi.omf +share/omf/glade3/glade-it.omf +share/omf/glade3/glade-ja.omf +share/omf/glade3/glade-oc.omf +share/omf/glade3/glade-pt_BR.omf +share/omf/glade3/glade-ru.omf +share/omf/glade3/glade-sl.omf +share/omf/glade3/glade-sv.omf +share/omf/glade3/glade-uk.omf +share/omf/glade3/glade-zh_CN.omf @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true @unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true @exec %D/bin/update-desktop-database