sync, share distinfo & patches

5 files changed, 9 insertions, 25 deletions

diff --git a/sysutils/gnome-menus/distinfo b/sysutils/gnome-menus/distinfo
index 84c0f7f786e..f0810e47b05 100644
--- a/sysutils/gnome-menus/distinfo
+++ b/sysutils/gnome-menus/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.24 2010/07/06 15:13:39 drochner Exp $
+$NetBSD: distinfo,v 1.25 2010/07/13 13:09:33 drochner Exp $
 
 SHA1 (gnome-menus-2.30.2.tar.bz2) = edbc9b9fc4e86f5cc772011ea768ba9487625d67
 RMD160 (gnome-menus-2.30.2.tar.bz2) = cbc2f5aaf529e385c835de84d6284803280494a9
 Size (gnome-menus-2.30.2.tar.bz2) = 464086 bytes
 SHA1 (patch-aa) = 84d53f03b1b45172e810f5bc66dd4b648c605bd2
+SHA1 (patch-ab) = 6196ca7fb0c988dd35a7d68c6efefc8bae783061
diff --git a/sysutils/py-gnome-menus/patches/patch-aa b/sysutils/gnome-menus/patches/patch-ab
index f659c638e7c..84e4a811246 100644
--- a/sysutils/py-gnome-menus/patches/patch-aa
+++ b/sysutils/gnome-menus/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2009/12/06 22:45:50 wiz Exp $
+$NetBSD: patch-ab,v 1.1 2010/07/13 13:09:34 drochner Exp $
 
 --- python/Makefile.in.orig	2009-10-01 11:24:51.000000000 +0000
 +++ python/Makefile.in
diff --git a/sysutils/py-gnome-menus/Makefile b/sysutils/py-gnome-menus/Makefile
index 40862aa0629..7034329f6c6 100644
--- a/sysutils/py-gnome-menus/Makefile
+++ b/sysutils/py-gnome-menus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2010/02/16 12:10:14 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2010/07/13 13:09:34 drochner Exp $
 #
 
-DISTNAME=	gnome-menus-2.28.0.1
+DISTNAME=	gnome-menus-2.30.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	drochner@NetBSD.org
@@ -13,6 +13,9 @@ COMMENT=	Python bindings for gnome-menus
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+DISTINFO_FILE=	${.CURDIR}/../gnome-menus/distinfo
+PATCHDIR=	${.CURDIR}/../gnome-menus/patches
+
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
diff --git a/sysutils/py-gnome-menus/distinfo b/sysutils/py-gnome-menus/distinfo
deleted file mode 100644
index 521f2b0e097..00000000000
--- a/sysutils/py-gnome-menus/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.10 2009/12/07 13:21:49 wiz Exp $
-
-SHA1 (gnome-menus-2.28.0.1.tar.bz2) = af3469cc2ffd41aad3e3931176e17e9c91e94a29
-RMD160 (gnome-menus-2.28.0.1.tar.bz2) = 9d74e64375c4c14c347dbbbe010035ccb3a7b5b0
-Size (gnome-menus-2.28.0.1.tar.bz2) = 461356 bytes
-SHA1 (patch-aa) = 6196ca7fb0c988dd35a7d68c6efefc8bae783061
-SHA1 (patch-ab) = cf23a7863a5948ed22d5b6e3d0656f3a2d50c905
diff --git a/sysutils/py-gnome-menus/patches/patch-ab b/sysutils/py-gnome-menus/patches/patch-ab
deleted file mode 100644
index 50c51076fdf..00000000000
--- a/sysutils/py-gnome-menus/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/12/07 13:21:49 wiz Exp $
-
---- configure.orig	2009-12-06 22:43:13.000000000 +0000
-+++ configure
-@@ -15492,7 +15492,7 @@ $as_echo_n "checking for python librarie
- 
- link_pymodules_libpython=false;
- py_enable_shared=`$PYTHON -c "from distutils.sysconfig import get_config_var; print repr(get_config_var('Py_ENABLE_SHARED'))"`
--if test $py_enable_shared == 1 ; then
-+if test $py_enable_shared = 1 ; then
-   if test x`uname -s` != xDarwin; then
-       PYTHON_LDFLAGS="-no-undefined"
-       link_pymodules_libpython=true;