[pkgsrc/trunk]: pkgsrc/databases/gnats Fix broken build with clang. While her...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d7459250b67
branches:  trunk
changeset: 591019:4d7459250b67
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Aug 01 05:19:12 2011 +0000

description:
Fix broken build with clang. While here, fix the toplevel makefile to
stop on error.

diffstat:

 databases/gnats/distinfo                    |   4 +-
 databases/gnats/patches/patch-gnats_gnats_h |  16 ++++++
 databases/gnats/patches/patch-makefile_in   |  77 +++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 1 deletions(-)

diffs (116 lines):

diff -r c6476577e7c2 -r 4d7459250b67 databases/gnats/distinfo
--- a/databases/gnats/distinfo  Mon Aug 01 05:03:44 2011 +0000
+++ b/databases/gnats/distinfo  Mon Aug 01 05:19:12 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/11/17 04:37:01 obache Exp $
+$NetBSD: distinfo,v 1.12 2011/08/01 05:19:12 dholland Exp $
 
 SHA1 (gnats-4.1.0.tar.gz) = 7f8ce7fbb7594698c5ba71421cad3cbc7e079003
 RMD160 (gnats-4.1.0.tar.gz) = b16bfa3ffa4f1c7dc351d1c5639061c358c64afd
@@ -9,3 +9,5 @@
 SHA1 (patch-ad) = ffacd88288036eb74eccd6687292c5a456e2f027
 SHA1 (patch-ae) = ff99ebd3f6d2d1aa75b32ead56db0082eeb69753
 SHA1 (patch-ah) = 1a21ef20bbc4a2e8ed2559687a2cd8983d1c3f5f
+SHA1 (patch-gnats_gnats_h) = 08cb25700672bddda30075c9a7a01443afcd5199
+SHA1 (patch-makefile_in) = a32d9f3f93cb4ec9d82d4ce204a12cd43e7a88c0
diff -r c6476577e7c2 -r 4d7459250b67 databases/gnats/patches/patch-gnats_gnats_h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/gnats/patches/patch-gnats_gnats_h       Mon Aug 01 05:19:12 2011 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-gnats_gnats_h,v 1.1 2011/08/01 05:19:12 dholland Exp $
+
+Remove redundant and improperly protected copy of private asprintf decl.
+
+--- gnats/gnats.h~     2005-02-24 20:35:55.000000000 +0000
++++ gnats/gnats.h
+@@ -137,9 +137,6 @@ char *alloca ();
+ # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+ #endif
+ 
+-extern int asprintf (char **buf, const char *fmt, ...);
+-extern int vasprintf (char **buf, const char *fmt, va_list args);
+-
+ #if ! HAVE_DECL_UNSETENV
+ extern void unsetenv (const char *name);
+ #endif
diff -r c6476577e7c2 -r 4d7459250b67 databases/gnats/patches/patch-makefile_in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/gnats/patches/patch-makefile_in Mon Aug 01 05:19:12 2011 +0000
@@ -0,0 +1,77 @@
+$NetBSD: patch-makefile_in,v 1.1 2011/08/01 05:19:12 dholland Exp $
+
+Fix energizer-bunny-makefiles.
+
+--- Makefile.in~       2005-02-24 20:35:55.000000000 +0000
++++ Makefile.in
+@@ -34,15 +34,15 @@ SUBDIRS = gnats send-pr doc
+ all: all-gnats
+ 
+ all-gnats:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ all-tools:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ install: install-gnats
+ 
+ install-gnats:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ install-strip:
+       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' $@
+@@ -51,37 +51,37 @@ install-tools:
+       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' $@
+ 
+ uninstall:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ mostlyclean:
+       -rm -f TAGS *.tar *.tar.gz
+       -rm -f .\#* *~*
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ clean: mostlyclean
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ distclean: clean distclean-here
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ distclean-here:
+       -rm -f Makefile config.status config.cache config.log
+       -rm -f .\#* \#* *~*
+       -rm -f *.orig *.rej
+ 
+ maintainer-clean: distclean-here
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ Makefile: $(srcdir)/Makefile.in config.status
+       ./config.status
+ 
+ TAGS:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ info:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ dvi:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done
+ 
+ dist: maintainer-clean
+       ./configure
+@@ -105,4 +105,4 @@ dist: maintainer-clean
+       gzip -9 $(DISTDIR).tar
+ 
+ check:
+-      for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
++      for d in $(SUBDIRS); do $(MAKE) -C $$d $@ || exit 1; done