update to gnats 4.2.0

upstream Changes highlights:
 - GNU v3 license update
 - Buid now uses automake, and code has been adjusted to compile
   properly in various environments (tested with gcc 2.95, 3.4, 4.8,
   4.9, clang 3.1, 3.4, and several different versions of Linux,
   FreeBSD, Solaris, OS X)
 - New --global-databases-file command-line option for gnatsd and other programs
 - New host/port/user/passwd command-line options for send-pr
 - Many bugfixes, including:
 - FreeBSD-SA-05:20.cvsbug security advisory (affected send-pr)
 - Fixed PR#484: "send-pr --request-id" sends just a template
 - Fixed PR#501: Safer open/fopen for gen-index (no longer installing as suid)
 - Fixed PR#504: gnatsd crashes when trying to lock a nonexistent PR
 - Fixed PR#508: Emacs interface gnats-change-database fails when
   gnats-port isn't set
 - Fixed PR#691: Portability problem with sed and tr
 - Fixed PR#746: install-sid is a bash script (and not /bin/sh)
 - Fixed PR#767: edit-pr returns incorect exit status
 - Fixed PR#768: make install DESTDIR=/anywhere fails
 - Fixed PR#771: "EXPR" queries with spaces sometimes fail
 - Fixed PR#773: using responsible alias as email address for edit-pr
 - "invalid query format" bug for queries that included whitespace
 - edit-pr will now correctly exit with an error if it cannot lock the PR
 - edit-pr will now use the email alias in the responsibles field
 - Solaris 7/8/10 compilation fixed

16 files changed, 225 insertions, 342 deletions

diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 76b85231cdc..75928674b98 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2014/02/08 15:38:44 wiedi Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/19 19:35:00 spz Exp $
 
-DISTNAME=	gnats-4.1.0
-PKGREVISION=	4
+DISTNAME=	gnats-4.2.0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GNU:=gnats/}
 
diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST
index 971b35b2f77..d7227d5db24 100644
--- a/databases/gnats/PLIST
+++ b/databases/gnats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:43:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/04/19 19:35:00 spz Exp $
 bin/edit-pr
 bin/getclose
 bin/install-sid
@@ -11,6 +11,7 @@ libexec/gnats/check-db
 libexec/gnats/delete-pr
 libexec/gnats/diff-prs
 libexec/gnats/file-pr
+libexec/gnats/gen-closed-date
 libexec/gnats/gen-index
 libexec/gnats/gnats-pwconv
 libexec/gnats/gnatsd
@@ -27,6 +28,7 @@ man/man1/query-pr.1
 man/man1/send-pr.1
 man/man5/databases.5
 man/man5/dbconfig.5
+man/man5/send-pr.conf.5
 man/man7/gnats.7
 man/man8/delete-pr.8
 man/man8/file-pr.8
@@ -47,7 +49,6 @@ share/gnats/defaults/addresses
 share/gnats/defaults/categories
 share/gnats/defaults/classes
 share/gnats/defaults/dbconfig
-share/gnats/defaults/gnatsd.user_access
 share/gnats/defaults/responsible
 share/gnats/defaults/states
 share/gnats/defaults/submitters
diff --git a/databases/gnats/distinfo b/databases/gnats/distinfo
index 2d1ae8dcb73..cde7c056768 100644
--- a/databases/gnats/distinfo
+++ b/databases/gnats/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.14 2013/12/01 23:27:11 bsiegert Exp $
+$NetBSD: distinfo,v 1.15 2015/04/19 19:35:00 spz Exp $
 
-SHA1 (gnats-4.1.0.tar.gz) = 7f8ce7fbb7594698c5ba71421cad3cbc7e079003
-RMD160 (gnats-4.1.0.tar.gz) = b16bfa3ffa4f1c7dc351d1c5639061c358c64afd
-Size (gnats-4.1.0.tar.gz) = 1221364 bytes
-SHA1 (patch-aa) = 46ee888dd1726d7c7178247dd8c11c3bc8790911
-SHA1 (patch-ab) = 605e0caaed659405fff46af6c610d52c9dca948e
-SHA1 (patch-ac) = f6fdd1c2353961d47bd0e58866b56ac6f0d6173a
-SHA1 (patch-ad) = ffacd88288036eb74eccd6687292c5a456e2f027
-SHA1 (patch-ae) = ff99ebd3f6d2d1aa75b32ead56db0082eeb69753
-SHA1 (patch-ah) = 1a21ef20bbc4a2e8ed2559687a2cd8983d1c3f5f
-SHA1 (patch-gnats_configure) = 6f7daa160a13bc05bb59a362f89f05044b1fedd9
-SHA1 (patch-gnats_gnats_h) = 08cb25700672bddda30075c9a7a01443afcd5199
-SHA1 (patch-makefile_in) = a32d9f3f93cb4ec9d82d4ce204a12cd43e7a88c0
+SHA1 (gnats-4.2.0.tar.gz) = 1f277bba896ee0941f3cd8b16788efd8f0f273cc
+RMD160 (gnats-4.2.0.tar.gz) = 4dc473a242f8047bbe547f7b38a820e48a74bf90
+Size (gnats-4.2.0.tar.gz) = 1264845 bytes
+SHA1 (patch-aa) = 484254c68f456cc78986af3cefaea6724c4eff81
+SHA1 (patch-configure) = e31b335643fa2b2cfbbdd11e299183b3e93ce59c
+SHA1 (patch-gnats_ds-file_mkcat.sh) = b3eff03ae12e9bf3e4e33c3fa8f6d62dbe9ec49c
+SHA1 (patch-gnats_ds-file_mkdb.sh) = 40dd8276d9e43cd48c7ef1011f84049c29670a79
+SHA1 (patch-gnats_ds-file_rmcat.sh) = 63eee5890e09311c0d986cff081b131f2d350d11
+SHA1 (patch-gnats_edit-pr.sh) = 7f7244975dd70d13714d48a14ec82ddc63cde7b3
+SHA1 (patch-gnats_gnats_h) = e6838f94a8f83551efc8808c9b7ba64f5b506f29
diff --git a/databases/gnats/patches/patch-aa b/databases/gnats/patches/patch-aa
index 8fd2e7b6eb3..7220bb0338b 100644
--- a/databases/gnats/patches/patch-aa
+++ b/databases/gnats/patches/patch-aa
@@ -1,145 +1,111 @@
-$NetBSD: patch-aa,v 1.4 2005/08/28 12:36:42 recht Exp $
+$NetBSD: patch-aa,v 1.5 2015/04/19 19:35:00 spz Exp $
 
---- gnats/Makefile.in.orig	2005-02-24 21:35:55.000000000 +0100
-+++ gnats/Makefile.in	2005-08-28 14:24:22.000000000 +0200
-@@ -93,7 +93,7 @@
- 
- INSTALL = $(srcdir)/../install-sh -c
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_SCRIPT = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'`
-@@ -250,7 +250,7 @@
- 
- mkcat: mkcat.sh Makefile
- 	@echo Creating mkcat...
--	@cat $(srcdir)/mkcat.sh > $@-t
-+	@sed -e 's,xBINDIRx,$(bindir),g' $(srcdir)/mkcat.sh > $@-t
- 	@mv $@-t $@
- 	@chmod a+x $@
+pkgsrcification
+
+--- gnats/Makefile.in.orig	2015-02-27 02:10:23.000000000 +0000
++++ gnats/Makefile.in
+@@ -574,11 +574,10 @@ CLEANFILES = $(bin_SCRIPTS) $(pkglibexec
  
-@@ -265,7 +265,7 @@
  
- rmcat: rmcat.sh Makefile
- 	@echo Creating rmcat...
--	@cat $(srcdir)/rmcat.sh > $@-t
-+	@sed -e 's,xBINDIRx,$(bindir),g' $(srcdir)/rmcat.sh > $@-t
- 	@mv $@-t $@
- 	@chmod a+x $@
+ # Data files
+-dist_pkgdata_DATA = addresses categories classes gnatsd.host_access \
+-	gnatsd.user_access responsible states submitters \
+-	databases send-pr.conf
++dist_pkgdata_DATA = addresses categories classes dbconfig \
++	responsible states submitters
  
-@@ -369,7 +369,7 @@
+-pkgdata_DATA = dbconfig
++pkgdata_DATA = databases gnatsd.host_access gnatsd.user_access send-pr.conf
+ all: $(BUILT_SOURCES) autoconf.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
- install-tools-arch-indep: all-tools
- 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnats
--	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sysconfdir)/gnats/defaults
-+	$(SHELL) $(srcdir)/../mkinstalldirs %%GNATS_DEFAULTS%%
- 	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
- 	  echo "chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \
- 	  chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats ; \
-@@ -379,9 +379,9 @@
- 	$(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el
- 	for i in categories submitters responsible gnatsd.user_access addresses states classes dbconfig ; do \
- 	    if [ -f "$$i" ] ; then \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
-+		$(INSTALL_DATA) $$i %%GNATS_DEFAULTS%%/$$i ; \
- 	    else \
--		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
-+		$(INSTALL_DATA) $(srcdir)/$$i %%GNATS_DEFAULTS%%/$$i ; \
- 	    fi ; \
+@@ -881,18 +880,18 @@ distclean-compile:
+ 	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+ install-dist_lispDATA: $(dist_lisp_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(dist_lisp_DATA)'; test -n "$(lispdir)" || list=; \
++	@list='$(dist_lisp_DATA)'; test -n "%%GNATS_DEFAULTS%%" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(lispdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(lispdir)" || exit 1; \
++	  echo " $(MKDIR_P) '%%GNATS_DEFAULTS%%'"; \
++	  $(MKDIR_P) "%%GNATS_DEFAULTS%%" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(lispdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(lispdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '%%GNATS_DEFAULTS%%/..'"; \
++	  $(INSTALL_DATA) $$files "%%GNATS_DEFAULTS%%/.." || exit $$?; \
  	done
  
-@@ -391,17 +391,9 @@
- 	$(INSTALL_SCRIPT) edit-pr $(DESTDIR)$(bindir)/edit-pr
- 	$(INSTALL_SCRIPT) diff-prs $(DESTDIR)$(libexecdir)/gnats/diff-prs
- 	$(INSTALL_SCRIPT) mail-agent $(DESTDIR)$(libexecdir)/gnats/mail-agent
--	$(INSTALL_PROGRAM) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
-+	$(INSTALL_SCRIPT) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
- 	$(INSTALL_PROGRAM) pr-age $(DESTDIR)$(libexecdir)/gnats/pr-age
- 	$(INSTALL_PROGRAM) pr-edit $(DESTDIR)$(libexecdir)/gnats/pr-edit
--	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
--	  echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \
--	  echo "chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \
--	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \
--	  chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \
--        else \
--	  echo "*** Warning: Must make pr-edit suid $(DESTDIR)$(GNATS_USER)" ; \
--	fi
+ uninstall-dist_lispDATA:
+@@ -902,18 +901,18 @@ uninstall-dist_lispDATA:
+ 	dir='$(DESTDIR)$(lispdir)'; $(am__uninstall_files_from_dir)
+ install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
++	@list='$(dist_pkgdata_DATA)'; test -n "%%GNATS_DEFAULTS%%" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
++	  echo " $(MKDIR_P) '%%GNATS_DEFAULTS%%'"; \
++	  $(MKDIR_P) "%%GNATS_DEFAULTS%%" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '%%GNATS_DEFAULTS%%'"; \
++	  $(INSTALL_DATA) $$files "%%GNATS_DEFAULTS%%" || exit $$?; \
+ 	done
  
- EXTRA_INSTALL =
+ uninstall-dist_pkgdataDATA:
+@@ -925,16 +924,16 @@ install-pkgdataDATA: $(pkgdata_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
++	  echo " $(MKDIR_P) '%%EGDIR%%"; \
++	  $(MKDIR_P) "%%EGDIR%%" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '%%EGDIR%%"; \
++	  $(INSTALL_DATA) $$files "%%EGDIR%%" || exit $$?; \
+ 	done
  
-@@ -409,29 +401,42 @@
- install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL)
+ uninstall-pkgdataDATA:
+@@ -1304,18 +1303,9 @@ mail-query: mail-query.sh Makefile
+ send-pr: send-pr.sh Makefile
+ 	$(do_subst) < $(srcdir)/send-pr.sh > send-pr
  
- install-gnats-arch-indep: all-gnats install-tools-arch-indep
--	@if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ]; then \
--	  echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE), it's already there." ; \
-+	@if [ -f %%EGDIR%%/databases ]; then \
-+	  echo "Not putting gnats-databases file in %%EGDIR%%/databases, it's already there." ; \
- 	  true ; \
- 	else \
- 	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
- 	    $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \
--	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
-+	                    %%EGDIR%%/databases ; \
- 	  else \
--	    $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
--	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE)" ; \
-+	    $(INSTALL_DATA) gnats-databases %%EGDIR%%/databases ; \
-+	    echo "*** Warning: Must chown $(GNATS_USER) %%EGDIR%%/databases" ; \
- 	  fi \
- 	fi
--	@if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ]; then \
--	   echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE), it's already there." ; \
-+	@if [ -f %%EGDIR%%/gnatsd.host_access ]; then \
-+	   echo "Not putting gnats.host_access file in %%EGDIR%%/gnatsd.host_access, it's already there." ; \
- 	   true ; \
- 	else \
- 	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
- 	    $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \
--	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
-+	                    %%EGDIR%%/gnatsd.host_access ; \
-           else \
- 	    $(INSTALL_DATA) $(srcdir)/gnatsd.host_access \
--	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
--	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE)" ; \
-+	                    %%EGDIR%%/gnatsd.host_access ; \
-+	    echo "*** Warning: Must chown $(GNATS_USER) %%EGDIR%%/gnatsd.host_access" ; \
-+	  fi \
-+	fi
-+	@if [ -f %%EGDIR%%/gnatsd.user_access ]; then \
-+	   echo "Not putting gnats.user_access file in %%EGDIR%%/gnatsd.user_access, it's already there." ; \
-+	   true ; \
-+	else \
-+	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
-+	    $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.user_access \
-+	                    %%EGDIR%%/gnatsd.user_access ; \
-+          else \
-+	    $(INSTALL_DATA) $(srcdir)/gnatsd.user_access \
-+	                    %%EGDIR%%/gnatsd.user_access ; \
-+	    echo "*** Warning: Must chown $(GNATS_USER) %%EGDIR%%/gnatsd.user_access" ; \
- 	  fi \
- 	fi
- 	@echo "*** If you're a first-time user, you'll want to create a new database";
-@@ -450,20 +455,6 @@
- 	$(INSTALL_PROGRAM) gen-index $(DESTDIR)$(libexecdir)/gnats/gen-index
- 	$(INSTALL_SCRIPT) mail-query $(DESTDIR)$(libexecdir)/gnats/mail-query
- 	$(INSTALL_PROGRAM) gnats-pwconv $(DESTDIR)$(libexecdir)/gnats/gnats-pwconv
--	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
--	  echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/queue-pr $(DESTDIR)$(libexecdir)/gnats/file-pr $(DESTDIR)$(libexecdir)/gnats/gen-index" ; \
--	  echo "chmod 4555 $(DESTDIR)$(libexecdir)/gnats/queue-pr $(DESTDIR)$(libexecdir)/gnats/file-pr $(DESTDIR)$(libexecdir)/gnats/gen-index" ; \
--	  echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gnatsd" ; \
--	  echo "chmod 555 $(DESTDIR)$(libexecdir)/gnats/gnatsd" ; \
--	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/queue-pr ; \
--	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gen-index ; \
--	  chmod 4555 $(DESTDIR)$(libexecdir)/gnats/queue-pr ; \
--	  chmod 4555 $(DESTDIR)$(libexecdir)/gnats/gen-index ; \
--	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gnatsd ; \
--	  chmod 555 $(DESTDIR)$(libexecdir)/gnats/gnatsd ; \
--	else \
--	  echo "*** Warning: must make queue-pr and gen-index suid $(GNATS_USER)." ; \
--	fi
+-# We need to link in defaults database config files for for mkdb
++# this gets done by the pkgsrc framework
+ install-data-hook:
+-	-mkdir -p $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/defaults && \
+-	for i in $(dist_pkgdata_DATA) $(pkgdata_DATA) ; do \
+-		ln -s $(pkgdatadir)/$$i \
+-			$(DESTDIR)/$(sysconfdir)/$(PACKAGE)/defaults || true; \
+-	done
+-	for i in databases gnatsd.user_access gnatsd.host_access send-pr.conf ; do \
+-		if [ ! -e $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/$$i ] ; then \
+-			${INSTALL_DATA} $(DESTDIR)$(pkgdatadir)/$$i $(DESTDIR)/$(sysconfdir)/$(PACKAGE); \
+-		fi; \
+-	done
++	:
  
- # regex.c is pretty badly broken, and I don't feel like fixing it.
- regex.o: $(srcdir)/regex.c
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/databases/gnats/patches/patch-ab b/databases/gnats/patches/patch-ab
deleted file mode 100644
index 1abe8527bb1..00000000000
--- a/databases/gnats/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/08/27 22:24:02 recht Exp $
-
---- send-pr/Makefile.in.orig	2005-02-24 19:49:23.000000000 +0100
-+++ send-pr/Makefile.in
-@@ -55,7 +55,7 @@ RANLIB = ranlib
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 
- CFLAGS = -g
- LDFLAGS = -g
-@@ -121,11 +121,11 @@ install-norm-arch-dep: all
- 	$(INSTALL_DATA) send-pr.1 $(DESTDIR)$(man1dir)/send-pr.1
- 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(man8dir)/
- 	$(INSTALL_DATA) install-sid.8 $(DESTDIR)$(man8dir)/install-sid.8
--	$(INSTALL_DATA) $(srcdir)/send-pr.conf $(DESTDIR)$(sysconfdir)/gnats/
-+	$(INSTALL_DATA) $(srcdir)/send-pr.conf %%EGDIR%%
- 
- uninstall:
- 	-rm -f $(DESTDIR)$(bindir)/send-pr $(DESTDIR)$(bindir)/install-sid
--	-rm -f $(DESTDIR)$(sysconfdir)/gnats/send-pr.conf
-+	-rm -f %%EGDIR%%/send-pr.conf
- 	-rmdir $(DESTDIR)$(datadir)/gnats
- 	-rm -f $(DESTDIR)$(man1dir)/send-pr.1
- 	-rm -f $(DESTDIR)$(man1dir)/install-sid.8
diff --git a/databases/gnats/patches/patch-ac b/databases/gnats/patches/patch-ac
deleted file mode 100644
index 8a0c0c4685a..00000000000
--- a/databases/gnats/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/08/27 22:24:02 recht Exp $
-
---- gnats/mkdb.sh.orig	2002-10-27 20:45:37.000000000 +0100
-+++ gnats/mkdb.sh
-@@ -24,7 +24,7 @@
- 
- GNATS_USER=xGNATS_USERx
- DATABASES=xGLOBAL_DB_LIST_FILEx
--DATADIR=xSYSCONFDIRx/gnats/defaults
-+DATADIR=%%GNATS_DEFAULTS%%
- LIBEXECDIR=xLIBEXECDIRx
- 
- domkdir() {
diff --git a/databases/gnats/patches/patch-ad b/databases/gnats/patches/patch-ad
deleted file mode 100644
index 817b9fa9ea0..00000000000
--- a/databases/gnats/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/08/27 22:24:02 recht Exp $
-
---- gnats/mkcat.sh.orig	2001-07-30 20:42:04.000000000 +0200
-+++ gnats/mkcat.sh
-@@ -36,7 +36,8 @@ while [ $# -gt 0 ]; do
- done
- 
- 
--GNATS_DB_DIR="`query-pr --print-directory-for-database`"
-+QUERY_PR="xBINDIRx/query-pr"
-+GNATS_DB_DIR="`$QUERY_PR --print-directory-for-database`"
- 
- # verify gnats root
- if [ ! -d ${GNATS_DB_DIR} ] ; then
-@@ -44,7 +45,7 @@ if [ ! -d ${GNATS_DB_DIR} ] ; then
-    exit 1
- fi
- 
--query-pr --list-categories | awk -F: '{print $1}' | while read i
-+$QUERY_PR --list-categories | awk -F: '{print $1}' | while read i
- do
-     if test -d "$GNATS_DB_DIR/$i"; then
- 	true
diff --git a/databases/gnats/patches/patch-ah b/databases/gnats/patches/patch-ah
deleted file mode 100644
index a217fb63ada..00000000000
--- a/databases/gnats/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2009/11/17 04:37:02 obache Exp $
-
---- gnats/edit-pr.sh.orig	2002-05-26 17:32:02.000000000 +0200
-+++ gnats/edit-pr.sh
-@@ -169,7 +169,7 @@ do
- 	    type="`$QUERY_PR --field-type $field`"
- 	    case $type in
- 		[Ee][Nn][Uu][Mm])
--		    values=`$QUERY_PR --valid-values $field | tr '\n' ' ' | sed 's/ *$//g; s/ / | /g;s/^/[ /;s/$/ ]/;`
-+		    values=`$QUERY_PR --valid-values $field | tr '\n' ' ' | sed 's/ *$//g; s/ / | /g;s/^/[ /;s/$/ ]/;'`
- 		    valslen=`echo "$values" | wc -c`
- 		    if [ "$valslen" -gt 160 ]
- 		    then
diff --git a/databases/gnats/patches/patch-configure b/databases/gnats/patches/patch-configure
new file mode 100644
index 00000000000..35a99243ba2
--- /dev/null
+++ b/databases/gnats/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2015/04/19 19:35:00 spz Exp $
+
+'=' compat fix
+
+--- configure.orig	2015-02-27 02:10:23.000000000 +0000
++++ configure
+@@ -6349,7 +6349,7 @@ fi
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
+-if test "x$LEX" == "flex" ; then
++if test "x$LEX" = "flex" ; then
+ 	# Lex options - use -X
+ 	FLEX_LFLAGS="-X"
+ 	FLEX_CFLAGS="-D_POSIX_SOURCE=1"
diff --git a/databases/gnats/patches/patch-gnats_configure b/databases/gnats/patches/patch-gnats_configure
deleted file mode 100644
index 8c9bc3b9870..00000000000
--- a/databases/gnats/patches/patch-gnats_configure
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-gnats_configure,v 1.2 2013/12/01 23:27:11 bsiegert Exp $
-
-Fix detection of unsetenv on MirBSD.
---- gnats/configure.orig	Sun Mar  6 20:38:26 2005
-+++ gnats/configure
-@@ -4005,12 +4005,12 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+const char *foo(const char *x) { return x; }
-+int bar(const char *x) { return x == foo(x); }
- 
- int
- main ()
- {
--const char *foo(const char *x) { return x; }
--                int bar(const char *x) { return x == foo(x); }
-   ;
-   return 0;
- }
-@@ -4979,7 +4979,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "\<unsetenv\>" >/dev/null 2>&1; then
-+  $EGREP "unsetenv" >/dev/null 2>&1; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DECL_UNSETENV 1
diff --git a/databases/gnats/patches/patch-gnats_ds-file_mkcat.sh b/databases/gnats/patches/patch-gnats_ds-file_mkcat.sh
new file mode 100644
index 00000000000..67ec9e02a89
--- /dev/null
+++ b/databases/gnats/patches/patch-gnats_ds-file_mkcat.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-gnats_ds-file_mkcat.sh,v 1.1 2015/04/19 19:35:00 spz Exp $
+
+use full path
+
+--- gnats/ds-file/mkcat.sh.orig	2014-12-28 19:02:35.000000000 +0000
++++ gnats/ds-file/mkcat.sh
+@@ -38,7 +38,7 @@ while [ "$#" -gt 0 ]; do
+   shift
+ done
+ 
+-QUERY_PR="query-pr"
++QUERY_PR="xBINDIRx/query-pr"
+ GNATS_DB_DIR=`"$QUERY_PR" --print-directory-for-database` || exit
+ 
+ # verify gnats root
diff --git a/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh b/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh
new file mode 100644
index 00000000000..376f8c07bd6
--- /dev/null
+++ b/databases/gnats/patches/patch-gnats_ds-file_mkdb.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-gnats_ds-file_mkdb.sh,v 1.1 2015/04/19 19:35:00 spz Exp $
+
+pkgsrcification
+
+--- gnats/ds-file/mkdb.sh.orig	2015-01-17 16:41:05.000000000 +0000
++++ gnats/ds-file/mkdb.sh
+@@ -27,7 +27,7 @@ export PATH
+ 
+ GNATS_USER=@GNATS_USER@
+ DATABASES=@GLOBAL_DB_LIST_FILE@
+-DEFAULTSDIR="@sysconfdir@/gnats/defaults"
++DEFAULTSDIR="%%GNATS_DEFAULTS%%"
+ 
+ domkdir() {
+     mkdir -p "$1" || { echo "Can't create directory $1, exiting"; exit 1 ; }
diff --git a/databases/gnats/patches/patch-ae b/databases/gnats/patches/patch-gnats_ds-file_rmcat.sh
index 4d3f05c7bc5..c52d96d88d6 100644
--- a/databases/gnats/patches/patch-ae
+++ b/databases/gnats/patches/patch-gnats_ds-file_rmcat.sh
@@ -1,8 +1,10 @@
-$NetBSD: patch-ae,v 1.3 2005/08/27 22:24:02 recht Exp $
+$NetBSD: patch-gnats_ds-file_rmcat.sh,v 1.1 2015/04/19 19:35:00 spz Exp $
 
---- gnats/rmcat.sh.orig	2001-07-30 20:42:04.000000000 +0200
-+++ gnats/rmcat.sh
-@@ -25,7 +25,8 @@ if [ $# -eq 0 ]; then
+call query-pr with full path
+
+--- gnats/ds-file/rmcat.sh.orig	2014-12-28 19:02:36.000000000 +0000
++++ gnats/ds-file/rmcat.sh
+@@ -28,7 +28,8 @@ if [ $# -eq 0 ]; then
    exit 1
  fi
  
@@ -12,7 +14,7 @@ $NetBSD: patch-ae,v 1.3 2005/08/27 22:24:02 recht Exp $
  
  if [ ! -d "$GNATS_DB_DIR" ]
  then
-@@ -34,7 +35,7 @@ then
+@@ -37,7 +38,7 @@ then
  fi
  
  for i in "$@"; do
diff --git a/databases/gnats/patches/patch-gnats_edit-pr.sh b/databases/gnats/patches/patch-gnats_edit-pr.sh
new file mode 100644
index 00000000000..b173796a861
--- /dev/null
+++ b/databases/gnats/patches/patch-gnats_edit-pr.sh
@@ -0,0 +1,54 @@
+$NetBSD: patch-gnats_edit-pr.sh,v 1.1 2015/04/19 19:35:00 spz Exp $
+
+clean up temp files
+
+--- gnats/edit-pr.sh.orig	2015-02-26 04:26:41.000000000 +0000
++++ gnats/edit-pr.sh
+@@ -213,6 +213,7 @@ $VISUAL $new
+ if cmp -s $new.old $new ; then
+   echo "edit-pr: PR not changed"
+   $PR_EDIT --unlock $pr_id
++  rm $new $new.old
+   exit 0
+ fi
+ 
+@@ -239,6 +240,7 @@ while [ "$checking" != "" ]; do
+         echo "PR $pr_id not updated: changed file is in $new.changed"
+         mv $new $new.changed
+ 	$PR_EDIT --unlock $pr_id
++        rm $new $new.old
+         exit 0
+         ;;
+     esac
+@@ -269,6 +271,7 @@ done
+ if [ -f $change_msg ]
+ then
+     cat $change_msg >> $new
++    rm $change_msg
+ fi
+ 
+ if email=`$QUERY_PR \
+@@ -290,6 +293,7 @@ while true; do
+ 	echo "Edit successful"
+ 	# we need to unlock the PR
+ 	$PR_EDIT --unlock $pr_id
++        rm $new $new.old
+ 	exit 0
+     else
+ 	echo "Problems with edit submission."
+@@ -302,6 +306,7 @@ while true; do
+ 		echo "Cancelling edit.  Changed PR is in $new."
+ 		# we need to ulock the PR no matter what
+ 		$PR_EDIT --unlock $pr_id
++                rm $new.old
+ 		exit 1 ;;
+ 	    r*)
+ 		break ;;
+@@ -312,6 +317,6 @@ while true; do
+     done
+ done
+ 
+-rm -f $new
++rm -f $new $new.old
+ 
+ exit 0
diff --git a/databases/gnats/patches/patch-gnats_gnats_h b/databases/gnats/patches/patch-gnats_gnats_h
index 3fbc60246fc..1db69a8149e 100644
--- a/databases/gnats/patches/patch-gnats_gnats_h
+++ b/databases/gnats/patches/patch-gnats_gnats_h
@@ -1,10 +1,10 @@
-$NetBSD: patch-gnats_gnats_h,v 1.1 2011/08/01 05:19:12 dholland Exp $
+$NetBSD: patch-gnats_gnats_h,v 1.2 2015/04/19 19:35:00 spz 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.orig	2015-02-26 04:26:41.000000000 +0000
 +++ gnats/gnats.h
-@@ -137,9 +137,6 @@ char *alloca ();
+@@ -146,9 +146,6 @@ char *alloca ();
  # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
  #endif
  
diff --git a/databases/gnats/patches/patch-makefile_in b/databases/gnats/patches/patch-makefile_in
deleted file mode 100644
index 152423140dc..00000000000
--- a/databases/gnats/patches/patch-makefile_in
+++ /dev/null
@@ -1,77 +0,0 @@
-$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