8 files changed, 64 insertions, 87 deletions

diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 5973cdd203b3..34d8186fcc62 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=		gnats
-PORTVERSION=		4.0.1
-PORTREVISION=		0
+PORTVERSION=		4.1.0
 CATEGORIES=		databases devel
-MASTER_SITES=		http://savannah.gnu.org/download/%SUBDIR%/ \
-			${MASTER_SITE_GNU}
+MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnats
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		vd@datamax.bg
 COMMENT=		GNATS, the GNU Problem Report Management System
 
 GNU_CONFIGURE=		yes
@@ -58,8 +56,8 @@ PLIST_SUB=		GNATSDBDIR=${GNATSDBDIR}
 MAN1=			edit-pr.1 query-pr.1 send-pr.1
 MAN5=			databases.5 dbconfig.5
 MAN7=			gnats.7
-MAN8=			delete-pr.8 file-pr.8 gen-index.8 gnatsd.8 \
-			mkcat.8 mkdb.8 pr-edit.8 queue-pr.8 rmcat.8
+MAN8=			delete-pr.8 getclose.8 file-pr.8 gen-index.8 gnatsd.8 \
+			install-sid.8 mkcat.8 mkdb.8 pr-edit.8 queue-pr.8 rmcat.8
 INFO=			gnats-faq gnats
 DOCFILES=		NEWS UPGRADING
 
diff --git a/databases/gnats4/distinfo b/databases/gnats4/distinfo
index 45c5d541b002..5dd531e632bc 100644
--- a/databases/gnats4/distinfo
+++ b/databases/gnats4/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnats-4.0.1.tar.gz) = dbc0cb263f9427f01050331736f3e238
-SIZE (gnats-4.0.1.tar.gz) = 1477650
+MD5 (gnats-4.1.0.tar.gz) = 2add3df79336f2e193c8a9a513aefe22
+SIZE (gnats-4.1.0.tar.gz) = 1221364
diff --git a/databases/gnats4/files/patch-Makefile.in b/databases/gnats4/files/patch-Makefile.in
index d2dba6605986..63e93a91e0d9 100644
--- a/databases/gnats4/files/patch-Makefile.in
+++ b/databases/gnats4/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Mon Sep 22 05:52:58 2003
-+++ Makefile.in	Mon Sep 22 05:53:13 2003
-@@ -50,7 +50,7 @@
+--- Makefile.in.orig	Mon Aug  1 14:22:39 2005
++++ Makefile.in	Mon Aug  1 14:22:58 2005
+@@ -48,7 +48,7 @@
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' $@
  
- install-tools: $(LIBIBERTY)
+ install-tools:
 -	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' $@
 +	for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
  
diff --git a/databases/gnats4/files/patch-gnats::Makefile.in b/databases/gnats4/files/patch-gnats::Makefile.in
index bc417e681d43..eeab9d3c2608 100644
--- a/databases/gnats4/files/patch-gnats::Makefile.in
+++ b/databases/gnats4/files/patch-gnats::Makefile.in
@@ -1,6 +1,6 @@
---- gnats/Makefile.in.orig	Sun Jul 27 01:23:17 2003
-+++ gnats/Makefile.in	Thu Sep 25 02:30:32 2003
-@@ -91,7 +91,7 @@
+--- gnats/Makefile.in.orig	Thu Feb 24 22:35:55 2005
++++ gnats/Makefile.in	Mon Aug  1 15:08:51 2005
+@@ -93,7 +93,7 @@
  
  INSTALL = $(srcdir)/../install-sh -c
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -9,7 +9,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  
  SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'`
-@@ -107,6 +107,7 @@
+@@ -109,6 +109,7 @@
  libdir = @libdir@
  libexecdir = @libexecdir@
  statedir = @datadir@
@@ -17,84 +17,84 @@
  sysconfdir = @sysconfdir@
  
  program_transform_name =
-@@ -163,7 +164,7 @@
+@@ -162,7 +163,7 @@
  	check-db delete-pr dbconfig gnats-databases gnats-pwconv $(EXTRA_STUFF)
  
  all-tools: libgnats.a query-pr pr-age pr-edit edit-pr file-pr getclose \
--	config-send-pr mail-agent dbconfig
-+	mail-agent dbconfig
+-	config-send-pr mail-agent dbconfig diff-prs
++	mail-agent dbconfig diff-prs
  
  libgnats.a: $(LIBOBJS)
  	-rm -f tmplibgnats.a libgnats.a
-@@ -363,15 +364,17 @@
+@@ -368,15 +369,17 @@
  install-tools-arch-dep: install-tools-bin
  
  install-tools-arch-indep: all-tools
--	$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gnats
-+	$(SHELL) $(srcdir)/../mkinstalldirs $(sharedstatedir)
- 	$(SHELL) $(srcdir)/../mkinstalldirs $(sysconfdir)/gnats/defaults
+-	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnats
++	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sharedstatedir)/gnats
+ 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sysconfdir)/gnats/defaults
  	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
--	  echo "chown $(GNATS_USER) $(datadir)/gnats" ; \
--	  chown $(GNATS_USER) $(datadir)/gnats ; \
-+	  echo "chown $(GNATS_USER) $(sharedstatedir)" ; \
-+	  chown $(GNATS_USER) $(sharedstatedir) ; \
+-	  echo "chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \
+-	  chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats ; \
++	  echo "chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \
++	  chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats ; \
          else \
--	  echo "*** Warning: Must chown $(GNATS_USER) $(datadir)/gnats" ; \
-+	  echo "*** Warning: Must chown $(GNATS_USER) $(sharedstatedir)" ; \
+-	  echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \
++	  echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \
 +	fi
 +	@if [ x"$(lispdir)" != x ]; then \
-+	  $(INSTALL_DATA) $(srcdir)/gnats.el $(lispdir)/gnats.el ; \
++	  $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el ; \
  	fi
--	$(INSTALL_DATA) $(srcdir)/gnats.el $(lispdir)/gnats.el
+-	$(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 $(sysconfdir)/gnats/defaults/$$i ; \
-@@ -386,7 +389,7 @@
- 	$(INSTALL_SCRIPT) edit-pr $(bindir)/edit-pr
- 	$(INSTALL_SCRIPT) $(srcdir)/diff-prs $(libexecdir)/gnats/diff-prs
- 	$(INSTALL_SCRIPT) mail-agent $(libexecdir)/gnats/mail-agent
--	$(INSTALL_PROGRAM) file-pr $(libexecdir)/gnats/file-pr
-+	$(INSTALL_SCRIPT) file-pr $(libexecdir)/gnats/file-pr
- 	$(INSTALL_PROGRAM) pr-age $(libexecdir)/gnats/pr-age
- 	$(INSTALL_PROGRAM) pr-edit $(libexecdir)/gnats/pr-edit
+ 		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
+@@ -391,7 +394,7 @@
+ 	$(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 \
-@@ -404,29 +407,29 @@
+@@ -409,29 +412,29 @@
  install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL)
  
  install-gnats-arch-indep: all-gnats install-tools-arch-indep
--	@if [ -f $(GLOBAL_DB_LIST_FILE) ]; then \
--	  echo "Not putting gnats-databases file in $(GLOBAL_DB_LIST_FILE), it's already there." ; \
-+	@if [ -f $(GLOBAL_DB_LIST_FILE).default ]; then \
-+	  echo "Not putting gnats-databases file in $(GLOBAL_DB_LIST_FILE).default, it's already there." ; \
+-	@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 $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ]; then \
++	  echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default, it's already there." ; \
  	  true ; \
  	else \
  	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
  	    $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \
--	                    $(GLOBAL_DB_LIST_FILE) ; \
-+	                    $(GLOBAL_DB_LIST_FILE).default ; \
+-	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
++	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
  	  else \
--	    $(INSTALL_DATA) gnats-databases $(GLOBAL_DB_LIST_FILE) ; \
--	    echo "*** Warning: Must chown $(GNATS_USER) $(GLOBAL_DB_LIST_FILE)" ; \
-+	    $(INSTALL_DATA) gnats-databases $(GLOBAL_DB_LIST_FILE).default ; \
-+	    echo "*** Warning: Must chown $(GNATS_USER) $(GLOBAL_DB_LIST_FILE).default" ; \
+-	    $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
+-	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE)" ; \
++	    $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
++	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default" ; \
  	  fi \
  	fi
--	@if [ -f $(GNATSD_HOST_ACCESS_FILE) ]; then \
--	   echo "Not putting gnats.host_access file in $(GNATSD_HOST_ACCESS_FILE), it's already there." ; \
-+	@if [ -f $(GNATSD_HOST_ACCESS_FILE).default ]; then \
-+	   echo "Not putting gnats.host_access file in $(GNATSD_HOST_ACCESS_FILE).default, it's already there." ; \
+-	@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 $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ]; then \
++	   echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default, it's already there." ; \
  	   true ; \
  	else \
  	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
  	    $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \
--	                    $(GNATSD_HOST_ACCESS_FILE) ; \
-+	                    $(GNATSD_HOST_ACCESS_FILE).default ; \
+-	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
++	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \
            else \
  	    $(INSTALL_DATA) $(srcdir)/gnatsd.host_access \
--	                    $(GNATSD_HOST_ACCESS_FILE) ; \
--	    echo "*** Warning: Must chown $(GNATS_USER) $(GNATSD_HOST_ACCESS_FILE)" ; \
-+	                    $(GNATSD_HOST_ACCESS_FILE).default ; \
-+	    echo "*** Warning: Must chown $(GNATS_USER) $(GNATSD_HOST_ACCESS_FILE).default" ; \
+-	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
+-	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE)" ; \
++	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \
++	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default" ; \
  	  fi \
  	fi
  	@echo "*** If you're a first-time user, you'll want to create a new database";
diff --git a/databases/gnats4/files/patch-gnats::configure b/databases/gnats4/files/patch-gnats::configure
deleted file mode 100644
index 163b91ec3d72..000000000000
--- a/databases/gnats4/files/patch-gnats::configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnats/configure.orig	Sun Sep 21 13:17:44 2003
-+++ gnats/configure	Sun Sep 21 13:18:30 2003
-@@ -2864,7 +2864,7 @@
- fi
- 
- if test "x$GCC" = "xyes" ; then
--	GCC_CFLAGS="-W -Wall -ansi -pedantic  -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wno-format"
-+	GCC_CFLAGS="-W -Wall -ansi -pedantic  -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wno-format -Wno-long-long"
- fi
- 
- # ***** Guess the configuration *****
diff --git a/databases/gnats4/files/patch-libiberty::configure b/databases/gnats4/files/patch-libiberty::configure
deleted file mode 100644
index afb4cfa0b9d2..000000000000
--- a/databases/gnats4/files/patch-libiberty::configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- libiberty/configure.orig	Tue Dec 11 00:03:27 2001
-+++ libiberty/configure	Fri Aug 22 16:07:09 2003
-@@ -836,7 +836,7 @@
-
- if test $ac_cv_prog_gcc = yes; then
-   GCC=yes
--  ac_libiberty_warn_cflags='-W -Wall -Wtraditional -pedantic'
-+  ac_libiberty_warn_cflags='-W -Wall -Wno-long-long -pedantic'
-   ac_test_CFLAGS="${CFLAGS+set}"
-   ac_save_CFLAGS="$CFLAGS"
-   CFLAGS=
diff --git a/databases/gnats4/files/patch-send-pr::Makefile.in b/databases/gnats4/files/patch-send-pr::Makefile.in
index c22b3208f169..3c9c686174e6 100644
--- a/databases/gnats4/files/patch-send-pr::Makefile.in
+++ b/databases/gnats4/files/patch-send-pr::Makefile.in
@@ -1,6 +1,6 @@
---- send-pr/Makefile.in.orig	Sun Sep 21 19:02:06 2003
-+++ send-pr/Makefile.in	Sun Sep 21 19:02:24 2003
-@@ -59,7 +59,7 @@
+--- send-pr/Makefile.in.orig	Mon Aug  1 12:54:35 2005
++++ send-pr/Makefile.in	Mon Aug  1 12:53:52 2005
+@@ -55,7 +55,7 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
diff --git a/databases/gnats4/pkg-plist b/databases/gnats4/pkg-plist
index 059e24e2eab0..277c7cb9617c 100644
--- a/databases/gnats4/pkg-plist
+++ b/databases/gnats4/pkg-plist
@@ -18,6 +18,7 @@ etc/gnats/defaults/gnatsd.user_access
 etc/gnats/defaults/responsible
 etc/gnats/defaults/states
 etc/gnats/defaults/submitters
+etc/gnats/send-pr.conf
 @dirrm etc/gnats/defaults
 @unexec rmdir %D/etc/gnats 2>/dev/null || true
 %%SERVER%%libexec/gnats/at-pr