Fix for port net/citadel

	Corrects the looping package-creation bug in the Citadel package.
	Also fixes a bug which stopped FreeBSD 5.0 builds.

4 files changed, 43 insertions, 27 deletions

diff --git a/net/citadel/Makefile b/net/citadel/Makefile
index 0e47dad04014..f62a348970cd 100644
--- a/net/citadel/Makefile
+++ b/net/citadel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	citadel
 PORTVERSION=	5.80
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://uncensored.citadel.org/pub/citadel/ \
 		ftp://ftp.tux.org/pub/net/citadel/ \
@@ -16,14 +17,12 @@ DISTNAME=	${PORTNAME}-ux-${PORTVERSION}
 MAINTAINER=	brian@shadowcom.net
 COMMENT=	Citadel/UX Communications Server
 
-BROKEN=		"Does not install/package"
-NO_PACKAGE=	"Infinite loop"
-
 LIB_DEPENDS=    gdbm:${PORTSDIR}/databases/gdbm
 
 WRKSRC=		${WRKDIR}/citadel
 GNU_CONFIGURE=  yes
 USE_GMAKE=      yes
+CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 
 post-install:
 	${STRIP} ${PREFIX}/bin/aidepost
diff --git a/net/citadel/files/patch-ah b/net/citadel/files/patch-ah
index db2f34a3be62..70093277d1c5 100644
--- a/net/citadel/files/patch-ah
+++ b/net/citadel/files/patch-ah
@@ -1,18 +1,25 @@
-*** sysdep.c.orig	Tue Sep  5 14:35:25 2000
---- sysdep.c	Wed Jun 13 09:32:44 2001
-***************
-*** 35,42 ****
---- 35,47 ----
-  #include <stdarg.h>
-  #include <syslog.h>
-  #include <grp.h>
-+ #if (defined(__unix__) || defined(unix)) && !defined(USG)
-+ #include <sys/param.h>
-+ #endif
-+ #if !defined(BSD)
-  #ifdef __GNUC__
-  #include <malloc.h>
-+ #endif
-  #endif
-  #ifdef HAVE_PTHREAD_H
-  #include <pthread.h>
+--- sysdep.c.orig	Mon Jul  2 23:07:09 2001
++++ sysdep.c	Sun Mar 30 23:00:56 2003
+@@ -12,7 +12,7 @@
+  *
+  */
+ 
+-
++#define __SYSDEP_C__
+ #include "sysdep.h"
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -46,8 +46,13 @@
+ #include <stdarg.h>
+ #include <syslog.h>
+ #include <grp.h>
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++#if !defined(BSD)
+ #ifdef __GNUC__
+ #include <malloc.h>
++#endif
+ #endif
+ #ifdef HAVE_PTHREAD_H
+ #include <pthread.h>
diff --git a/net/citadel/files/patch-am b/net/citadel/files/patch-am
new file mode 100644
index 000000000000..0af108b95261
--- /dev/null
+++ b/net/citadel/files/patch-am
@@ -0,0 +1,9 @@
+--- sysdep_decls.h.orig	Sun Mar 30 22:59:49 2003
++++ sysdep_decls.h	Sun Mar 30 23:00:41 2003
+@@ -24,4 +24,6 @@
+ void CtdlRedirectOutput(FILE *fp, int sock);
+ 
+ extern int num_sessions;
++#ifndef		__SYSDEP_C__
+ extern int time_to_die;
++#endif
diff --git a/net/citadel/pkg-plist b/net/citadel/pkg-plist
index 14196a4cd9f2..349f81c3f322 100644
--- a/net/citadel/pkg-plist
+++ b/net/citadel/pkg-plist
@@ -56,6 +56,7 @@ share/citadel/messages/unlisted
 share/citadel/modules/serv_bio.so
 share/citadel/modules/serv_chat.so
 share/citadel/modules/serv_expire.so
+share/citadel/modules/serv_ical.so
 share/citadel/modules/serv_imap.so
 share/citadel/modules/serv_inetcfg.so
 share/citadel/modules/serv_moderate.so
@@ -94,20 +95,20 @@ share/doc/citadel/docs/sysop.txt
 share/doc/citadel/docs/upgrading.txt
 share/doc/citadel/docs/utils.txt
 share/doc/citadel/docs/import-export.txt
+share/doc/citadel/docs/citadel-with-berkeley-db.txt
 @dirrm share/citadel/bio
 @dirrm share/citadel/bitbucket
-@dirrm share/citadel/data
 @dirrm share/citadel/files
 @dirrm share/citadel/help
 @dirrm share/citadel/images
 @dirrm share/citadel/info
-@dirrm share/citadel/messages
 @dirrm share/citadel/modules
 @dirrm share/citadel/netconfigs
-@dirrm share/citadel/network/spoolin
-@dirrm share/citadel/network
+@unexec rmdir share/citadel/messages 2>/dev/null || true
+@unexec rmdir share/citadel/network/spoolin 2>/dev/null || true
+@unexec rmdir share/citadel/network 2>/dev/null || true
+@unexec rmdir share/citadel 2>/dev/null || true
 @dirrm share/citadel/userpics
-@dirrm share/citadel
-@dirrm share/doc/citadel/docs
 @dirrm share/doc/citadel/techdoc
+@dirrm share/doc/citadel/docs
 @dirrm share/doc/citadel