diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile index 071dcc131b9..e9c7d20661b 100644 --- a/x11/gtk+2/Makefile +++ b/x11/gtk+2/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.16 2004/08/08 17:14:23 marcm Exp $ +# $OpenBSD: Makefile,v 1.17 2004/09/16 04:14:55 marcm Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} COMMENT= "multi-platform graphical toolkit" COMMENT-docs= "gtk+-2 documentation" -VERSION= 2.4.4 +VERSION= 2.4.9 DISTNAME= gtk+-${VERSION} PKGNAME= gtk+2-${VERSION} PKGNAME-docs= gtk+2-docs-${VERSION} diff --git a/x11/gtk+2/distinfo b/x11/gtk+2/distinfo index 439b60c38de..29205575f9d 100644 --- a/x11/gtk+2/distinfo +++ b/x11/gtk+2/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk+-2.4.4.tar.bz2) = 6e6ffc9003aee319ed99336b147ad19f -RMD160 (gtk+-2.4.4.tar.bz2) = d5d3ae0535a1982d6b5d68b31baeea856fad150a -SHA1 (gtk+-2.4.4.tar.bz2) = 524611c06bdc89a0b4a84bb839a265fea7ea3561 +MD5 (gtk+-2.4.9.tar.bz2) = bfe3b960d334e81d8f91c3509f70868d +RMD160 (gtk+-2.4.9.tar.bz2) = 1ab714139a01baed8369e27b64a4a5a699083bc8 +SHA1 (gtk+-2.4.9.tar.bz2) = 8c3243b56b96cb2bc1261cd702fcd8f18f56abd7 diff --git a/x11/gtk+2/patches/patch-configure b/x11/gtk+2/patches/patch-configure index 7c65ad5b7a0..6b08e1e89ee 100644 --- a/x11/gtk+2/patches/patch-configure +++ b/x11/gtk+2/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.6 2004/08/08 17:14:23 marcm Exp $ ---- configure.orig Fri Jul 9 21:04:43 2004 -+++ configure Sat Aug 7 15:42:38 2004 -@@ -8062,7 +8062,7 @@ nto-qnx*) +$OpenBSD: patch-configure,v 1.7 2004/09/16 04:14:55 marcm Exp $ +--- configure.orig Wed Aug 25 11:27:19 2004 ++++ configure Sun Sep 5 20:33:58 2004 +@@ -8065,7 +8065,7 @@ nto-qnx*) openbsd*) version_type=sunos need_lib_prefix=no @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.6 2004/08/08 17:14:23 marcm Exp $ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH -@@ -26535,12 +26535,6 @@ echo "$as_me: error: Xft Pango backend f +@@ -26745,12 +26745,6 @@ echo "$as_me: error: Xft Pango backend f else { { echo "$as_me:$LINENO: error: Pango 1.2.0 and Xft backend is required for x11 target" >&5 echo "$as_me: error: Pango 1.2.0 and Xft backend is required for x11 target" >&2;} diff --git a/x11/gtk+2/patches/patch-ltmain_sh b/x11/gtk+2/patches/patch-ltmain_sh index cfeca58b5b6..cb789316693 100644 --- a/x11/gtk+2/patches/patch-ltmain_sh +++ b/x11/gtk+2/patches/patch-ltmain_sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.5 2004/08/08 17:14:24 marcm Exp $ ---- ltmain.sh.orig Sun Apr 11 19:01:57 2004 -+++ ltmain.sh Sat Aug 7 15:44:12 2004 -@@ -1857,9 +1857,12 @@ EOF +$OpenBSD: patch-ltmain_sh,v 1.6 2004/09/16 04:14:55 marcm Exp $ +--- ltmain.sh.orig Thu Apr 8 06:34:47 2004 ++++ ltmain.sh Sun Sep 5 20:34:43 2004 +@@ -1847,9 +1847,12 @@ EOF if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -16,7 +16,7 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2004/08/08 17:14:24 marcm Exp $ continue ;; -l*) -@@ -2024,6 +2027,7 @@ EOF +@@ -2014,6 +2017,7 @@ EOF fi continue ;; @@ -24,7 +24,7 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2004/08/08 17:14:24 marcm Exp $ %DEPLIBS%) alldeplibs=yes continue -@@ -2274,10 +2278,6 @@ EOF +@@ -2262,10 +2266,6 @@ EOF link_static=no # Whether the deplib will be linked statically if test -n "$library_names" && { test "$prefer_static_libs" = no || test -z "$old_library"; }; then @@ -33,11 +33,11 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2004/08/08 17:14:24 marcm Exp $ - need_relink=yes - fi # This is a shared library - - # Warn about portability, can't link against -module's on -@@ -5827,40 +5827,6 @@ relink_command=\"$relink_command\"" + + # Warn about portability, can't link against -module's on some systems (darwin) +@@ -5804,40 +5804,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS + test "$show" = : && exit 0 - $echo "----------------------------------------------------------------------" - $echo "Libraries have been installed in:" @@ -73,6 +73,6 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2004/08/08 17:14:24 marcm Exp $ - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "----------------------------------------------------------------------" - exit $EXIT_SUCCESS + exit 0 ;; diff --git a/x11/gtk+2/pkg/PFRAG.shared b/x11/gtk+2/pkg/PFRAG.shared index 6e67a9acdb7..9e2983656a0 100644 --- a/x11/gtk+2/pkg/PFRAG.shared +++ b/x11/gtk+2/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.7 2004/08/08 17:14:24 marcm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.8 2004/09/16 04:14:55 marcm Exp $ lib/gtk-2.0/2.4.0/immodules/im-am-et.so lib/gtk-2.0/2.4.0/immodules/im-cedilla.so lib/gtk-2.0/2.4.0/immodules/im-cyrillic-translit.so @@ -23,7 +23,7 @@ lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tiff.so lib/gtk-2.0/2.4.0/loaders/libpixbufloader-wbmp.so lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.so lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so -@lib lib/libgdk-x11-2.0.so.400.4 -@lib lib/libgdk_pixbuf-2.0.so.400.4 -@lib lib/libgdk_pixbuf_xlib-2.0.so.400.4 -@lib lib/libgtk-x11-2.0.so.400.4 +@lib lib/libgdk-x11-2.0.so.400.9 +@lib lib/libgdk_pixbuf-2.0.so.400.9 +@lib lib/libgdk_pixbuf_xlib-2.0.so.400.9 +@lib lib/libgtk-x11-2.0.so.400.9 diff --git a/x11/gtk+2/pkg/PLIST b/x11/gtk+2/pkg/PLIST index f3017d025ef..639d1593a30 100644 --- a/x11/gtk+2/pkg/PLIST +++ b/x11/gtk+2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.16 2004/09/15 19:26:29 espie Exp $ +@comment $OpenBSD: PLIST,v 1.17 2004/09/16 04:14:55 marcm Exp $ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo @@ -297,9 +297,6 @@ share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c -share/gtk-doc/ -share/gtk-doc/html/ -share/gtk-doc/html/gdk-pixbuf/composite.png share/locale/ share/locale/af/ share/locale/af/LC_MESSAGES/ @@ -333,6 +330,10 @@ share/locale/br/ share/locale/br/LC_MESSAGES/ share/locale/br/LC_MESSAGES/gtk20-properties.mo share/locale/br/LC_MESSAGES/gtk20.mo +share/locale/bs/ +share/locale/bs/LC_MESSAGES/ +share/locale/bs/LC_MESSAGES/gtk20-properties.mo +share/locale/bs/LC_MESSAGES/gtk20.mo share/locale/ca/ share/locale/ca/LC_MESSAGES/ share/locale/ca/LC_MESSAGES/gtk20-properties.mo @@ -477,6 +478,10 @@ share/locale/ms/ share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/gtk20-properties.mo share/locale/ms/LC_MESSAGES/gtk20.mo +share/locale/nb/ +share/locale/nb/LC_MESSAGES/ +share/locale/nb/LC_MESSAGES/gtk20-properties.mo +share/locale/nb/LC_MESSAGES/gtk20.mo share/locale/ne/ share/locale/ne/LC_MESSAGES/ share/locale/ne/LC_MESSAGES/gtk20-properties.mo diff --git a/x11/gtk+2/pkg/PLIST-docs b/x11/gtk+2/pkg/PLIST-docs index b7c2d09bbfa..b1341e0a2d4 100644 --- a/x11/gtk+2/pkg/PLIST-docs +++ b/x11/gtk+2/pkg/PLIST-docs @@ -1,10 +1,13 @@ -@comment $OpenBSD: PLIST-docs,v 1.8 2004/08/08 17:14:24 marcm Exp $ +@comment $OpenBSD: PLIST-docs,v 1.9 2004/09/16 04:14:55 marcm Exp $ +share/gtk-doc/ +share/gtk-doc/html/ share/gtk-doc/html/gdk/ share/gtk-doc/html/gdk-pixbuf/ share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html share/gtk-doc/html/gdk-pixbuf/apa.html share/gtk-doc/html/gdk-pixbuf/apas02.html share/gtk-doc/html/gdk-pixbuf/apas03.html +share/gtk-doc/html/gdk-pixbuf/composite.png share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html @@ -34,6 +37,7 @@ share/gtk-doc/html/gdk-pixbuf/license.html share/gtk-doc/html/gdk-pixbuf/right.png share/gtk-doc/html/gdk-pixbuf/rn01.html share/gtk-doc/html/gdk-pixbuf/rn02.html +share/gtk-doc/html/gdk-pixbuf/style.css share/gtk-doc/html/gdk-pixbuf/up.png share/gtk-doc/html/gdk/GdkDisplay.html share/gtk-doc/html/gdk/GdkDisplayManager.html @@ -135,6 +139,7 @@ share/gtk-doc/html/gdk/sizing.png share/gtk-doc/html/gdk/spider.png share/gtk-doc/html/gdk/spraycan.png share/gtk-doc/html/gdk/star.png +share/gtk-doc/html/gdk/style.css share/gtk-doc/html/gdk/target.png share/gtk-doc/html/gdk/tcross.png share/gtk-doc/html/gdk/top_left_arrow.png @@ -315,6 +320,7 @@ share/gtk-doc/html/gtk/WindowWidgets.html share/gtk-doc/html/gtk/ch01.html share/gtk-doc/html/gtk/checklist-gdkeventexpose-region.html share/gtk-doc/html/gtk/checklist-modifiers.html +share/gtk-doc/html/gtk/glossary.html share/gtk-doc/html/gtk/gtk-Accelerator-Maps.html share/gtk-doc/html/gtk/gtk-Bindings.html share/gtk-doc/html/gtk/gtk-Clipboards.html @@ -443,5 +449,6 @@ share/gtk-doc/html/gtk/stock_zoom_1_24.png share/gtk-doc/html/gtk/stock_zoom_fit_24.png share/gtk-doc/html/gtk/stock_zoom_in_24.png share/gtk-doc/html/gtk/stock_zoom_out_24.png +share/gtk-doc/html/gtk/style.css share/gtk-doc/html/gtk/ui-manager.html share/gtk-doc/html/gtk/up.png