ports/57041: Slight change to net/citadel to correct problem on bento.

Brian Ledbetter brian at shadowcom.net
Sat Sep 20 21:40:20 UTC 2003


>Number:         57041
>Category:       ports
>Synopsis:       Slight change to net/citadel to correct problem on bento.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 20 14:40:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Brian Ledbetter
>Release:        FreeBSD 5.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD tokyo.home.shadowcom.net 5.1-RELEASE-p3 FreeBSD 5.1-RELEASE-p3 #2: Wed Sep 17 11:40:19 EDT 2003 root at tokyo.home.shadowcom.net:/usr/src/sys/i386/compile/TOKYODELL i386


	
>Description:
	Corrects problem with non-interactive builds.  I had neglected to set
	IS_INTERACTIVE=YES in the port's makefile.
>How-To-Repeat:
>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	/usr/ports/net/citadel
#	/usr/ports/net/citadel/Makefile
#	/usr/ports/net/citadel/distinfo
#	/usr/ports/net/citadel/pkg-descr
#	/usr/ports/net/citadel/pkg-install
#	/usr/ports/net/citadel/pkg-message
#	/usr/ports/net/citadel/pkg-plist
#	/usr/ports/net/citadel/files
#	/usr/ports/net/citadel/files/patch-aa
#	/usr/ports/net/citadel/files/patch-ab
#	/usr/ports/net/citadel/files/patch-ac
#	/usr/ports/net/citadel/files/patch-ad
#	/usr/ports/net/citadel/files/patch-ae
#	/usr/ports/net/citadel/files/patch-af
#	/usr/ports/net/citadel/files/patch-ag
#	/usr/ports/net/citadel/files/patch-ah
#	/usr/ports/net/citadel/files/patch-ai
#	/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
echo x - /usr/ports/net/citadel/Makefile
sed 's/^X//' >/usr/ports/net/citadel/Makefile << 'END-of-/usr/ports/net/citadel/Makefile'
X# New ports collection makefile for:    Citadel/UX
X# Date created:         Tue Jun 12 15:42:14 EDT 2001
X# Whom:                 brian at shadowcom.net
X#
X# $FreeBSD: ports/net/citadel/Makefile,v 1.5 2003/09/03 23:19:38 edwin Exp $
X#
X
XPORTNAME=	citadel
XPORTVERSION=	5.80
XPORTREVISION=	2
XCATEGORIES=	net
XMASTER_SITES=	http://uncensored.citadel.org/pub/citadel/ \
X		ftp://ftp.tux.org/pub/net/citadel/ \
X		http://www.shadowcom.net/Software/Citadel-UX/
XDISTNAME=	${PORTNAME}-ux-${PORTVERSION}
XIS_INTERACTIVE=	yes
X
XMAINTAINER=	brian at shadowcom.net
XCOMMENT=	Citadel/UX Communications Server
X
XLIB_DEPENDS=    gdbm:${PORTSDIR}/databases/gdbm
X
XWRKSRC=		${WRKDIR}/citadel
XGNU_CONFIGURE=  yes
XUSE_GMAKE=      yes
XCONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
X
Xpost-install:
X	${STRIP} ${PREFIX}/bin/aidepost
X	${STRIP} ${PREFIX}/bin/base64
X	${STRIP} ${PREFIX}/bin/citadel
X	${STRIP} ${PREFIX}/bin/citmail
X	${STRIP} ${PREFIX}/bin/citserver
X	${STRIP} ${PREFIX}/bin/mailinglist
X	${STRIP} ${PREFIX}/bin/msgform
X	${STRIP} ${PREFIX}/bin/netmailer
X	${STRIP} ${PREFIX}/bin/netpoll
X	${STRIP} ${PREFIX}/bin/netproc
X	${STRIP} ${PREFIX}/bin/netsetup
X	${STRIP} ${PREFIX}/bin/qpdecode
X	${STRIP} ${PREFIX}/bin/rcit
X	${STRIP} ${PREFIX}/bin/readlog
X	${STRIP} ${PREFIX}/bin/sendcommand
X	${STRIP} ${PREFIX}/bin/citsetup
X	${STRIP} ${PREFIX}/bin/stats
X	${STRIP} ${PREFIX}/bin/userlist
X	${STRIP} ${PREFIX}/bin/whobbs
X	${STRIP} ${PREFIX}/share/citadel/modules/*.so
X	${PREFIX}/bin/citsetup
X	${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.mk>
END-of-/usr/ports/net/citadel/Makefile
echo x - /usr/ports/net/citadel/distinfo
sed 's/^X//' >/usr/ports/net/citadel/distinfo << 'END-of-/usr/ports/net/citadel/distinfo'
XMD5 (citadel-ux-5.80.tar.gz) = b71e7c5295947c9a8cff75dc88b15ee2
END-of-/usr/ports/net/citadel/distinfo
echo x - /usr/ports/net/citadel/pkg-descr
sed 's/^X//' >/usr/ports/net/citadel/pkg-descr << 'END-of-/usr/ports/net/citadel/pkg-descr'
XCitadel/UX Communications Server
XCopyright (c) 1987-2001 by Art Cancro.
XPortions (c) 1998-2001 by Nathan Bryant, Brian Costello, and Ben Mehlman.
XDocumentation (c) 2000 by Steve Williams.
XHP/UX compatibility layer (c) 2000 by Michael Bremen.
Xbase64 encoding/decoding for MIME parser, public domain by John Walker.
X'parsedate' function, public domain by Steven M. Bellovin, et. al.
X
XWWW: http://uncensored.citadel.org/citadel/
XAuthor: Arthur J. Cancro <ajc at uncensored.citadel.org>
XRevision: 5.80
X
XThe Citadel/UX Communications Server provides your
Xenterprise with a powerful alternative to products
Xsuch as Microsoft Exchange.  Citadel/UX provides you
Xwith:
X  - Internet E-Mail (SMTP, POP3, IMAP servers built-in)
X  - Real-time Chatting
X  - Instant Messaging
XRefer to the link above for more information about the 
XCitadel/UX Project.
X
X--
XMaintainer: Brian Ledbetter <brian at shadowcom.net>
END-of-/usr/ports/net/citadel/pkg-descr
echo x - /usr/ports/net/citadel/pkg-install
sed 's/^X//' >/usr/ports/net/citadel/pkg-install << 'END-of-/usr/ports/net/citadel/pkg-install'
X
Xcase $2 in
X	[Pp][Rr][Ee]-[Ii][Nn][Ss][Tt][Aa][Ll][Ll])
X	echo "- Installing Citadel/UX Communications Server..."
X	;;
X
X	[Pp][Oo][Ss][Tt]-[Ii][Nn][Ss][Tt][Aa][Ll][Ll])
X	echo "- Starting the Citadel/UX Setup and Configuration Program..."
X	${PKG_PREFIX}/bin/citsetup
X	echo "- Citadel/UX Communications Server"
X	echo "  Installed PREFIX: ${PKG_PREFIX}"
X	;;
X
Xesac
X
Xexit 0
END-of-/usr/ports/net/citadel/pkg-install
echo x - /usr/ports/net/citadel/pkg-message
sed 's/^X//' >/usr/ports/net/citadel/pkg-message << 'END-of-/usr/ports/net/citadel/pkg-message'
X
XCitadel/UX Communications Server 5.74 been installed
Xon your computer.  You may start the Server now by
Xtyping:
X
X  ${PREFIX}/bin/citserver -t/var/log/citadel.log -d
X
Xand you can connect to your server by using:
X
X  ${PREFIX}/bin/citadel
X
XTo start the server up with your computer, rename
X/usr/local/etc/rc.d/citadel.sh.example to
X/usr/local/etc/rc.d/citadel.sh
X
XPlease refer to ${PREFIX}/share/doc/citadel/ for
Xmore information about configuring and using your
Xnew Citadel/UX Server.  Documentation can also be
Xfound at http://uncensored.citadel.org/citadel/
X
END-of-/usr/ports/net/citadel/pkg-message
echo x - /usr/ports/net/citadel/pkg-plist
sed 's/^X//' >/usr/ports/net/citadel/pkg-plist << 'END-of-/usr/ports/net/citadel/pkg-plist'
X at group 3
X at mode 755
X at name citadel-5.80
X at owner 0
Xbin/aidepost
Xbin/base64
Xbin/chkpwd
Xbin/citadel
Xbin/citmail
Xbin/citserver
Xbin/citsetup
Xbin/dnetsetup
Xbin/mailinglist
Xbin/msgform
Xbin/netmailer
Xbin/netpoll
Xbin/netproc
Xbin/netsetup
Xbin/qpdecode
Xbin/rcit
Xbin/readlog
Xbin/sendcommand
Xbin/stats
Xbin/userlist
Xbin/utilsmenu
Xbin/weekly
Xbin/whobbs
Xetc/rc.d/citadel.sh.example
Xshare/citadel/citadel.rc
Xshare/citadel/files/README
Xshare/citadel/help/?
Xshare/citadel/help/aide
Xshare/citadel/help/floors
Xshare/citadel/help/hours
Xshare/citadel/help/intro
Xshare/citadel/help/mail
Xshare/citadel/help/network
Xshare/citadel/help/nice
Xshare/citadel/help/policy
Xshare/citadel/help/software
Xshare/citadel/help/summary
Xshare/citadel/messages/aideopt
Xshare/citadel/messages/changepw
Xshare/citadel/messages/dotopt
Xshare/citadel/messages/entermsg
Xshare/citadel/messages/entopt
Xshare/citadel/messages/goodbye
Xshare/citadel/messages/hello
Xshare/citadel/messages/help
Xshare/citadel/messages/mainmenu
Xshare/citadel/messages/newuser
Xshare/citadel/messages/readopt
Xshare/citadel/messages/register
Xshare/citadel/messages/roomaccess
Xshare/citadel/messages/unlisted
Xshare/citadel/modules/serv_bio.so
Xshare/citadel/modules/serv_chat.so
Xshare/citadel/modules/serv_expire.so
Xshare/citadel/modules/serv_ical.so
Xshare/citadel/modules/serv_imap.so
Xshare/citadel/modules/serv_inetcfg.so
Xshare/citadel/modules/serv_moderate.so
Xshare/citadel/modules/serv_network.so
Xshare/citadel/modules/serv_pas2.so
Xshare/citadel/modules/serv_pop3.so
Xshare/citadel/modules/serv_rwho.so
Xshare/citadel/modules/serv_smtp.so
Xshare/citadel/modules/serv_upgrade.so
Xshare/citadel/modules/serv_vandelay.so
Xshare/citadel/modules/serv_vcard.so
Xshare/citadel/public_clients
Xshare/doc/citadel/techdoc/PAM.txt
Xshare/doc/citadel/techdoc/build.txt
Xshare/doc/citadel/techdoc/chat.txt
Xshare/doc/citadel/techdoc/citadelapi.txt
Xshare/doc/citadel/techdoc/delivery-list.txt
Xshare/doc/citadel/techdoc/developers.txt
Xshare/doc/citadel/techdoc/hack.txt
Xshare/doc/citadel/techdoc/moderation.txt
Xshare/doc/citadel/techdoc/netconfigs.txt
Xshare/doc/citadel/techdoc/session.txt
Xshare/doc/citadel/docs/COPYING.txt
Xshare/doc/citadel/docs/chat.txt
Xshare/doc/citadel/docs/copyright.txt
Xshare/doc/citadel/docs/inetmailsetup.txt
Xshare/doc/citadel/docs/inetmailsetupmx.txt
Xshare/doc/citadel/docs/inetsiteconfig.txt
Xshare/doc/citadel/docs/install.txt
Xshare/doc/citadel/docs/mailinglists.txt
Xshare/doc/citadel/docs/netsetup.txt
Xshare/doc/citadel/docs/network.txt
Xshare/doc/citadel/docs/room-sharing-howto.txt
Xshare/doc/citadel/docs/siteconfig.txt
Xshare/doc/citadel/docs/sysop.txt
Xshare/doc/citadel/docs/upgrading.txt
Xshare/doc/citadel/docs/utils.txt
Xshare/doc/citadel/docs/import-export.txt
Xshare/doc/citadel/docs/citadel-with-berkeley-db.txt
X at dirrm share/citadel/bio
X at dirrm share/citadel/bitbucket
X at dirrm share/citadel/files
X at dirrm share/citadel/help
X at dirrm share/citadel/images
X at dirrm share/citadel/info
X at dirrm share/citadel/modules
X at dirrm share/citadel/netconfigs
X at unexec rmdir share/citadel/messages 2>/dev/null || true
X at unexec rmdir share/citadel/network/spoolin 2>/dev/null || true
X at unexec rmdir share/citadel/network 2>/dev/null || true
X at unexec rmdir share/citadel 2>/dev/null || true
X at dirrm share/citadel/userpics
X at dirrm share/doc/citadel/techdoc
X at dirrm share/doc/citadel/docs
X at dirrm share/doc/citadel
END-of-/usr/ports/net/citadel/pkg-plist
echo c - /usr/ports/net/citadel/files
mkdir -p /usr/ports/net/citadel/files > /dev/null 2>&1
echo x - /usr/ports/net/citadel/files/patch-aa
sed 's/^X//' >/usr/ports/net/citadel/files/patch-aa << 'END-of-/usr/ports/net/citadel/files/patch-aa'
X--- Makefile.in.orig	Mon Jul  2 23:07:06 2001
X+++ Makefile.in	Mon Sep 10 11:00:50 2001
X@@ -24,7 +24,7 @@
X CX=@CX@
X 
X CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
X-SERVER_TARGETS=citserver setup $(CHKPWD)
X+SERVER_TARGETS=citserver citsetup $(CHKPWD)
X SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
X 	modules/serv_upgrade$(SO) \
X 	modules/serv_smtp$(SO) \
X@@ -224,8 +224,8 @@
X mailinglist: mailinglist.o config.o internetmail.o
X 	$(CC) mailinglist.o config.o internetmail.o $(LDFLAGS) -o mailinglist
X 
X-setup: setup.o tools.o
X-	$(CC) setup.o tools.o $(CURSES) $(NETLIBS) $(LDFLAGS) -o setup
X+citsetup: setup.o tools.o
X+	$(CC) setup.o tools.o $(CURSES) $(NETLIBS) $(LDFLAGS) -o citsetup
X 
X chkpwd: chkpwd.o auth.o config.o
X 	$(CC) chkpwd.o auth.o config.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
X@@ -269,45 +269,60 @@
X install-data:
X 	@for i in help messages network/spoolin network/spoolout \
X 		 network/systems; do \
X-		$(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \
X+		$(srcdir)/mkinstalldirs $(root)$(prefix)/share/citadel/$$i; \
X 	done
X 	@for i in citadel.rc public_clients \
X 		 `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v CVS`; do \
X-		echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
X-		$(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
X+		echo $(INSTALL_DATA) $$i $(root)$(prefix)/share/citadel/$$i; \
X+		$(INSTALL_DATA) $$i $(root)$(prefix)/share/citadel/$$i; \
X 	done
X 	- at if test -d $(root)/etc/pam.d; then \
X-		echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \
X-		$(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \
X+		echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)$(prefix)/etc/pam.d/citadel; \
X+		$(INSTALL_DATA) $(srcdir)/citadel.pam $(root)$(prefix)/etc/pam.d/citadel; \
X 	fi
X 
X install-doc:
X-	@$(srcdir)/mkinstalldirs $(root)$(prefix)/techdoc
X+	@$(srcdir)/mkinstalldirs $(root)$(prefix)/share/doc/citadel/techdoc
X 	@for i in `find $(srcdir)/techdoc -type f | grep -v CVS`; do \
X-		echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
X-		$(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
X+		echo $(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \
X+		$(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \
X+	done
X+	@$(srcdir)/mkinstalldirs $(root)$(prefix)/share/doc/citadel/docs
X+	@for i in `find $(srcdir)/docs -type f | grep -v CVS`; do \
X+		echo $(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \
X+		$(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \
X 	done
X 
X install-exec: all weekly
X-	@for i in bio bitbucket files images info modules userpics; do \
X-		$(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \
X+	@for i in bio bitbucket files images info modules userpics network/spoolin network/spoolout network/systems; do \
X+		$(srcdir)/mkinstalldirs $(root)$(prefix)/share/citadel/$$i; \
X+	done
X+	@echo "This directory contains upload/download files." > $(root)$(prefix)/share/citadel/files/README
X+	@for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) ; do \
X+		if test -f $$i; then \
X+			echo $(INSTALL) $$i $(root)$(prefix)/bin/$$i; \
X+			$(INSTALL) $$i $(root)$(prefix)/bin/$$i; \
X+		fi \
X 	done
X-	@for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \
X-		 $(SERV_MODULES) ; do \
X+	@for i in $(SERV_MODULES) ; do \
X 		if test -f $$i; then \
X-			echo $(INSTALL) $$i $(root)$(prefix)/$$i; \
X-			$(INSTALL) $$i $(root)$(prefix)/$$i; \
X+			echo $(INSTALL) $$i $(root)$(prefix)/share/citadel/$$i; \
X+			$(INSTALL) $$i $(root)$(prefix)/share/citadel/$$i; \
X 		fi \
X 	done
X 	@for i in utilsmenu weekly dnetsetup; do \
X 		if test -f $(srcdir)/$$i; then \
X-			echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
X-			$(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
X+			echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/bin/$$i; \
X+			$(INSTALL) $(srcdir)/$$i $(root)$(prefix)/bin/$$i; \
X 		fi \
X 	done
X-	@if test x`find $(root)$(prefix)/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \
X-		echo chmod u+s $(root)$(prefix)/chkpwd; \
X-		chmod u+s $(root)$(prefix)/chkpwd; \
X+	echo $(srcdir)/mkinstalldirs $(root)$(prefix)/etc/rc.d
X+	$(srcdir)/mkinstalldirs $(root)$(prefix)/etc/rc.d
X+	echo $(INSTALL) $(srcdir)/rc-startup-citadel.sh $(root)$(prefix)/etc/rc.d/citadel.sh.example
X+	$(INSTALL) $(srcdir)/rc-startup-citadel.sh $(root)$(prefix)/etc/rc.d/citadel.sh.example
X+	@if test x`find $(root)$(prefix)/bin/chkpwd -user root` = x$(root)$(prefix)/bin/chkpwd; then \
X+		echo chmod u+s $(root)$(prefix)/bin/chkpwd; \
X+		chmod u+s $(root)$(prefix)/bin/chkpwd; \
X 	fi
X 
X clean:
END-of-/usr/ports/net/citadel/files/patch-aa
echo x - /usr/ports/net/citadel/files/patch-ab
sed 's/^X//' >/usr/ports/net/citadel/files/patch-ab << 'END-of-/usr/ports/net/citadel/files/patch-ab'
X*** configure.orig	Tue Jun 12 17:04:41 2001
X--- configure	Tue Jun 12 17:05:01 2001
X***************
X*** 536,547 ****
X  
X  if test "$prefix" = NONE; then
X  	cat >> confdefs.h <<EOF
X! #define BBSDIR "$ac_default_prefix"
X  EOF
X  
X  else
X  	cat >> confdefs.h <<EOF
X! #define BBSDIR "$prefix"
X  EOF
X  
X  fi
X--- 536,549 ----
X  
X  if test "$prefix" = NONE; then
X  	cat >> confdefs.h <<EOF
X! #define BBSDIR "$ac_default_prefix/share/citadel"
X! #define BINDIR "$ac_default_prefix/bin"
X  EOF
X  
X  else
X  	cat >> confdefs.h <<EOF
X! #define BBSDIR "$prefix/share/citadel"
X! #define BINDIR "$prefix/bin"
X  EOF
X  
X  fi
END-of-/usr/ports/net/citadel/files/patch-ab
echo x - /usr/ports/net/citadel/files/patch-ac
sed 's/^X//' >/usr/ports/net/citadel/files/patch-ac << 'END-of-/usr/ports/net/citadel/files/patch-ac'
X*** setup.c.orig	Tue Sep  5 14:35:25 2000
X--- setup.c	Tue Jun 12 19:24:13 2001
X***************
X*** 59,71 ****
X  {
X  
X  "0",
X! "Enter the full pathname of the directory in which the BBS you are",
X! "creating or updating resides.  If you specify a directory other than the",
X! "default, you will need to specify the -h flag to the server when you start",
X! "it up.",
X  
X  "1",
X! "Enter the name of the system administrator (which is probably you).",
X  "When an account is created with this name, it will automatically be",
X  "assigned the highest access level.",
X  
X--- 59,71 ----
X  {
X  
X  "0",
X! "Enter the full pathname to the directory which holds the configuration",
X! "files for the BBS that you are creating or upgrading resides.  If you",
X! "specify a directory other than the default, you will need to specify",
X! "the -h flag to the server when you start citserver.",
X  
X  "1",
X! "Enter the account name of the system administrator (which is probably you).",
X  "When an account is created with this name, it will automatically be",
X  "assigned the highest access level.",
X  
X***************
X*** 468,474 ****
X  	char entryname[3];
X  
X  	/* Determine the fully qualified path name of citserver */
X! 	sprintf(looking_for, "%s/citserver ", BBSDIR);
X  
X  	/* Pound through /etc/inittab line by line.  Set have_entry to 1 if
X  	 * an entry is found which we believe starts citserver.
X--- 468,474 ----
X  	char entryname[3];
X  
X  	/* Determine the fully qualified path name of citserver */
X! 	sprintf(looking_for, "%s/citserver ", BINDIR);
X  
X  	/* Pound through /etc/inittab line by line.  Set have_entry to 1 if
X  	 * an entry is found which we believe starts citserver.
END-of-/usr/ports/net/citadel/files/patch-ac
echo x - /usr/ports/net/citadel/files/patch-ad
sed 's/^X//' >/usr/ports/net/citadel/files/patch-ad << 'END-of-/usr/ports/net/citadel/files/patch-ad'
X*** user_ops.c.orig	Tue Jun 12 19:25:41 2001
X--- user_ops.c	Tue Jun 12 19:25:48 2001
X***************
X*** 434,441 ****
X  			}
X  		close(pipev[0]);
X  
X! 		execl(BBSDIR "/chkpwd", BBSDIR "/chkpwd", NULL);
X! 		perror(BBSDIR "/chkpwd");
X  		exit(1);
X  		}
X  
X--- 434,441 ----
X  			}
X  		close(pipev[0]);
X  
X! 		execl(BINDIR "/chkpwd", BINDIR "/chkpwd", NULL);
X! 		perror(BINDIR "/chkpwd");
X  		exit(1);
X  		}
X  
END-of-/usr/ports/net/citadel/files/patch-ad
echo x - /usr/ports/net/citadel/files/patch-ae
sed 's/^X//' >/usr/ports/net/citadel/files/patch-ae << 'END-of-/usr/ports/net/citadel/files/patch-ae'
X*** weekly.in.orig	Tue Jun 12 19:27:37 2001
X--- weekly.in	Tue Jun 12 19:27:06 2001
X***************
X*** 7,14 ****
X  # $Id: weekly.in,v 573.0 2000/09/05 18:35:25 ajc Exp $
X  # 
X  
X! [ x$BBSDIR = x ] && BBSDIR=@prefix@
X! [ x$EXECDIR = x ] && EXECDIR=$BBSDIR
X  
X  cd $BBSDIR || exit
X  
X--- 7,14 ----
X  # $Id: weekly.in,v 573.0 2000/09/05 18:35:25 ajc Exp $
X  # 
X  
X! [ x$BBSDIR = x ] && BBSDIR=@prefix@/share/citadel
X! [ x$EXECDIR = x ] && EXECDIR=@prefix@/bin
X  
X  cd $BBSDIR || exit
X  
END-of-/usr/ports/net/citadel/files/patch-ae
echo x - /usr/ports/net/citadel/files/patch-af
sed 's/^X//' >/usr/ports/net/citadel/files/patch-af << 'END-of-/usr/ports/net/citadel/files/patch-af'
X*** sysdep.h.in.orig	Tue Jun 12 19:32:04 2001
X--- sysdep.h.in	Tue Jun 12 19:32:28 2001
X***************
X*** 36,41 ****
X--- 36,44 ----
X  /* define this to the bbs home directory */
X  #undef BBSDIR
X  
X+ /* define this to the Citadel/UX binaries directory */
X+ #undef BINDIR
X+ 
X  /* define this to enable the autologin feature */
X  #undef ENABLE_AUTOLOGIN
X  
END-of-/usr/ports/net/citadel/files/patch-af
echo x - /usr/ports/net/citadel/files/patch-ag
sed 's/^X//' >/usr/ports/net/citadel/files/patch-ag << 'END-of-/usr/ports/net/citadel/files/patch-ag'
X*** rc-startup-citadel.sh.orig	Wed Jun 13 08:53:57 2001
X--- rc-startup-citadel.sh	Wed Jun 13 08:56:43 2001
X***************
X*** 0 ****
X--- 1,21 ----
X+ #!/bin/sh
X+ 
X+ PREFIX=/usr/local
X+ LOGTO=/var/log/citadel.log
X+ 
X+ case $1 in
X+ 	[Ss][Tt][Aa][Rr][Tt])
X+ 		if [ -x "${PREFIX}/bin/citserver" ]; then
X+ 			${PREFIX}/bin/citserver -t${LOGTO} -d
X+ 			echo -n " Citadel/UX"
X+ 		fi
X+ 	;;
X+ 
X+ 	[Ss][Tt][Oo][Pp])
X+ 		ps -auxwww | grep citserver | grep -v grep | awk '{print $2}' | xargs kill
X+ 	;;
X+ 
X+ 	*)
X+ 		echo "Usage:	$0 [start|stop]"
X+ 	;;
X+ esac
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	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'
X*** netmailer.c.orig	Wed Jun 13 09:37:35 2001
X--- netmailer.c	Wed Jun 13 09:39:48 2001
X***************
X*** 201,212 ****
X  	char subject[256];
X  	time_t mid_buf;
X  	time_t now;
X  	int mlist = 0;
X  
X  	openlog("netmailer", LOG_PID, LOG_USER);
X  	get_config();
X  	LoadInternetConfig();
X! 	strcpy(temp, tmpnam(NULL));	/* temp file name */
X  
X  	if ((argc < 2) || (argc > 3)) {
X  		fprintf(stderr, "netmailer: usage: "
X--- 201,213 ----
X  	char subject[256];
X  	time_t mid_buf;
X  	time_t now;
X+ 	int fh;
X  	int mlist = 0;
X  
X  	openlog("netmailer", LOG_PID, LOG_USER);
X  	get_config();
X  	LoadInternetConfig();
X! /*	strcpy(temp, tmpnam(NULL));	/* temp file name */
X  
X  	if ((argc < 2) || (argc > 3)) {
X  		fprintf(stderr, "netmailer: usage: "
X***************
X*** 223,231 ****
X  		mlist = 1;
X  	}
X  	/* convert to ASCII & get info */
X! 	fp = fopen(temp, "w");
X  	msgform(argv[1], fp, sbuf, rbuf, nbuf, pbuf, &mid_buf, rmname, subject);
X  	fclose(fp);
X  
X  	strcpy(buf, rmname);
X  	strcpy(rmname, "room_");
X--- 224,236 ----
X  		mlist = 1;
X  	}
X  	/* convert to ASCII & get info */
X! /*	fp = fopen(temp, "w"); */
X! 	fh = mkstemp( "/tmp/netmailer.XXXXXXXX" );
X! 	fp = fdopen( fh, "w" );
X! 
X  	msgform(argv[1], fp, sbuf, rbuf, nbuf, pbuf, &mid_buf, rmname, subject);
X  	fclose(fp);
X+ 	close(fh);
X  
X  	strcpy(buf, rmname);
X  	strcpy(rmname, "room_");
END-of-/usr/ports/net/citadel/files/patch-ai
echo x - /usr/ports/net/citadel/files/patch-aj
sed 's/^X//' >/usr/ports/net/citadel/files/patch-aj << 'END-of-/usr/ports/net/citadel/files/patch-aj'
X*** messages/goodbye.orig	Tue Sep  5 15:08:12 2000
X--- messages/goodbye	Wed Jun 13 10:44:19 2001
X***************
X*** 1,7 ****
X   
X!   < this logoff banner resides in ./messages/goodbye >
X!  
X!  Thanks for calling ^humannode - please call again soon!
X!  
X!  Also be sure to visit UNCENSORED! BBS at uncnsrd.mt-kisco.ny.us
X  
X--- 1,6 ----
X+  Citadel/UX Communications Server - Powered by FreeBSD/i386 
X   
X!   < this logoff banner resides in PREFIX/share/citadel/messages/goodbye >
X! 
X!  Also be sure to visit UNCENSORED! BBS at uncensored.citadel.org
X  
END-of-/usr/ports/net/citadel/files/patch-aj
echo x - /usr/ports/net/citadel/files/patch-ak
sed 's/^X//' >/usr/ports/net/citadel/files/patch-ak << 'END-of-/usr/ports/net/citadel/files/patch-ak'
X*** messages/hello.orig	Fri May 21 09:45:16 1999
X--- messages/hello	Wed Jun 13 10:42:37 2001
X***************
X*** 1,3 ****
X    
X!  < this logon banner resides in ./messages/hello >
X!  
X--- 1,4 ----
X    
X!  < this logon banner resides in PREFIX/share/citadel/messages/hello >
X! 
X!  Citadel/UX Communications Server - Powered by FreeBSD/i386
END-of-/usr/ports/net/citadel/files/patch-ak
echo x - /usr/ports/net/citadel/files/patch-al
sed 's/^X//' >/usr/ports/net/citadel/files/patch-al << 'END-of-/usr/ports/net/citadel/files/patch-al'
X--- ipc_c_tcp.c.orig	Mon Sep 10 10:45:23 2001
X+++ ipc_c_tcp.c	Mon Sep 10 10:45:35 2001
X@@ -315,7 +315,7 @@
X 
X 	/* If we're using a unix domain socket we can do a bunch of stuff */
X 	if (!strcmp(cithost, UDS)) {
X-		sprintf(sockpath, "citadel.socket");
X+		sprintf(sockpath, "%s/citadel.socket", BBSDIR);
X 		serv_sock = uds_connectsock(sockpath);
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:



More information about the freebsd-ports-bugs mailing list