From 88804e1de36ea9b8a27810e087cb67f22e14ad35 Mon Sep 17 00:00:00 2001
From: danw <danw@pkgsrc.org>
Date: Fri, 27 Apr 2001 19:44:39 +0000
Subject: Set USE_GMAKE and remove the patch to generate monikers/*.oaf at
 configure-time. There are rules to build them (different from what configure
 would do) in the Makefile, they just use gmake-specific syntax.

Bumped version to 1.0.2nb1 on general principles, but AFAIK nothing
currently in pkgsrc is badly affected by the behavior of the 1.0.2
package, so I'm not updating any DEPENDS.
---
 devel/bonobo/Makefile         |  4 +++-
 devel/bonobo/distinfo         |  4 ++--
 devel/bonobo/patches/patch-ab | 13 +------------
 3 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'devel')

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 9de183954e8..f2aee56dd6b 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2001/04/14 14:16:54 rh Exp $
+# $NetBSD: Makefile,v 1.13 2001/04/27 19:44:39 danw Exp $
 #
 
 DISTNAME=		bonobo-1.0.2
+PKGNAME=		bonobo-1.0.2nb1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/bonobo/}
 
@@ -18,6 +19,7 @@ DEPENDS+=		gnome-print>=0.28:../../print/gnome-print
 
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
+USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 317096f1691..1b9b966d20a 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:12 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/04/27 19:44:40 danw Exp $
 
 SHA1 (bonobo-1.0.2.tar.gz) = 8b16282fc14014a92959d0bf8fc79850e63c1a68
 Size (bonobo-1.0.2.tar.gz) = 1476160 bytes
 SHA1 (patch-aa) = abb08c79e9971e755f4fef72bce46a88e9299397
-SHA1 (patch-ab) = bf5a5aae979ce382d70e2b5e9ff98ccd6ff9d150
+SHA1 (patch-ab) = dcb60df7c4eed7efbf8086135a9f1e6fdecc1d36
diff --git a/devel/bonobo/patches/patch-ab b/devel/bonobo/patches/patch-ab
index fe39df84451..5729f718b2d 100644
--- a/devel/bonobo/patches/patch-ab
+++ b/devel/bonobo/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2001/04/06 22:16:50 rh Exp $
+$NetBSD: patch-ab,v 1.5 2001/04/27 19:44:40 danw Exp $
 
 --- configure.orig	Thu Feb 15 07:40:11 2001
 +++ configure
@@ -11,14 +11,3 @@ $NetBSD: patch-ab,v 1.4 2001/04/06 22:16:50 rh Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -6309,6 +6309,10 @@
- bonobo/Makefile
- storage-modules/Makefile
- monikers/Makefile
-+monikers/Bonobo_Moniker_gzip.oaf
-+monikers/Bonobo_Moniker_http.oaf
-+monikers/Bonobo_Moniker_std.oaf.in
-+monikers/Bonobo_Moniker_std.oaf
- components/Makefile
- components/application-x-gnomine/Makefile
- components/text-plain/Makefile
-- 
cgit v1.2.3