Index: head/comms/thebridge/Makefile
===================================================================
--- head/comms/thebridge/Makefile	(revision 527257)
+++ head/comms/thebridge/Makefile	(revision 527258)
@@ -1,41 +1,45 @@
 # Created by: db
 # $FreeBSD$
 
 PORTNAME=	thebridge
 PORTVERSION=	1.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/cqinet/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Echolink conference bridge
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake shebangfix tar:tgz
 GNU_CONFIGURE=	yes
 PORTDOCS=	README
 USE_RC_SUBR=	tbd
 MAKE_ARGS=	AUTOMAKE="${TRUE}"
 
 SHEBANG_FILES=	addons/usermgmt.cgi
 
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=			DOCS READLINE
+OPTIONS_DEFAULT=		READLINE
+
+READLINE_CONFIGURE_WITH=	readline
+READLINE_USES=			readline
 
 post-patch:
 	@${REINPLACE_CMD} 's!tbdcmd=\/usr\/local!tbdcmd=${PREFIX}!'\
 		${WRKSRC}/addons/usermgmt.cgi
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/addons/README ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/comms/thebridge/files/patch-Makefile.in
===================================================================
--- head/comms/thebridge/files/patch-Makefile.in	(revision 527257)
+++ head/comms/thebridge/files/patch-Makefile.in	(revision 527258)
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2012-12-10 01:05:20.000000000 -0500
-+++ Makefile.in	2013-01-03 20:39:17.000000000 -0500
-@@ -253,7 +253,7 @@
+--- Makefile.in.orig	2012-12-10 06:05:20 UTC
++++ Makefile.in
+@@ -253,7 +253,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = common zlib src inc tbdcmd addons
 +SUBDIRS = common src inc tbdcmd addons
  EXTRA_DIST = theBridge.dsp tbd.conf.sample README.txt FreeBSD RedHat \
  	     SCRIPTING.txt Debian
  

Property changes on: head/comms/thebridge/files/patch-Makefile.in
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-yes
\ No newline at end of property
+1
\ No newline at end of property
Index: head/comms/thebridge/files/patch-configure.in
===================================================================
--- head/comms/thebridge/files/patch-configure.in	(revision 527257)
+++ head/comms/thebridge/files/patch-configure.in	(revision 527258)
@@ -1,9 +1,9 @@
---- configure.in.orig	2013-01-03 19:17:41.000000000 -0500
-+++ configure.in	2013-01-03 19:18:21.000000000 -0500
-@@ -84,5 +84,5 @@
+--- configure.in.orig	2012-12-10 05:57:10 UTC
++++ configure.in
+@@ -84,5 +84,5 @@ AC_DEFINE_UNQUOTED(OUR_HOST,"${host}",
  [Set to a text string describing your operating system and hardware])
  
  AC_OUTPUT(Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile 
 -zlib/Makefile addons/Makefile)
 + addons/Makefile)
  

Property changes on: head/comms/thebridge/files/patch-configure.in
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-yes
\ No newline at end of property
+1
\ No newline at end of property
Index: head/comms/thebridge/files/patch-src_Makefile.in
===================================================================
--- head/comms/thebridge/files/patch-src_Makefile.in	(revision 527257)
+++ head/comms/thebridge/files/patch-src_Makefile.in	(revision 527258)
@@ -1,35 +1,35 @@
---- src/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
-+++ src/Makefile.in	2013-10-24 13:57:30.000000000 +0900
-@@ -115,7 +115,7 @@
+--- src/Makefile.in.orig	2012-12-10 06:00:44 UTC
++++ src/Makefile.in
+@@ -115,7 +115,7 @@ am__tbd_SOURCES_DIST = conference.c conference.h confi
  tbd_OBJECTS = $(am_tbd_OBJECTS)
  am__DEPENDENCIES_1 =
  @LINK_BOX_FALSE@tbd_DEPENDENCIES = $(top_builddir)/common/libcommon.a \
 -@LINK_BOX_FALSE@	$(top_builddir)/zlib/libzlib.a \
 +@LINK_BOX_FALSE@	-lz -lm \
  @LINK_BOX_FALSE@	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-@@ -233,12 +233,12 @@
+@@ -233,12 +233,12 @@ top_srcdir = @top_srcdir@
  @LINK_BOX_TRUE@                   dirclient.c dirclient.h thebridge.c users.c users.h \
  @LINK_BOX_TRUE@                   hostfile.c hostfile.h eventhook.c eventhook.h avrs.c avrs.h 
  
 -@LINK_BOX_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/zlib -I$(top_srcdir)/spandsp \
 +@LINK_BOX_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/spandsp \
  @LINK_BOX_FALSE@              -DSYSCON_DIR=\"$(sysconfdir)\"
  
  @LINK_BOX_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/inc \
  @LINK_BOX_TRUE@	-I$(top_srcdir)/gsm/inc -DLINK_BOX \
 -@LINK_BOX_TRUE@	-I$(top_srcdir)/zlib -I$(top_srcdir)/linkbox \
 +@LINK_BOX_TRUE@	-I$(top_srcdir)/linkbox \
  @LINK_BOX_TRUE@	-DSYSCON_DIR=\"$(sysconfdir)\" $(am__append_1)
  @LINK_BOX_FALSE@AM_CFLAGS = -Wall $(am__append_2)
  @LINK_BOX_TRUE@AM_CFLAGS = -Wall $(am__append_2)
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ top_srcdir = @top_srcdir@
  @LINK_BOX_FALSE@        dirclient.h thebridge.c users.c users.h hostfile.c hostfile.h \
  @LINK_BOX_FALSE@        eventhook.c eventhook.h avrs.c avrs.h
  
 -@LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a $(top_builddir)/zlib/libzlib.a \
 +@LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a -lz \
  @LINK_BOX_FALSE@            $(LIBDMALLOC) -lm
  
  all: all-am

Property changes on: head/comms/thebridge/files/patch-src_Makefile.in
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-yes
\ No newline at end of property
+1
\ No newline at end of property
Index: head/comms/thebridge/files/patch-src_conference.c
===================================================================
--- head/comms/thebridge/files/patch-src_conference.c	(revision 527257)
+++ head/comms/thebridge/files/patch-src_conference.c	(revision 527258)
@@ -1,11 +1,11 @@
---- src/conference.c.orig	2013-01-03 21:44:25.000000000 -0500
-+++ src/conference.c	2013-01-03 21:44:51.000000000 -0500
+--- src/conference.c.orig	2012-12-09 19:21:01 UTC
++++ src/conference.c
 @@ -784,7 +784,7 @@
  #include "ilink.h"
  #include "sf.h"
  #include "hostfile.h"
 -#include "zlib.h"
 +#include <zlib.h>
  #include "tbd.h"
  
  #if defined _WIN32GUI || defined _X11GUI

Property changes on: head/comms/thebridge/files/patch-src_conference.c
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-yes
\ No newline at end of property
+1
\ No newline at end of property
Index: head/comms/thebridge/files/patch-src_dirclient.c
===================================================================
--- head/comms/thebridge/files/patch-src_dirclient.c	(revision 527257)
+++ head/comms/thebridge/files/patch-src_dirclient.c	(revision 527258)
@@ -1,11 +1,11 @@
---- src/dirclient.c.orig	2013-01-03 21:44:33.000000000 -0500
-+++ src/dirclient.c	2013-01-03 21:45:03.000000000 -0500
+--- src/dirclient.c.orig	2008-09-14 17:04:51 UTC
++++ src/dirclient.c
 @@ -222,7 +222,7 @@
  #include "dirclient.h"
  #include "hostfile.h"
  #include "eventhook.h"
 -#include "zlib.h"
 +#include <zlib.h>
  #include "sf.h"
  
  #ifdef USE_DMALLOC

Property changes on: head/comms/thebridge/files/patch-src_dirclient.c
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-yes
\ No newline at end of property
+1
\ No newline at end of property
Index: head/comms/thebridge/files/patch-tbdcmd_Makefile.in
===================================================================
--- head/comms/thebridge/files/patch-tbdcmd_Makefile.in	(revision 527257)
+++ head/comms/thebridge/files/patch-tbdcmd_Makefile.in	(revision 527258)
@@ -1,11 +1,11 @@
---- tbdcmd/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
-+++ tbdcmd/Makefile.in	2013-10-24 13:36:31.000000000 +0900
-@@ -530,7 +530,7 @@
+--- tbdcmd/Makefile.in.orig	2012-12-10 06:00:44 UTC
++++ tbdcmd/Makefile.in
+@@ -530,7 +530,7 @@ uninstall-am: uninstall-binPROGRAMS
  @LINK_BOX_FALSE@	if test -f $(DESTDIR)$(bindir)/tbdchat; then \
  @LINK_BOX_FALSE@		rm $(DESTDIR)$(bindir)/tbdchat; \
  @LINK_BOX_FALSE@	fi
 -@LINK_BOX_FALSE@	ln -s $(DESTDIR)$(bindir)/tbdcmd $(DESTDIR)$(bindir)/tbdchat
 +@LINK_BOX_FALSE@	ln -s tbdcmd $(DESTDIR)$(bindir)/tbdchat
  
  @LINK_BOX_FALSE@uninstall-hook:
  @LINK_BOX_FALSE@	rm $(DESTDIR)$(bindir)/tbdchat