[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freebsd-ports-bugs
Subject:    ports/50467: Fix for port net/citadel
From:       Brian Ledbetter <brian () shadowcom ! net>
Date:       2003-03-31 4:13:58
[Download RAW message or body]


> Number:         50467
> Category:       ports
> Synopsis:       Fix for port net/citadel
> Confidential:   no
> Severity:       non-critical
> Priority:       low
> Responsible:    freebsd-ports-bugs
> State:          open
> Quarter:        
> Keywords:       
> Date-Required:
> Class:          maintainer-update
> Submitter-Id:   current-users
> Arrival-Date:   Sun Mar 30 20:20:07 PST 2003
> Closed-Date:
> Last-Modified:
> Originator:     Brian Ledbetter
> Release:        FreeBSD 5.0-RELEASE-p6 i386
> Organization:
shadowcom.net
> Environment:
System: FreeBSD tokyo.home.shadowcom.net 5.0-RELEASE-p6 FreeBSD 5.0-RELEASE-p6 #2: \
Fri Mar 28 22:16:47 EST 2003 \
root@newbie.home.shadowcom.net:/usr/src/sys/i386/compile/TOKYO i386

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

> How-To-Repeat:
> Fix:

--- citadel-5.80	Sun Mar 30 23:11:40 2003
+++ citadel-5.80_1	Sun Mar 30 23:11:31 2003
@@ -25,6 +25,8 @@
 #	/usr/ports/net/citadel/files/patch-aj
 #	/usr/ports/net/citadel/files/patch-ak
 #	/usr/ports/net/citadel/files/patch-al
+#	/usr/ports/net/citadel/files/patch-am
+#	/usr/ports/net/citadel/README.html
 #
 echo c - /usr/ports/net/citadel
 mkdir -p /usr/ports/net/citadel > /dev/null 2>&1
@@ -39,6 +41,7 @@
 X
 XPORTNAME=	citadel
 XPORTVERSION=	5.80
+XPORTREVISION=	1
 XCATEGORIES=	net
 XMASTER_SITES=	http://uncensored.citadel.org/pub/citadel/ \
 X		ftp://ftp.tux.org/pub/net/citadel/ \
@@ -48,9 +51,6 @@
 XMAINTAINER=	brian@shadowcom.net
 XCOMMENT=	Citadel/UX Communications Server
 X
-XBROKEN=		"Does not install/package"
-XNO_PACKAGE=	"Infinite loop"
-X
 XLIB_DEPENDS=    gdbm:${PORTSDIR}/databases/gdbm
 X
 XWRKSRC=		${WRKDIR}/citadel
@@ -560,24 +560,31 @@
 END-of-/usr/ports/net/citadel/files/patch-ag
 echo x - /usr/ports/net/citadel/files/patch-ah
 sed 's/^X//' >/usr/ports/net/citadel/files/patch-ah << \
                'END-of-/usr/ports/net/citadel/files/patch-ah'
-X*** sysdep.c.orig	Tue Sep  5 14:35:25 2000
-X--- sysdep.c	Wed Jun 13 09:32:44 2001
-X***************
-X*** 35,42 ****
-X--- 35,47 ----
-X  #include <stdarg.h>
-X  #include <syslog.h>
-X  #include <grp.h>
-X+ #if (defined(__unix__) || defined(unix)) && !defined(USG)
-X+ #include <sys/param.h>
-X+ #endif
-X+ #if !defined(BSD)
-X  #ifdef __GNUC__
-X  #include <malloc.h>
-X+ #endif
-X  #endif
-X  #ifdef HAVE_PTHREAD_H
-X  #include <pthread.h>
+X--- sysdep.c.orig	Mon Jul  2 23:07:09 2001
+X+++ sysdep.c	Sun Mar 30 23:00:56 2003
+X@@ -12,7 +12,7 @@
+X  *
+X  */
+X 
+X-
+X+#define __SYSDEP_C__
+X #include "sysdep.h"
+X #include <stdlib.h>
+X #include <unistd.h>
+X@@ -46,8 +46,13 @@
+X #include <stdarg.h>
+X #include <syslog.h>
+X #include <grp.h>
+X+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+X+#include <sys/param.h>
+X+#endif
+X+#if !defined(BSD)
+X #ifdef __GNUC__
+X #include <malloc.h>
+X+#endif
+X #endif
+X #ifdef HAVE_PTHREAD_H
+X #include <pthread.h>
 END-of-/usr/ports/net/citadel/files/patch-ah
 echo x - /usr/ports/net/citadel/files/patch-ai
 sed 's/^X//' >/usr/ports/net/citadel/files/patch-ai << \
'END-of-/usr/ports/net/citadel/files/patch-ai' @@ -687,5 +694,50 @@
 X 		if (hostbuf != NULL) strcpy(hostbuf, cithost);
 X 		if (portbuf != NULL) strcpy(portbuf, sockpath);
 END-of-/usr/ports/net/citadel/files/patch-al
+echo x - /usr/ports/net/citadel/files/patch-am
+sed 's/^X//' >/usr/ports/net/citadel/files/patch-am << \
'END-of-/usr/ports/net/citadel/files/patch-am' +X--- sysdep_decls.h.orig	Sun Mar 30 \
22:59:49 2003 +X+++ sysdep_decls.h	Sun Mar 30 23:00:41 2003
+X@@ -24,4 +24,6 @@
+X void CtdlRedirectOutput(FILE *fp, int sock);
+X 
+X extern int num_sessions;
+X+#ifndef		__SYSDEP_C__
+X extern int time_to_die;
+X+#endif
+END-of-/usr/ports/net/citadel/files/patch-am
+echo x - /usr/ports/net/citadel/README.html
+sed 's/^X//' >/usr/ports/net/citadel/README.html << \
'END-of-/usr/ports/net/citadel/README.html' +X<html>
+X<title> The FreeBSD Ports Collection (net/citadel)</title>
+X<head><h1> The FreeBSD Ports Collection ("net/citadel")</h1> </head> <hr>
+X<body>
+X
+X<p>You are now in the directory for the port "net/citadel" (package name \
"citadel-5.80"). +X
+X<p>This is the one-line description for this port:
+X
+X<p><hr><p>
+XCitadel/UX Communications Server
+X<p><hr>
+X
+X<p>Please read the "<a href="pkg-descr">description file</a>" for a
+Xlonger description.
+X
+X<p>Go to the <a href="../../README.html">top of the ports tree</a> for
+Xa summary on how to use the ports collection.
+X
+X<p>
+XThis port requires package(s) "expat-1.95.5 gdbm-1.8.0 gettext-0.11.5_1 gmake-3.80 \
libiconv-1.8_2" to build. +X<p>
+XThis port requires package(s) "gdbm-1.8.0" to run.
+X
+X<p><hr><p>
+X<a href="../README.html"> Go up one level</a>
+X|
+X<a href="../../README.html"> Go to top of ports tree</a>
+X</body>
+X</html>
+END-of-/usr/ports/net/citadel/README.html
 exit
 
> Release-Note:
> Audit-Trail:
> Unformatted:


[prev in list] [next in list] [prev in thread] [next in thread]