4 files changed, 139 insertions, 113 deletions

diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index ff55cb825f24..cffa7fd3a392 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -1,32 +1,29 @@
 # Created by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
 # $FreeBSD$
 
-PORTNAME=		gnats
-PORTVERSION=		4.1.0
-PORTREVISION=		2
-CATEGORIES=		databases devel
-MASTER_SITES=		${MASTER_SITE_GNU}
+PORTNAME=	gnats
+PORTVERSION=	4.1.0
+PORTREVISION=	3
+CATEGORIES=	databases devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnats
+PKGNAMESUFFIX=	4
 
-MAINTAINER= ports@FreeBSD.org
-COMMENT=		GNATS, the GNU Problem Report Management System
+MAINTAINER=	portmaster@bsdforge.com
+COMMENT=	GNATS, the GNU Problem Report Management System
 
-GNU_CONFIGURE=		yes
-USES=			gmake makeinfo
+GNU_CONFIGURE=	yes
+USES=		gmake makeinfo
+USE_GCC=	any
+USERS=		gnats
 
-LATEST_LINK=		${PKGNAMEPREFIX}gnats4${PKGNAMESUFFIX}
-CONFLICTS=		gnats-3.*
-
-PKGMESSAGE=		${WRKDIR}/pkg-message
-PKGINSTALL=		${WRKDIR}/pkg-install
+PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGINSTALL=	${WRKDIR}/pkg-install
 
 .ifdef WANT_FREEFALL_CFG
 EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-*
-
 GNATSDBDIR=		${DATADIR}
-
 CONFIGURE_ARGS+=	--with-gnats-default-db=${GNATSDBDIR}/gnats-db
-
 WITH_SUBMITTER_ID=	current-users
 WITH_ORGANIZATION=	FreeBSD
 WITH_GNATSD_SERVICE=	support
@@ -48,38 +45,30 @@ CONFIGURE_ARGS+=	--with-organization=${WITH_ORGANIZATION:Q}
 CONFIGURE_ARGS+=	--with-gnats-service=${WITH_GNATSD_SERVICE}
 .endif
 
-PLIST_SUB=		GNATSDBDIR=${GNATSDBDIR}
+PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
+INFO=		gnats-faq gnats
+PORTDOCS=	NEWS UPGRADING
 
-MAN1=			edit-pr.1 query-pr.1 send-pr.1
-MAN5=			databases.5 dbconfig.5
-MAN7=			gnats.7
-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
+OPTIONS_DEFINE=	DOCS EMACS SERVER
+OPTIONS_DEFAULT=SERVER
+OPTIONS_SUB=	yes
+EMACS_USE=	EMACS=yes
+EMACS_DESC=	Add support for default version of EMACS
+SERVER_DESC=	Install the gnats server too
 
-.ifdef WITH_EMACS_PORT
-USE_EMACS=	yes
-EMACS_PORT_NAME=	${WITH_EMACS_PORT}
-CONFIGURE_ARGS+=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
-.else
-PLIST_SUB+=		EMACS_SITE_LISPDIR="@comment "
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MSERVER}
+ALL_TARGET=	all-tools
+INSTALL_TARGET=	install-tools
 .endif
 
-.ifdef CLIENT_ONLY
-ALL_TARGET=		all-tools
-INSTALL_TARGET=		install-tools
-PLIST_SUB+=		SERVER="@comment "
-PKGNAMESUFFIX=		-client
-CONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-4.*
+.if ${PORT_OPTIONS:MEMACS}
+CONFIGURE_ARGS+=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
 .else
-PLIST_SUB+=		SERVER=""
-CONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-client-4.*
+PLIST_SUB+=	EMACS_SITE_LISPDIR="@comment "
 .endif
 
-OPTIONS_DEFINE=	DOCS
-
-NO_STAGE=	yes
 pre-everything::
 .if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
 	@${ECHO} "============================================================="
@@ -89,7 +78,6 @@ pre-everything::
 	@${ECHO} "WITH_SUBMITTER_ID=unknown        default submitter-id"
 	@${ECHO} "WITH_ORGANIZATION='unknown'      default organization"
 	@${ECHO} "WITH_GNATSD_SERVICE=support      default gnatsd port name"
-	@${ECHO} "WITH_EMACS_PORT=emacs            with Emacs support"
 	@${ECHO}
 	@${ECHO} "============================================================="
 	@${ECHO}
@@ -100,26 +88,22 @@ pre-configure:
 
 post-build:
 	@for doc in pkg-message pkg-install; do \
-		${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
+		${SED} -e 's,%%PREFIX%%,${STAGEDIR}${PREFIX},g' \
 			-e 's,%%GNATSDBDIR%%,${GNATSDBDIR},g' \
-			${PKGDIR}/$${doc} >${WRKDIR}/$${doc} ; \
+			${PKGDIR}/$${doc} >${WRKDIR}/$${doc}; \
 	done
 
 pre-install:
-	@${MKDIR} ${PREFIX}/libexec/gnats
-	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
 
 post-install:
-.ifndef CLIENT_ONLY
-	@for conf in databases gnatsd.host_access; do \
-		[ -f ${PREFIX}/etc/gnats/$${conf} ] \
-		|| ${CP} ${PREFIX}/etc/gnats/$${conf}.default ${PREFIX}/etc/gnats/$${conf}; \
-	done
+.if ${PORT_OPTIONS:MSERVER}
+	${MV} ${STAGEDIR}${ETCDIR}/databases.default \
+		${STAGEDIR}${ETCDIR}/databases.sample
+	${MV} ${STAGEDIR}${ETCDIR}/gnatsd.host_access.default \
+		${STAGEDIR}${ETCDIR}/gnatsd.host_access.sample
 .endif
-	@${MKDIR} ${DOCSDIR}
-	@for doc in ${DOCFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
-	done
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/databases/gnats4/files/extrapatch-gnats::edit-pr.sh b/databases/gnats4/files/extrapatch-gnats__edit-pr.sh
index f4f7c1aa8015..f4f7c1aa8015 100644
--- a/databases/gnats4/files/extrapatch-gnats::edit-pr.sh
+++ b/databases/gnats4/files/extrapatch-gnats__edit-pr.sh
diff --git a/databases/gnats4/files/patch-gnats__Makefile.in b/databases/gnats4/files/patch-gnats__Makefile.in
index eeab9d3c2608..2a8b6c4446fe 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	Thu Feb 24 22:35:55 2005
-+++ gnats/Makefile.in	Mon Aug  1 15:08:51 2005
-@@ -93,7 +93,7 @@
+--- gnats/Makefile.in.orig	2005-02-24 20:35:55 UTC
++++ gnats/Makefile.in
+@@ -93,7 +93,7 @@ M4 = @M4@
  
  INSTALL = $(srcdir)/../install-sh -c
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -9,7 +9,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  
  SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'`
-@@ -109,6 +109,7 @@
+@@ -109,6 +109,7 @@ bindir = @bindir@
  libdir = @libdir@
  libexecdir = @libexecdir@
  statedir = @datadir@
@@ -17,7 +17,7 @@
  sysconfdir = @sysconfdir@
  
  program_transform_name =
-@@ -162,7 +163,7 @@
+@@ -162,7 +163,7 @@ all-gnats: all-tools gnatsd queue-pr mai
  	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 \
@@ -26,22 +26,18 @@
  
  libgnats.a: $(LIBOBJS)
  	-rm -f tmplibgnats.a libgnats.a
-@@ -368,15 +369,17 @@
+@@ -368,15 +369,11 @@ install-tools: install-tools-arch-indep 
  install-tools-arch-dep: install-tools-bin
  
  install-tools-arch-indep: all-tools
 -	$(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 \
+-	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
 -	  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 \
+-        else \
 -	  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 $(DESTDIR)$(lispdir)/gnats.el ; \
  	fi
@@ -49,7 +45,7 @@
  	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 ; \
-@@ -391,7 +394,7 @@
+@@ -391,17 +388,9 @@ install-tools-bin: all-tools
  	$(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
@@ -57,44 +53,72 @@
 +	$(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 \
-@@ -409,29 +412,29 @@
+-	@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
+ 
+ EXTRA_INSTALL =
+ 
+@@ -409,33 +398,9 @@ install-gnats: install-gnats-bin install
  install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL)
  
  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 $(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 \
+-	  true ; \
+-	else \
+-	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
+-	    $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \
 -	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
-+	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
- 	  else \
+-	  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 $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
-+	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default" ; \
- 	  fi \
- 	fi
+-	  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 $(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 \
+-	   true ; \
+-	else \
+-	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
+-	    $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \
 -	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
-+	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \
-           else \
- 	    $(INSTALL_DATA) $(srcdir)/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)" ; \
-+	                    $(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";
+-	  fi \
+-	fi
+-	@echo "*** If you're a first-time user, you'll want to create a new database";
+-	@echo "*** with $(libexecdir)/gnats/mkdb."
++	$(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default
++	$(INSTALL_DATA) $(srcdir)/gnatsd.host_access \
++	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default
+ 
+ install-gnats-bin: all-gnats install-tools-bin
+ 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(libexecdir)/gnats
+@@ -450,20 +415,6 @@ install-gnats-bin: all-gnats install-too
+ 	$(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
+ 
+ # regex.c is pretty badly broken, and I don't feel like fixing it.
+ regex.o: $(srcdir)/regex.c
diff --git a/databases/gnats4/pkg-plist b/databases/gnats4/pkg-plist
index f86542e7e69d..61c8f76e956b 100644
--- a/databases/gnats4/pkg-plist
+++ b/databases/gnats4/pkg-plist
@@ -1,14 +1,14 @@
+@owner gnats
+@mode 4555
 bin/edit-pr
+@owner
+@mode
 bin/getclose
 bin/install-sid
 bin/query-pr
 bin/send-pr
-%%SERVER%%@unexec if cmp -s %D/etc/gnats/databases %D/etc/gnats/databases.default; then rm -f %D/etc/gnats/databases; fi
-%%SERVER%%etc/gnats/databases.default
-%%SERVER%%@exec [ -f %B/databases ] || cp %B/%f %B/databases
-%%SERVER%%@unexec if cmp -s %D/etc/gnats/gnatsd.host_access %D/etc/gnats/gnatsd.host_access.default; then rm -f %D/etc/gnats/gnatsd.host_access; fi
-%%SERVER%%etc/gnats/gnatsd.host_access.default
-%%SERVER%%@exec [ -f %B/gnatsd.host_access ] || cp %B/%f %B/gnatsd.host_access
+%%SERVER%%@sample etc/gnats/databases.sample
+%%SERVER%%@sample etc/gnats/gnatsd.host_access.sample
 etc/gnats/defaults/addresses
 etc/gnats/defaults/categories
 etc/gnats/defaults/classes
@@ -18,16 +18,18 @@ etc/gnats/defaults/responsible
 etc/gnats/defaults/states
 etc/gnats/defaults/submitters
 etc/gnats/send-pr.conf
-@dirrm etc/gnats/defaults
-@dirrmtry etc/gnats
 %%SERVER%%libexec/gnats/at-pr
 %%SERVER%%libexec/gnats/check-db
 %%SERVER%%libexec/gnats/delete-pr
 libexec/gnats/diff-prs
 libexec/gnats/file-pr
+@owner gnats
+@mode 4555
 %%SERVER%%libexec/gnats/gen-index
-%%SERVER%%libexec/gnats/gnats-pwconv
 %%SERVER%%libexec/gnats/gnatsd
+@owner
+@mode
+%%SERVER%%libexec/gnats/gnats-pwconv
 libexec/gnats/mail-agent
 %%SERVER%%libexec/gnats/mail-query
 %%SERVER%%libexec/gnats/mkcat
@@ -36,11 +38,27 @@ libexec/gnats/pr-age
 libexec/gnats/pr-edit
 %%SERVER%%libexec/gnats/queue-pr
 %%SERVER%%libexec/gnats/rmcat
+man/man1/edit-pr.1.gz
+man/man1/query-pr.1.gz
+man/man1/send-pr.1.gz
+man/man5/databases.5.gz 
+man/man5/dbconfig.5.gz
+man/man7/gnats.7.gz
+man/man8/delete-pr.8.gz
+man/man8/getclose.8.gz
+man/man8/file-pr.8.gz
+man/man8/gen-index.8.gz
+man/man8/gnatsd.8.gz
+man/man8/install-sid.8.gz
+man/man8/mkcat.8.gz
+man/man8/mkdb.8.gz
+man/man8/pr-edit.8.gz
+man/man8/queue-pr.8.gz
+man/man8/rmcat.8.gz
+%%EMACS_SITE_LISPDIR%%/gnats.el
+@exec mkdir -p %%GNATSDBDIR%%/gnats && chown -R gnats %%GNATSDBDIR%%
+@dirrm etc/gnats/defaults
+@dirrmtry etc/gnats
 @dirrm libexec/gnats
-@exec mkdir -p %%GNATSDBDIR%%
-@exec chown gnats %%GNATSDBDIR%%
+@dirrmtry %%GNATSDBDIR%%/gnats
 @dirrmtry %%GNATSDBDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EMACS_SITE_LISPDIR%%/gnats.el