summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gnome2-pixmaps/Makefile4
-rw-r--r--graphics/gnome2-pixmaps/distinfo6
-rw-r--r--x11/gnome-desktop/Makefile7
-rw-r--r--x11/gnome-desktop/distinfo8
-rw-r--r--x11/gnome-desktop/patches/patch-ae16
5 files changed, 21 insertions, 20 deletions
diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile
index c4d0d4478c4..b74d010c18e 100644
--- a/graphics/gnome2-pixmaps/Makefile
+++ b/graphics/gnome2-pixmaps/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/09/21 16:54:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/10/26 21:05:46 jmmv Exp $
#
-DISTNAME= gnome-desktop-2.8.0
+DISTNAME= gnome-desktop-2.8.1
PKGNAME= ${DISTNAME:S/-desktop/2-pixmaps/}
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.8/}
diff --git a/graphics/gnome2-pixmaps/distinfo b/graphics/gnome2-pixmaps/distinfo
index 735ea7886b9..e2d5f1a9692 100644
--- a/graphics/gnome2-pixmaps/distinfo
+++ b/graphics/gnome2-pixmaps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/09/21 16:54:06 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/10/26 21:05:46 jmmv Exp $
-SHA1 (gnome-desktop-2.8.0.tar.bz2) = af1156960f9bf6c4a55fd92cfb51b48f2d7b7c9b
-Size (gnome-desktop-2.8.0.tar.bz2) = 1117368 bytes
+SHA1 (gnome-desktop-2.8.1.tar.bz2) = 799ecb9341c80d50b504c42b888f98841ca75788
+Size (gnome-desktop-2.8.1.tar.bz2) = 1132666 bytes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 01b0edc08f0..5a03253de85 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/10/03 00:18:31 tv Exp $
+# $NetBSD: Makefile,v 1.31 2004/10/26 21:05:46 jmmv Exp $
#
-DISTNAME= gnome-desktop-2.8.0
-PKGREVISION= 1
+DISTNAME= gnome-desktop-2.8.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.8/}
EXTRACT_SUFX= .tar.bz2
@@ -22,6 +21,8 @@ USE_PERL5= yes
USE_X11= yes
USE_LIBTOOL= yes
+BUILDLINK_DEPENDS.gnome2-pixmaps+= gnome2-pixmaps>=2.8.1
+
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index f43c2588e4f..d0e4aa4da93 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2004/09/21 16:54:06 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2004/10/26 21:05:46 jmmv Exp $
-SHA1 (gnome-desktop-2.8.0.tar.bz2) = af1156960f9bf6c4a55fd92cfb51b48f2d7b7c9b
-Size (gnome-desktop-2.8.0.tar.bz2) = 1117368 bytes
-SHA1 (patch-ae) = 85ff31395a7d24693e3125ee5c180a075612207c
+SHA1 (gnome-desktop-2.8.1.tar.bz2) = 799ecb9341c80d50b504c42b888f98841ca75788
+Size (gnome-desktop-2.8.1.tar.bz2) = 1132666 bytes
+SHA1 (patch-ae) = d472adb0f623ed53059dfb8805975a3f4befc6b5
SHA1 (patch-ag) = ad8d3466bdfe18c1b853ba69f863db35a5891996
diff --git a/x11/gnome-desktop/patches/patch-ae b/x11/gnome-desktop/patches/patch-ae
index 677395e957e..ac3d28942b8 100644
--- a/x11/gnome-desktop/patches/patch-ae
+++ b/x11/gnome-desktop/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
+$NetBSD: patch-ae,v 1.2 2004/10/26 21:05:46 jmmv Exp $
---- pixmaps/Makefile.in.orig Thu Sep 5 12:21:05 2002
+--- pixmaps/Makefile.in.orig 2004-10-12 17:55:19.000000000 +0200
+++ pixmaps/Makefile.in
-@@ -47,7 +47,7 @@ AUTOHEADER = @AUTOHEADER@
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+@@ -88,7 +88,7 @@ GNOME_PLATFORM = @GNOME_PLATFORM@
+ GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@
+ GTK_REQUIRED = @GTK_REQUIRED@
+ ICONV = @ICONV@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DATA = echo "part of gnome-pixmaps, not installed: "
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
-
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@