From 4acc6fb2a411b291c9c210d82bafe7c62e71c77d Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Wed, 24 Oct 2007 23:37:25 +0000 Subject: Presenting GNOME 2.20.1 and all related works for FreeBSD. The official GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338 --- x11/libgnome/Makefile | 10 ++--- x11/libgnome/distinfo | 6 +-- x11/libgnome/files/patch-libgnome::Makefile.in | 9 ++-- x11/libgnome/files/patch-libgnome_gnome-program.c | 55 ----------------------- x11/libgnome/files/pkg-deinstall.in | 2 +- x11/libgnome/pkg-plist | 14 ++++++ 6 files changed, 27 insertions(+), 69 deletions(-) delete mode 100644 x11/libgnome/files/patch-libgnome_gnome-program.c (limited to 'x11/libgnome') diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index c623a8e30cd0..cc476664cc1b 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,12 +3,12 @@ # Whom: Yukihiro Nakai # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.100 2007/03/12 15:49:09 ahze Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.110 2007/10/17 21:36:13 mezz Exp $ # PORTNAME= libgnome -PORTVERSION= 2.18.0 -PORTREVISION?= 2 +PORTVERSION= 2.20.1.1 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,8 +21,8 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper -RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper +BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian +RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_GETTEXT= yes USE_XPM= yes diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index c9dc30c0be72..0d26b855320a 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.18.0.tar.bz2) = 73426589d7c6fa3266fe4e8f3be2f5b5 -SHA256 (gnome2/libgnome-2.18.0.tar.bz2) = 53e3b241343c7ea9c4a8db4ca898fd7020c281f1400826d899b841d760dd5ba9 -SIZE (gnome2/libgnome-2.18.0.tar.bz2) = 1082802 +MD5 (gnome2/libgnome-2.20.1.1.tar.bz2) = cfab025a8b9a19cdae1c64f8b005c513 +SHA256 (gnome2/libgnome-2.20.1.1.tar.bz2) = d5b66f1beeefe3b61b654fa4d9c35b642fd73e310da1dd241e0ccb99dc93adec +SIZE (gnome2/libgnome-2.20.1.1.tar.bz2) = 1370144 diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in index 5a240a06a94c..efac650ba5a4 100644 --- a/x11/libgnome/files/patch-libgnome::Makefile.in +++ b/x11/libgnome/files/patch-libgnome::Makefile.in @@ -1,12 +1,11 @@ ---- libgnome/Makefile.in.orig Mon May 31 16:33:14 2004 -+++ libgnome/Makefile.in Mon May 31 16:33:45 2004 -@@ -211,6 +211,9 @@ +--- libgnome/Makefile.in.orig Tue May 29 22:16:13 2007 ++++ libgnome/Makefile.in Tue May 29 22:16:58 2007 +@@ -280,6 +280,8 @@ + LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome - INCLUDES = \ + -DPREFIX=\""$(PREFIX)"\" \ + -DLOCALBASE=\""$(LOCALBASE)"\" \ -+ -DX11BASE=\""$(X11BASE)"\" \ -I.. \ -I$(srcdir)/.. \ $(WARN_CFLAGS) \ diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c deleted file mode 100644 index 70ecbfd8fce0..000000000000 --- a/x11/libgnome/files/patch-libgnome_gnome-program.c +++ /dev/null @@ -1,55 +0,0 @@ ---- libgnome/gnome-program.c.orig Tue Apr 4 06:55:12 2006 -+++ libgnome/gnome-program.c Mon Apr 10 21:07:02 2006 -@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram - attr_rel = ""; - break; - case GNOME_FILE_DOMAIN_DATADIR: -- prefix_rel = "/share"; -+ prefix_rel = "/share/gnome"; - attr_name = GNOME_PARAM_GNOME_DATADIR; - attr_rel = ""; - break; - case GNOME_FILE_DOMAIN_SOUND: -- prefix_rel = "/share/sounds"; -+ prefix_rel = "/share/gnome/sounds"; - attr_name = GNOME_PARAM_GNOME_DATADIR; - attr_rel = "/sounds"; - break; - case GNOME_FILE_DOMAIN_PIXMAP: -- prefix_rel = "/share/pixmaps"; -+ prefix_rel = "/share/gnome/pixmaps"; - attr_name = GNOME_PARAM_GNOME_DATADIR; - attr_rel = "/pixmaps"; - break; -@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram - case GNOME_FILE_DOMAIN_HELP: - prefix_rel = "/share/gnome/help"; - attr_name = GNOME_PARAM_GNOME_DATADIR; -- attr_rel = "/gnome/help"; -+ attr_rel = "/help"; - break; - case GNOME_FILE_DOMAIN_APP_LIBDIR: - prefix_rel = "/lib"; -@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram - search_path = FALSE; - break; - case GNOME_FILE_DOMAIN_APP_DATADIR: -- prefix_rel = "/share"; -+ prefix_rel = "/share/gnome"; - attr_name = GNOME_PARAM_APP_DATADIR; - attr_rel = ""; - search_path = FALSE; - break; - case GNOME_FILE_DOMAIN_APP_SOUND: -- prefix_rel = "/share/sounds"; -+ prefix_rel = "/share/gnome/sounds"; - attr_name = GNOME_PARAM_APP_DATADIR; - attr_rel = "/sounds"; - search_path = FALSE; - break; - case GNOME_FILE_DOMAIN_APP_PIXMAP: -- prefix_rel = "/share/pixmaps"; -+ prefix_rel = "/share/gnome/pixmaps"; - attr_name = GNOME_PARAM_APP_DATADIR; - attr_rel = "/pixmaps"; - search_path = FALSE; diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index 3cfaf607920c..37c981693b8b 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.10 2007/02/16 18:14:27 mezz Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.12 2007/04/26 14:17:52 ahze Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 1eb129280b30..47b38ad06555 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -25,8 +25,10 @@ lib/libgnome-2.so lib/libgnome-2.so.0 libdata/bonobo/servers/GNOME_Moniker_std.server libdata/pkgconfig/libgnome-2.0.pc +share/gnome-background-properties/gnome-default.xml share/locale/am/LC_MESSAGES/libgnome-2.0.mo share/locale/ar/LC_MESSAGES/libgnome-2.0.mo +share/locale/as/LC_MESSAGES/libgnome-2.0.mo share/locale/az/LC_MESSAGES/libgnome-2.0.mo share/locale/be/LC_MESSAGES/libgnome-2.0.mo share/locale/bg/LC_MESSAGES/libgnome-2.0.mo @@ -65,6 +67,7 @@ share/locale/ko/LC_MESSAGES/libgnome-2.0.mo share/locale/ku/LC_MESSAGES/libgnome-2.0.mo share/locale/lt/LC_MESSAGES/libgnome-2.0.mo share/locale/lv/LC_MESSAGES/libgnome-2.0.mo +share/locale/mg/LC_MESSAGES/libgnome-2.0.mo share/locale/mk/LC_MESSAGES/libgnome-2.0.mo share/locale/ml/LC_MESSAGES/libgnome-2.0.mo share/locale/mn/LC_MESSAGES/libgnome-2.0.mo @@ -73,6 +76,7 @@ share/locale/nb/LC_MESSAGES/libgnome-2.0.mo share/locale/ne/LC_MESSAGES/libgnome-2.0.mo share/locale/nl/LC_MESSAGES/libgnome-2.0.mo share/locale/nn/LC_MESSAGES/libgnome-2.0.mo +share/locale/oc/LC_MESSAGES/libgnome-2.0.mo share/locale/or/LC_MESSAGES/libgnome-2.0.mo share/locale/pa/LC_MESSAGES/libgnome-2.0.mo share/locale/pl/LC_MESSAGES/libgnome-2.0.mo @@ -100,6 +104,10 @@ share/locale/yi/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo +share/pixmaps/backgrounds/gnome/background-default.jpg +@dirrm share/pixmaps/backgrounds/gnome +@dirrm share/pixmaps/backgrounds +@dirrmtry share/gnome-background-properties @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -114,9 +122,15 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo @dirrmtry share/locale/sr@ije @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as -- cgit v1.2.3