From 9a64a6ee53490b4623914a1e92ce28a6064979c4 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 23 Jan 2004 01:29:00 +0000 Subject: Update to 2.3.2. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1703 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/gtk20/Makefile | 10 ++- x11-toolkits/gtk20/distinfo | 2 +- x11-toolkits/gtk20/files/patch-Makefile.in | 17 ++--- x11-toolkits/gtk20/files/patch-ae | 10 --- x11-toolkits/gtk20/files/patch-ltmain.sh | 51 +++++++++++++ x11-toolkits/gtk20/pkg-descr | 4 +- x11-toolkits/gtk20/pkg-plist | 112 +++++++++++++++++++++++++++-- 7 files changed, 175 insertions(+), 31 deletions(-) delete mode 100644 x11-toolkits/gtk20/files/patch-ae create mode 100644 x11-toolkits/gtk20/files/patch-ltmain.sh diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index dabbf30dd..2f2109d6d 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.3,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ @@ -25,6 +25,8 @@ COMMENT= Gimp Toolkit for X11 GUI (current stable version) LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg +RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ + ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_BZIP2= yes LATEST_LINK= gtk20 @@ -33,7 +35,7 @@ USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes USE_GNOME= gnomehack atk pango CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ @@ -46,8 +48,10 @@ post-patch: ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/gtk/xdgmime/xdgmime.c pre-build: - ${RM} -rf ${WRKSRC}/docs/gtk.info* + @${RM} -rf ${WRKSRC}/docs/gtk.info* .include diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index cbc37a836..3304c8e94 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk+-2.3.1.tar.bz2) = d19a07d0fdb04a68f7a0506900cf9691 +MD5 (gnome2/gtk+-2.3.2.tar.bz2) = b82e22ec7c4d9a0670fd56b1c29dcc35 diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in index 27096d3af..c47baaab5 100644 --- a/x11-toolkits/gtk20/files/patch-Makefile.in +++ b/x11-toolkits/gtk20/files/patch-Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD: ports/x11-toolkits/gtk20/files/patch-Makefile.in,v 1.2 2003/02/07 18:42:22 marcus Exp $ - ---- Makefile.in 2002/02/12 13:29:11 1.1 -+++ Makefile.in 2002/02/12 13:29:28 -@@ -168,7 +168,7 @@ - ms_librarian = @ms_librarian@ - xinput_progs = @xinput_progs@ +--- Makefile.in.orig Thu Jan 22 19:40:10 2004 ++++ Makefile.in Thu Jan 22 19:40:52 2004 +@@ -286,7 +286,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib - SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros # require automake 1.4 diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae deleted file mode 100644 index f195f07b4..000000000 --- a/x11-toolkits/gtk20/files/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed Dec 11 18:31:51 2002 -+++ configure Thu Dec 12 12:07:17 2002 -@@ -7414,6 +7414,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-toolkits/gtk20/files/patch-ltmain.sh b/x11-toolkits/gtk20/files/patch-ltmain.sh new file mode 100644 index 000000000..58384ee38 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Dec 6 14:47:45 2003 ++++ ltmain.sh Tue Dec 9 14:09:01 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-toolkits/gtk20/pkg-descr b/x11-toolkits/gtk20/pkg-descr index 83ab3d952..7de6c9199 100644 --- a/x11-toolkits/gtk20/pkg-descr +++ b/x11-toolkits/gtk20/pkg-descr @@ -13,9 +13,9 @@ will be a label. However, the child widget can also be a pixmap, image or any combination possible the programmer desires. This flexibility is adhered to throughout the library. -GTK+-2.0 is a stable release, but many applications still require +GTK+-2.x is a stable release, but many applications still require GTK+-1.2, the previous stable version. You can have the runtime and -development environments for both GTK+-2.0 and GTK+-1.2 installed +development environments for both GTK+-2.x and GTK+-1.2 installed simultaneously on your computer. WWW: http://www.gtk.org/ diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 3d39acf69..c036966e8 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,6 +1,7 @@ bin/gdk-pixbuf-csource -bin/gtk-query-immodules-2.0 bin/gdk-pixbuf-query-loaders +bin/gtk-demo +bin/gtk-query-immodules-2.0 etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h @@ -38,6 +39,7 @@ include/gtk-2.0/gdk/gdkregion.h include/gtk-2.0/gdk/gdkrgb.h include/gtk-2.0/gdk/gdkscreen.h include/gtk-2.0/gdk/gdkselection.h +include/gtk-2.0/gdk/gdkspawn.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h @@ -239,16 +241,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.301 +lib/libgdk-x11-2.0.so.302 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.301 +lib/libgdk_pixbuf-2.0.so.302 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.301 +lib/libgdk_pixbuf_xlib-2.0.so.302 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.301 +lib/libgtk-x11-2.0.so.302 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -256,67 +258,166 @@ libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/gtk-2.0/demo/alphatest.png +share/gtk-2.0/demo/apple-red.png +share/gtk-2.0/demo/appwindow.c +share/gtk-2.0/demo/background.jpg +share/gtk-2.0/demo/button_box.c +share/gtk-2.0/demo/changedisplay.c +share/gtk-2.0/demo/colorsel.c +share/gtk-2.0/demo/dialog.c +share/gtk-2.0/demo/drawingarea.c +share/gtk-2.0/demo/editable_cells.c +share/gtk-2.0/demo/entry_completion.c +share/gtk-2.0/demo/floppybuddy.gif +share/gtk-2.0/demo/gnome-applets.png +share/gtk-2.0/demo/gnome-calendar.png +share/gtk-2.0/demo/gnome-foot.png +share/gtk-2.0/demo/gnome-gimp.png +share/gtk-2.0/demo/gnome-gmush.png +share/gtk-2.0/demo/gnome-gsame.png +share/gtk-2.0/demo/gnu-keys.png +share/gtk-2.0/demo/gtk-logo-rgb.gif +share/gtk-2.0/demo/hypertext.c +share/gtk-2.0/demo/images.c +share/gtk-2.0/demo/list_store.c +share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/panes.c +share/gtk-2.0/demo/pixbufs.c +share/gtk-2.0/demo/sizegroup.c +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/locale/af/LC_MESSAGES/gtk20-properties.mo +share/locale/af/LC_MESSAGES/gtk20.mo +share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo +share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo +share/locale/be/LC_MESSAGES/gtk20-properties.mo share/locale/be/LC_MESSAGES/gtk20.mo +share/locale/bg/LC_MESSAGES/gtk20-properties.mo share/locale/bg/LC_MESSAGES/gtk20.mo +share/locale/bn/LC_MESSAGES/gtk20-properties.mo +share/locale/bn/LC_MESSAGES/gtk20.mo +share/locale/br/LC_MESSAGES/gtk20-properties.mo +share/locale/br/LC_MESSAGES/gtk20.mo +share/locale/ca/LC_MESSAGES/gtk20-properties.mo share/locale/ca/LC_MESSAGES/gtk20.mo +share/locale/cs/LC_MESSAGES/gtk20-properties.mo share/locale/cs/LC_MESSAGES/gtk20.mo +share/locale/cy/LC_MESSAGES/gtk20-properties.mo share/locale/cy/LC_MESSAGES/gtk20.mo +share/locale/da/LC_MESSAGES/gtk20-properties.mo share/locale/da/LC_MESSAGES/gtk20.mo +share/locale/de/LC_MESSAGES/gtk20-properties.mo share/locale/de/LC_MESSAGES/gtk20.mo +share/locale/el/LC_MESSAGES/gtk20-properties.mo share/locale/el/LC_MESSAGES/gtk20.mo +share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo share/locale/en_GB/LC_MESSAGES/gtk20.mo +share/locale/es/LC_MESSAGES/gtk20-properties.mo share/locale/es/LC_MESSAGES/gtk20.mo +share/locale/et/LC_MESSAGES/gtk20-properties.mo share/locale/et/LC_MESSAGES/gtk20.mo +share/locale/eu/LC_MESSAGES/gtk20-properties.mo share/locale/eu/LC_MESSAGES/gtk20.mo +share/locale/fa/LC_MESSAGES/gtk20-properties.mo share/locale/fa/LC_MESSAGES/gtk20.mo +share/locale/fi/LC_MESSAGES/gtk20-properties.mo share/locale/fi/LC_MESSAGES/gtk20.mo +share/locale/fr/LC_MESSAGES/gtk20-properties.mo share/locale/fr/LC_MESSAGES/gtk20.mo +share/locale/ga/LC_MESSAGES/gtk20-properties.mo share/locale/ga/LC_MESSAGES/gtk20.mo +share/locale/gl/LC_MESSAGES/gtk20-properties.mo share/locale/gl/LC_MESSAGES/gtk20.mo +share/locale/he/LC_MESSAGES/gtk20-properties.mo share/locale/he/LC_MESSAGES/gtk20.mo +share/locale/hi/LC_MESSAGES/gtk20-properties.mo share/locale/hi/LC_MESSAGES/gtk20.mo +share/locale/hr/LC_MESSAGES/gtk20-properties.mo share/locale/hr/LC_MESSAGES/gtk20.mo +share/locale/hu/LC_MESSAGES/gtk20-properties.mo share/locale/hu/LC_MESSAGES/gtk20.mo +share/locale/ia/LC_MESSAGES/gtk20-properties.mo share/locale/ia/LC_MESSAGES/gtk20.mo +share/locale/id/LC_MESSAGES/gtk20-properties.mo share/locale/id/LC_MESSAGES/gtk20.mo +share/locale/it/LC_MESSAGES/gtk20-properties.mo share/locale/it/LC_MESSAGES/gtk20.mo +share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo +share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo +share/locale/li/LC_MESSAGES/gtk20-properties.mo share/locale/li/LC_MESSAGES/gtk20.mo +share/locale/lt/LC_MESSAGES/gtk20-properties.mo share/locale/lt/LC_MESSAGES/gtk20.mo +share/locale/lv/LC_MESSAGES/gtk20-properties.mo share/locale/lv/LC_MESSAGES/gtk20.mo +share/locale/mk/LC_MESSAGES/gtk20-properties.mo share/locale/mk/LC_MESSAGES/gtk20.mo +share/locale/ml/LC_MESSAGES/gtk20-properties.mo share/locale/ml/LC_MESSAGES/gtk20.mo +share/locale/mn/LC_MESSAGES/gtk20-properties.mo share/locale/mn/LC_MESSAGES/gtk20.mo +share/locale/ms/LC_MESSAGES/gtk20-properties.mo share/locale/ms/LC_MESSAGES/gtk20.mo +share/locale/ne/LC_MESSAGES/gtk20-properties.mo share/locale/ne/LC_MESSAGES/gtk20.mo +share/locale/nl/LC_MESSAGES/gtk20-properties.mo share/locale/nl/LC_MESSAGES/gtk20.mo +share/locale/nn/LC_MESSAGES/gtk20-properties.mo share/locale/nn/LC_MESSAGES/gtk20.mo +share/locale/no/LC_MESSAGES/gtk20-properties.mo share/locale/no/LC_MESSAGES/gtk20.mo +share/locale/pl/LC_MESSAGES/gtk20-properties.mo share/locale/pl/LC_MESSAGES/gtk20.mo +share/locale/pt/LC_MESSAGES/gtk20-properties.mo share/locale/pt/LC_MESSAGES/gtk20.mo +share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo share/locale/pt_BR/LC_MESSAGES/gtk20.mo +share/locale/ro/LC_MESSAGES/gtk20-properties.mo share/locale/ro/LC_MESSAGES/gtk20.mo +share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo +share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo +share/locale/sl/LC_MESSAGES/gtk20-properties.mo share/locale/sl/LC_MESSAGES/gtk20.mo +share/locale/sq/LC_MESSAGES/gtk20-properties.mo +share/locale/sr/LC_MESSAGES/gtk20-properties.mo share/locale/sr/LC_MESSAGES/gtk20.mo +share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo share/locale/sr@Latn/LC_MESSAGES/gtk20.mo share/locale/sq/LC_MESSAGES/gtk20.mo +share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo +share/locale/ta/LC_MESSAGES/gtk20-properties.mo share/locale/ta/LC_MESSAGES/gtk20.mo +share/locale/th/LC_MESSAGES/gtk20-properties.mo share/locale/th/LC_MESSAGES/gtk20.mo +share/locale/tr/LC_MESSAGES/gtk20-properties.mo share/locale/tr/LC_MESSAGES/gtk20.mo +share/locale/uk/LC_MESSAGES/gtk20-properties.mo share/locale/uk/LC_MESSAGES/gtk20.mo +share/locale/uz/LC_MESSAGES/gtk20-properties.mo share/locale/uz/LC_MESSAGES/gtk20.mo +share/locale/uz@Cyrl/LC_MESSAGES/gtk20-properties.mo share/locale/uz@Cyrl/LC_MESSAGES/gtk20.mo +share/locale/vi/LC_MESSAGES/gtk20-properties.mo share/locale/vi/LC_MESSAGES/gtk20.mo +share/locale/wa/LC_MESSAGES/gtk20-properties.mo share/locale/wa/LC_MESSAGES/gtk20.mo +share/locale/yi/LC_MESSAGES/gtk20-properties.mo share/locale/yi/LC_MESSAGES/gtk20.mo +share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo share/locale/zh_CN/LC_MESSAGES/gtk20.mo +share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc share/themes/Default/gtk-2.0/gtkrc @@ -325,6 +426,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @dirrm share/themes/Emacs @dirrm share/themes/Default/gtk-2.0-key @dirrm share/themes/Default/gtk-2.0 +@dirrm share/gtk-2.0/demo @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders @dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules @dirrm lib/gtk-2.0/%%GTK_VERSION%% -- cgit v1.2.3