Build on Darwin:

* don't pass a second (and wrong) pair of -o and -u arguments to ${INSTALL}
* use canonical pkgsrc config.guess and config.sub

3 files changed, 40 insertions, 10 deletions

diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 4362652dec8..bcfd26d67e7 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/08/25 18:38:21 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2002/09/11 00:50:04 schmonz Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp 
 #
 
@@ -16,6 +16,8 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 INFO_FILES=		gdbm.info
 TEXINFO_OVERRIDE=	YES
+CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
+CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 post-extract:
 	${RM} -f ${WRKSRC}/gdbm.info
diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo
index 55bef4f5232..2bd704f41f0 100644
--- a/databases/gdbm/distinfo
+++ b/databases/gdbm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/08/16 21:41:59 dogcow Exp $
+$NetBSD: distinfo,v 1.3 2002/09/11 00:50:04 schmonz Exp $
 
 SHA1 (gdbm-1.8.0.tar.gz) = 2da746c04297d326b4a1ea4ae5605bd025b9c4a4
 Size (gdbm-1.8.0.tar.gz) = 134080 bytes
 SHA1 (patch-aa) = 606b93372065c9ac6df7800b0cb81971363f9257
-SHA1 (patch-ab) = 70427ff71924c9a2486972a8c75ac860b3d60515
+SHA1 (patch-ab) = 162f4fc09932bc1c2921675aa9d43b3b3c0f7464
diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-ab
index 57e0233bf3c..0c3e6046c3d 100644
--- a/databases/gdbm/patches/patch-ab
+++ b/databases/gdbm/patches/patch-ab
@@ -1,7 +1,19 @@
-$NetBSD: patch-ab,v 1.9 2002/08/25 18:38:21 jlam Exp $
---- Makefile.in.orig	Tue May 18 20:16:06 1999
-+++ Makefile.in	Thu Aug 16 14:27:07 2001
-@@ -27,11 +27,11 @@
+$NetBSD: patch-ab,v 1.10 2002/09/11 00:50:05 schmonz Exp $
+
+--- Makefile.in.orig	Tue May 18 23:16:06 1999
++++ Makefile.in
+@@ -14,10 +14,6 @@ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-# File ownership and group
+-BINOWN = bin
+-BINGRP = bin
+-
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ 
+@@ -27,11 +23,11 @@ DEFS =
  LIBS = @LIBS@ -lc
  
  # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
@@ -15,12 +27,28 @@ $NetBSD: patch-ab,v 1.9 2002/08/25 18:38:21 jlam Exp $
  exec_prefix = $(prefix)
  binprefix = $(exec_prefix)
  manprefix = $(prefix)
-@@ -121,7 +121,7 @@
+@@ -121,18 +117,18 @@ progs: $(PROGS)
  
  install: libgdbm.la gdbm.h gdbm.info
  	$(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
 -	$(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
 +	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(libdir)/libgdbm.la
- 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h
- 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
++	$(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h
++	$(INSTALL_DATA) $(srcdir)/gdbm.3 \
  		$(man3dir)/gdbm.3
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
++	$(INSTALL_DATA) $(srcdir)/gdbm.info \
+ 		$(infodir)/gdbm.info
+ 
+ install-compat:
+ 	$(srcdir)/mkinstalldirs $(includedir)
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
++	$(INSTALL_DATA) $(srcdir)/dbm.h \
+ 		$(includedir)/dbm.h
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
++	$(INSTALL_DATA) $(srcdir)/ndbm.h \
+ 		$(includedir)/ndbm.h
+ 
+ #libgdbm.a: $(OBJS) gdbm.h