Finally upgrade to the "beta" release with remote machine support

7 files changed, 137 insertions, 152 deletions

diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 9cc1ebf700a8..4a4f4eb37b9b 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,23 +1,25 @@
 # New ports collection makefile for:	gnats
-# Version required:     3.2
-# Date created:		28 October 1995
+# Version required:     3.97-beta
+# Date created:		10 November 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.3 1995/11/22 11:41:26 asami Exp $
+# $Id: Makefile,v 1.2 1995/11/02 08:07:29 asami Exp $
 #
 
-DISTNAME=       gnats-3.2
-CATEGORIES+=	databases devel
-MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ \
-		ftp://ftp.uu.net/systems/gnu/
+DISTNAME=       gnats-3.97-beta
+CATEGORIES+=	databases
+MASTER_SITES=   ftp://ftp.cygnus.com/pub/
 
 # we've got some .elc and info files to compile (yuck)
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
+BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs \
+		gm4:${PORTSDIR}/devel/m4
 
-NO_PACKAGE=	yes	# requires user "gnats"
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
-CONFIGURE_ARGS= --prefix=${PREFIX} --with-full-gnats
+CONFIGURE_ARGS= --prefix=${PREFIX} \
+		--with-lispdir=${PREFIX}/share/emacs/site-lisp \
+		--with-full-gnats
 
 # this stops the configuration program from pulling installation
 # information in from the standard freebsd send-pr program
@@ -27,4 +29,12 @@ CONFIGURE_ENV=  SEND_PR=/usr/bin/false
 # just install gnats
 INSTALL_TARGET=	install-gnats install-send-pr
 
+post-build:
+	(cd ${WRKSRC}/gnats;   ${MAKE} info)
+	(cd ${WRKSRC}/send-pr; ${MAKE} info)
+
+post-install:
+	(cd ${WRKSRC}/gnats;   ${MAKE} install-info)
+	(cd ${WRKSRC}/send-pr; ${MAKE} install-info)
+
 .include <bsd.port.mk>
diff --git a/databases/gnats/distinfo b/databases/gnats/distinfo
index 16bfbc7d99e5..8670442ef66f 100644
--- a/databases/gnats/distinfo
+++ b/databases/gnats/distinfo
@@ -1 +1 @@
-MD5 (gnats-3.2.tar.gz) = 7eed736a5819b0a7b90e35366c765211
+MD5 (gnats-3.97-beta.tar.gz) = cbe397249a54ba797efd7b2598a65d14
diff --git a/databases/gnats/files/patch-aa b/databases/gnats/files/patch-aa
index 869db9b4221c..8a67b5698cc2 100644
--- a/databases/gnats/files/patch-aa
+++ b/databases/gnats/files/patch-aa
@@ -1,59 +1,59 @@
-*** config.guess	Tue Nov 16 12:43:37 1993
---- config.guess	Fri Oct 27 23:22:19 1995
+*** gnats/Makefile.in	Fri Oct 13 17:53:38 1995
+--- gnats/Makefile.in	Tue Oct 31 09:01:49 1995
 ***************
-*** 174,179 ****
---- 174,183 ----
-      i[34]86:NetBSD:*:*)
-  	echo ${UNAME_MACHINE}-unknown-netbsd${UNAME_RELEASE}
-  	exit 0 ;;
-+     i[34]86:FreeBSD:*:*)
-+ 	foo=`echo ${UNAME_RELEASE}|sed -e 's/-.*//'`
-+ 	echo ${UNAME_MACHINE}-unknown-freebsd${foo}
-+ 	exit 0 ;;
-      i[34]86:Linux:*:*)
-  	echo ${UNAME_MACHINE}-unknown-linux
-  	exit 0 ;;
-*** config.sub	Fri Dec 10 12:01:41 1993
---- config.sub	Fri Oct 27 23:20:27 1995
+*** 130,136 ****
+  LIBS = @LIBS@
+  KRBINCLUDE = @KRBINCLUDE@
+  
+! M4 = m4
+  MAKEINFO = makeinfo
+  TEXI2DVI = texi2dvi
+  
+--- 130,136 ----
+  LIBS = @LIBS@
+  KRBINCLUDE = @KRBINCLUDE@
+  
+! M4 = gm4
+  MAKEINFO = makeinfo
+  TEXI2DVI = texi2dvi
+
+
+*** Makefile.in	Fri Oct 13 17:53:35 1995
+--- Makefile.in	Sat Nov 11 10:57:42 1995
 ***************
-*** 228,233 ****
---- 223,232 ----
-  		basic_machine=i386-unknown		# CYGNUS LOCAL
-  		os=-netbsd
-  		;;
-+ 	freebsd386)
-+ 		basic_machine=i386-unknown		# CYGNUS LOCAL
-+ 		os=-freebsd
-+ 		;;
-  	spur)
-  		basic_machine=spur-unknown
-  		;;
+*** 96,104 ****
+  	then echo $$r/flex/flex ; \
+  	else echo flex ; fi`
+  
+! M4 = `if [ -f $$r/m4/m4 ] ; \
+! 	then echo $$r/m4/m4 ; \
+! 	else echo m4 ; fi`
+  
+  MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
+  	then echo $$r/texinfo/makeinfo/makeinfo ; \
+--- 96,102 ----
+  	then echo $$r/flex/flex ; \
+  	else echo flex ; fi`
+  
+! M4 = gm4
+  
+  MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
+  	then echo $$r/texinfo/makeinfo/makeinfo ; \
 ***************
-*** 694,700 ****
-  	      | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-  	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-  	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-! 	      | -hiux* | -386bsd* | -netbsd* | -riscix* | -lynxos* \
-  	      | -go32 | -sim | -es1800* | -udi | -hms* | -xray | -hds* \
-  	      | -os68k* | -none* | -v88r* | -aout* | -coff | -elf* | -bosx* \
-  	      | -abug | -ecoff* | -netware* )
---- 693,699 ----
-  	      | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-  	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-  	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-! 	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* | -lynxos* \
-  	      | -go32 | -sim | -es1800* | -udi | -hms* | -xray | -hds* \
-  	      | -os68k* | -none* | -v88r* | -aout* | -coff | -elf* | -bosx* \
-  	      | -abug | -ecoff* | -netware* )
-***************
-*** 724,729 ****
---- 723,731 ----
-  	-386bsd)					# CYGNUS LOCAL
-  		os=-bsd
-  		;;
-+ 	-freebsd*)
-+ 		os=-bsd
-+ 		;;
-  	-ctix* | -uts*)
-  		os=-sysv
-  		;;
+*** 1017,1024 ****
+  
+  MAKEDIRS= \
+  	$(prefix) \
+! 	$(exec_prefix) \
+! 	$(tooldir)
+  
+  .PHONY: install-dirs
+  install-dirs:
+--- 1015,1021 ----
+  
+  MAKEDIRS= \
+  	$(prefix) \
+! 	$(exec_prefix)
+  
+  .PHONY: install-dirs
+  install-dirs:
diff --git a/databases/gnats/files/patch-ab b/databases/gnats/files/patch-ab
index a8bb39f49661..d6d82cfe0332 100644
--- a/databases/gnats/files/patch-ab
+++ b/databases/gnats/files/patch-ab
@@ -1,79 +1,42 @@
---- ./gnats/Makefile.in.org	Fri Dec 10 14:29:14 1993
-+++ ./gnats/Makefile.in	Tue Jul  9 23:07:57 1996
-@@ -127,7 +127,7 @@
- INSTALL_PROGRAM = $(INSTALL)
- INSTALL_DATA = $(INSTALL) -m 644
- 
--CFLAGS = -g
-+CFLAGS += -g
- LDFLAGS = $(CFLAGS)
- 
- prefix = /usr/local
-@@ -141,7 +141,7 @@
- program_transform_name =
- 
- # Edit this to be the location of your emacs lisp files.
--lispdir = $(datadir)/emacs/lisp
-+lispdir = $(exec_prefix)/share/emacs/site-lisp
- 
- datadir = $(prefix)/lib
- mandir = $(prefix)/man
-@@ -402,7 +402,7 @@
- 	  echo "*** Warning: Must make pr-edit suid gnats" ; \
- 	fi
- 
--EXTRA_INSTALL =
-+EXTRA_INSTALL = install-info
- 
- install-gnats: install-gnats-bin install-gnats-man $(EXTRA_INSTALL)
- 
---- ./send-pr/Makefile.in.org	Fri Dec 10 12:03:32 1993
-+++ ./send-pr/Makefile.in	Tue Jul  9 23:12:14 1996
-@@ -64,7 +64,7 @@
- INSTALL_PROGRAM = $(INSTALL)
- INSTALL_DATA = $(INSTALL) -m 644
- 
--CFLAGS = -g
-+CFLAGS += -g
- LDFLAGS = -g
- 
- ECHON = @ECHON@
-@@ -79,7 +79,7 @@
- program_transform_name =
- 
- # Edit this to be the location of your emacs lisp files.
--lispdir = $(datadir)/emacs/lisp
-+lispdir = $(exec_prefix)/share/emacs/site-lisp
- 
- datadir = $(prefix)/lib
- mandir = $(prefix)/man
-@@ -146,7 +146,7 @@
- 
- install: $(SEND_PR_INSTALL)
- install-tools: install-norm install-categories
--install-gnats: install-norm install-gnats-dist install-categories
-+install-gnats: install-norm install-gnats-dist install-categories install-info
- 
- install-norm all-gnats:
- 	$(INSTALL_PROGRAM) send-pr $(bindir)/send-pr
---- ./Makefile.in.org	Fri Dec 10 12:03:54 1993
-+++ ./Makefile.in	Tue Jul  9 23:07:18 1996
-@@ -57,7 +57,7 @@
- 
- # We don't specify -g -O because many compilers don't support -g -O,
- # and/or -O is broken in and of itself.
--CFLAGS = -g
-+CFLAGS += -g
- 
- CXX = gcc
- 
-@@ -854,8 +854,7 @@
- 
- MAKEDIRS= \
- 	$(prefix) \
--	$(exec_prefix) \
--	$(tooldir)
-+	$(exec_prefix)
- 
- .PHONY: install-dirs
- install-dirs:
+Install lisp files in share/emacs/site-lisp if it exists.
+
+*** send-pr/aclocal.m4	Fri Jul  7 13:52:09 1995
+--- send-pr/aclocal.m4	Sat Nov 11 10:44:36 1995
+***************
+*** 36,43 ****
+  if test -n "$with_lispdir"; then
+    LISPDIR=${with_lispdir}
+  else
+!   for f in ${prefix-/usr/local}/lib/emacs/site-lisp \
+! 	   ${prefix-/usr/local}/lib/emacs/lisp; do
+      if test -d $f; then
+        if test -n "$prefix"; then
+  	LISPDIR=`echo $f | sed "s,^$prefix,"'$(prefix),'`
+--- 36,45 ----
+  if test -n "$with_lispdir"; then
+    LISPDIR=${with_lispdir}
+  else
+!   for f in ${prefix-/usr/local}/share/emacs/site-lisp \
+! 	   ${prefix-/usr/local}/share/emacs/lisp \
+! 	   ${prefix-/usr/local}/lib/emacs/site-lisp \
+! 	   ${prefix-/usr/local}/lib/emacs/lisp ; do
+      if test -d $f; then
+        if test -n "$prefix"; then
+  	LISPDIR=`echo $f | sed "s,^$prefix,"'$(prefix),'`
+***************
+*** 50,56 ****
+  fi
+  if test -z "$LISPDIR"; then
+  dnl # Change this default when Emacs 19 has been around for a while
+!   LISPDIR='$(prefix)/lib/emacs/lisp'
+  fi
+  AC_MSG_RESULT(${LISPDIR})
+  AC_SUBST(LISPDIR)dnl
+--- 52,58 ----
+  fi
+  if test -z "$LISPDIR"; then
+  dnl # Change this default when Emacs 19 has been around for a while
+!   LISPDIR='$(prefix)/lib/emacs/site-lisp'
+  fi
+  AC_MSG_RESULT(${LISPDIR})
+  AC_SUBST(LISPDIR)dnl
diff --git a/databases/gnats/pkg-comment b/databases/gnats/pkg-comment
index 8dcc03a67e9c..5714334744c6 100644
--- a/databases/gnats/pkg-comment
+++ b/databases/gnats/pkg-comment
@@ -1 +1 @@
-FSF gnats bug tracking system v3.2
+Cygnus GNATS bug tracking system v3.97-beta
diff --git a/databases/gnats/pkg-descr b/databases/gnats/pkg-descr
index e3afaa376811..ad6898e03e16 100644
--- a/databases/gnats/pkg-descr
+++ b/databases/gnats/pkg-descr
@@ -27,5 +27,7 @@ distribution and all its components.
 *** FreeBSD note:
 *** You will want to add a user entry to your /etc/passwd file for the
 *** user-id that owns gnats-related databases on your server.
-*** Something of the form: "gnats:*:70:70:GNATS Owner:/:/usr/bin/false"
-*** should do just fine.
+*** Something of the form: "gnats:*:70:70:GNATS Owner:/usr/local/lib/gnats:"
+*** should do just fine (put it in your ftpusers file!).
+***
+*** Don't forget to run /usr/local/lib/gnats/mkcat as gnats.
diff --git a/databases/gnats/pkg-plist b/databases/gnats/pkg-plist
index 36eb6d0ca6dc..7c7a0c129c81 100644
--- a/databases/gnats/pkg-plist
+++ b/databases/gnats/pkg-plist
@@ -1,6 +1,9 @@
-bin/query-pr
+@cwd /usr/local
 bin/edit-pr
 bin/send-pr
+bin/query-pr
+bin/nquery-pr
+bin/sub-type
 bin/install-sid
 info/gnats.info
 info/gnats.info-1
@@ -11,13 +14,19 @@ info/send-pr.info
 lib/gnats/gnats-db/gnats-adm/categories
 lib/gnats/gnats-db/gnats-adm/responsible
 lib/gnats/gnats-db/gnats-adm/submitters
+lib/gnats/gnats-db/gnats-adm/gnatsd.conf
 lib/gnats/gnats-db/gnats-adm/config
-lib/gnats/pr-edit
+lib/gnats/pr-age
 lib/gnats/pr-addr
-lib/gnats/dist/send-pr.sh
+lib/gnats/pr-edit
+lib/gnats/npr-edit
+lib/gnats/pr-mail
 lib/gnats/dist/COPYING
 lib/gnats/dist/README
+lib/gnats/dist/INSTALL
+lib/gnats/dist/MANIFEST
 lib/gnats/dist/send-pr-el.in
+lib/gnats/dist/send-pr.sh
 lib/gnats/dist/install-sid.sh
 lib/gnats/dist/send-pr.1
 lib/gnats/dist/send-pr.info
@@ -28,6 +37,7 @@ lib/gnats/dist/fields.texi
 lib/gnats/dist/states.texi
 lib/gnats/dist/texinfo.tex
 lib/gnats/file-pr
+lib/gnats/gnatsd
 lib/gnats/at-pr
 lib/gnats/mkcat
 lib/gnats/rmcat