Update to 2.32.1. Set LICENSE.

Changes: translation updates.

Also remove patch for Darwin that's been here since 2004. I can't believe
it's still necessary.

4 files changed, 15 insertions, 41 deletions

diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 27208f97f06..d9a582d906a 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2011/01/13 13:36:47 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2011/03/11 11:41:24 wiz Exp $
 #
 
-DISTNAME=	libgnome-2.32.0
-PKGREVISION=	2
+DISTNAME=	libgnome-2.32.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,11 +9,10 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Core GNOME2 library (non-graphical)
+LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.26
-
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
@@ -22,12 +20,14 @@ USE_PKGLOCALEDIR=	YES
 
 PKGCONFIG_OVERRIDE=	libgnome/libgnome-2.0.pc.in
 
-CONFIGURE_ARGS=	--enable-gtk-doc=no
+CONFIGURE_ARGS=		--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	soundlistdir=${PREFIX}/share/examples/libgnome/sound/events
 
+BUILD_DEFS+=	VARBASE
+
 OWN_DIRS=	${PKG_SYSCONFDIR}/sound/events
 
 EGDIR=		${PREFIX}/share/examples/libgnome
@@ -55,24 +55,14 @@ GCONF_SCHEMAS+=	desktop_gnome_applications_at_mobility.schemas
 GCONF_SCHEMAS+=	desktop_gnome_applications_at_visual.schemas
 GCONF_SCHEMAS+=	desktop_gnome_applications_office.schemas
 
-PKG_OPTIONS_VAR= PKG_OPTIONS.libgnome
-PKG_SUPPORTED_OPTIONS= esound
-.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-BUILDLINK_API_DEPENDS.audiofile+=	libaudiofile>=0.2.3
-.include "../../audio/libaudiofile/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-esd
-.endif
-
-BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.8.0
-BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.13.0
+.include "options.mk"
 
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.13.0
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST
index 8c5fdb8875c..7a58b8561c0 100644
--- a/devel/libgnome/PLIST
+++ b/devel/libgnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2010/11/15 18:33:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.30 2011/03/11 11:41:24 wiz Exp $
 bin/gnome-open
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
@@ -163,6 +163,7 @@ share/locale/te/LC_MESSAGES/libgnome-2.0.mo
 share/locale/th/LC_MESSAGES/libgnome-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/tt/LC_MESSAGES/libgnome-2.0.mo
+share/locale/ug/LC_MESSAGES/libgnome-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/vi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index 0ff53528bda..03ba2d41b8f 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.37 2010/11/15 18:33:17 drochner Exp $
+$NetBSD: distinfo,v 1.38 2011/03/11 11:41:24 wiz Exp $
 
-SHA1 (libgnome-2.32.0.tar.bz2) = 8053b1d888b6285df0dd39c2e0bb03569f73fc09
-RMD160 (libgnome-2.32.0.tar.bz2) = 6568dd1fea181c82006ff85f68465df58ed9584d
-Size (libgnome-2.32.0.tar.bz2) = 1731179 bytes
-SHA1 (patch-af) = 783e295d1714b7c121538ed7459ffbcf3ff3713a
+SHA1 (libgnome-2.32.1.tar.bz2) = a6bc277ff90ca2f83b91c5bc5222f03ab553a52b
+RMD160 (libgnome-2.32.1.tar.bz2) = e425910756737363ef910e9d2d5cd3820d009441
+Size (libgnome-2.32.1.tar.bz2) = 1776006 bytes
diff --git a/devel/libgnome/patches/patch-af b/devel/libgnome/patches/patch-af
deleted file mode 100644
index 3f549c5af03..00000000000
--- a/devel/libgnome/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/04/24 20:35:15 danw Exp $
-
---- libgnome/gnome-util.c.orig	Mon Apr 12 19:17:51 2004
-+++ libgnome/gnome-util.c
-@@ -137,6 +137,11 @@ g_extension_pointer (const char * path)
- 	}
- }
- 
-+#if defined(__APPLE__)
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- /**
-  * gnome_setenv:
-  * @name: An environment variable name.