- Update to 2.3.2-7

- Give maintainership to submitter
- Tweaks

PR:		ports/112158
Submitted by:	Beech Rintoul <beech@alaskaparadise.com>

6 files changed, 23 insertions, 314 deletions

diff --git a/irc/psybnc/Makefile b/irc/psybnc/Makefile
index c49994105d0f..7baf14ae7a7a 100644
--- a/irc/psybnc/Makefile
+++ b/irc/psybnc/Makefile
@@ -1,301 +1,41 @@
-# New ports collection makefile for:   psybnc
-# Date created:        24 November 2002
-# Whom:                Mina Naguib <webmaster@topfx.com>
+# New ports collection makefile for:	psybnc
+# Date created:		24 November 2002
+# Whom:			Mina Naguib <webmaster@topfx.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	psybnc
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+DISTVERSION=	2.3.2-7
 CATEGORIES=	irc ipv6
-MASTER_SITES=	http://www.psyBNC.at/download/final/ \
-		http://psyBNC.info/download/final/
-DISTNAME=	psyBNC${PORTVERSION}
+MASTER_SITES=	http://www.psybnc.at/download/beta/ CENKES
+DISTNAME=	psyBNC-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	PsyBNC is an extremely powerful IRC bouncer
+MAINTAINER=	beech@alaskaparadise.com
+COMMENT=	Extremely powerful IRC bouncer
 
 WRKSRC=		${WRKDIR}/psybnc
 PSYBASE=	${PREFIX}/psybnc
-
-USE_OPENSSL=	yes
-
-MAKE_ARGS=		PSYBASE=${PSYBASE} PREFIX=$(PREFIX)
-
+MAKE_ARGS=	PSYBASE=${PSYBASE}
 IS_INTERACTIVE=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's#=help/#=${PSYBASE}/help/#' ${WRKSRC}/lang/*
+	@${REINPLACE_CMD} -e 's#=help/#=${PSYBASE}/help/#' ${WRKSRC}/lang/*
 
 do-configure:
-	cd ${WRKSRC} && make menuconfig
+	@cd ${WRKSRC} && make menuconfig
 
 do-install:
-	${MKDIR} ${PREFIX}
-	${MKDIR} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc
-
-	${MKDIR} ${PSYBASE}
-	${MKDIR} ${PSYBASE}/lang
-	${MKDIR} ${PSYBASE}/key
-	${MKDIR} ${PSYBASE}/help
-
-	${INSTALL_DATA} ${WRKSRC}/lang/INFO ${PSYBASE}/lang/
-	${INSTALL_DATA} ${WRKSRC}/lang/english.lng ${PSYBASE}/lang/
-	${INSTALL_DATA} ${WRKSRC}/lang/german.lng ${PSYBASE}/lang/
-	${INSTALL_DATA} ${WRKSRC}/lang/italiano.lng ${PSYBASE}/lang/
-
-	if [ -f ${WRKSRC}/key/psybnc.cert.pem ]; then ${INSTALL_DATA} ${WRKSRC}/key/psybnc.cert.pem ${PSYBASE}/key/; fi
-	if [ -f ${WRKSRC}/key/psybnc.key.pem ]; then ${INSTALL_DATA} ${WRKSRC}/key/psybnc.key.pem ${PSYBASE}/key/; fi
-	if [ -f ${WRKSRC}/key/psybnc.req.pem ]; then ${INSTALL_DATA} ${WRKSRC}/key/psybnc.req.pem ${PSYBASE}/key/; fi
-
-	${INSTALL_DATA} ${WRKSRC}/help/ADDLOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELLOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTLOGS.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYTRAFFICLOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PROXY.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETLEAVEMSG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETAWAYNICK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDAUTOOP.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELAUTOOP.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTAUTOOPS.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SRELOAD.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDALLOW.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDASK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDBAN.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDDCC.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDNETWORK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDOP.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDSERVER.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDUSER.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BCONNECT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BHELP.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BKILL.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BQUIT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BWHO.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELALLOW.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELASK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELBAN.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELDCC.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELENCRYPT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTASK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELLINK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELNETWORK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELOP.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELSERVER.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELTRANSLATE.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELUSER.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ENCRYPT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASEMAINLOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASEPRIVATELOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASETRAFFICLOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/JUMP.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LINKFROM.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LINKTO.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTALLOW.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AIDLE.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTBANS.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTDCC.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTENCRYPT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTLINKS.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTOPS.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTSERVERS.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/MADMIN.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/NAMEBOUNCER.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PASSWORD.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYMAINLOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYPRIVATELOG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/RELAYLINK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETAWAY.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETUSERNAME.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SOCKSTAT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/TRANSLATE.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/UNADMIN.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BVHOST.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDIGNORE.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDIGNORE.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/RELINK.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCCHAT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCANSWER.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCSEND.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCGET.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCCANCEL.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BREHASH.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTTASKS.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SWITCHNET.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCENABLE.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AUTOREJOIN.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LEAVEQUIT.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AUTOGETDCC.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDALLOW.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDASK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDAUTOOP.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDBAN.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDDCC.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDLOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDNETWORK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDOP.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDSERVER.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDUSER.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AIDLE.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AUTOGETDCC.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AUTOREJOIN.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BCONNECT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BHELP.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BKILL.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BQUIT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BREHASH.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BWHO.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCANSWER.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCCANCEL.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCCHAT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCENABLE.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCGET.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCSEND.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELALLOW.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELASK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELAUTOOP.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELBAN.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELDCC.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELENCRYPT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELLINK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELLOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELNETWORK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELOP.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELSERVER.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELTRANSLATE.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELUSER.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ENCRYPT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASEMAINLOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASEPRIVATELOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASETRAFFICLOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/JUMP.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LEAVEQUIT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LINKFROM.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LINKTO.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTALLOW.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTASK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTAUTOOPS.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTBANS.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTDCC.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTENCRYPT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTLINKS.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTLOGS.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTOPS.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTSERVERS.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTTASKS.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/MADMIN.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/NAMEBOUNCER.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PASSWORD.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYMAINLOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYPRIVATELOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYTRAFFICLOG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PROXY.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/RELAYLINK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/RELINK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETAWAY.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETAWAYNICK.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETLEAVEMSG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELIGNORE.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELIGNORE.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETUSERNAME.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SOCKSTAT.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SRELOAD.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SWITCHNET.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/TRANSLATE.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/UNADMIN.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BVHOST.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTIGNORES.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTIGNORES.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETLANG.DEU ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETLANG.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDALLOW.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDASK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDAUTOOP.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDBAN.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDDCC.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDIGNORE.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDLOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDNETWORK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDOP.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDSERVER.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ADDUSER.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AIDLE.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AUTOGETDCC.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/AUTOREJOIN.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BCONNECT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BHELP.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BKILL.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BQUIT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BREHASH.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BWHO.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCANSWER.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCCANCEL.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCCHAT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCENABLE.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCGET.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCSEND.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/JUMP.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELALLOW.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELASK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELAUTOOP.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELBAN.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELDCC.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELENCRYPT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELIGNORE.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELLINK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELLOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELNETWORK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELOP.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELSERVER.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELTRANSLATE.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DELUSER.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ENCRYPT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASEMAINLOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASEPRIVATELOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/ERASETRAFFICLOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LEAVEQUIT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LINKFROM.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LINKTO.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTALLOW.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTASK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTAUTOOPS.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTBANS.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTDCC.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTENCRYPT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTIGNORES.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTLINKS.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTLOGS.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTOPS.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTSERVERS.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/LISTTASKS.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/MADMIN.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/NAMEBOUNCER.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PASSWORD.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYMAINLOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYPRIVATELOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PLAYTRAFFICLOG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/PROXY.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/RELAYLINK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/RELINK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETAWAY.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETAWAYNICK.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETLANG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETLEAVEMSG.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SETUSERNAME.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SOCKSTAT.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SRELOAD.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/SWITCHNET.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/TRANSLATE.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/UNADMIN.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/BVHOST.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCSENDME.TXT ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCSENDME.ITA ${PSYBASE}/help/
-	${INSTALL_DATA} ${WRKSRC}/help/DCCSENDME.DEU ${PSYBASE}/help/
-
+	@${INSTALL} -d ${PSYBASE}/lang/ ${PSYBASE}/key/ ${PSYBASE}/help/
+	@${INSTALL_DATA} ${WRKSRC}/lang/INFO ${PSYBASE}/lang/
+	@${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${PSYBASE}/lang/
+	@if [ -f ${WRKSRC}/key/psybnc.cert.pem ]; then ${INSTALL_DATA} ${WRKSRC}/key/psybnc.cert.pem ${PSYBASE}/key/; fi
+	@if [ -f ${WRKSRC}/key/psybnc.key.pem ]; then ${INSTALL_DATA} ${WRKSRC}/key/psybnc.key.pem ${PSYBASE}/key/; fi
+	@if [ -f ${WRKSRC}/key/psybnc.req.pem ]; then ${INSTALL_DATA} ${WRKSRC}/key/psybnc.req.pem ${PSYBASE}/key/; fi
+	@${INSTALL_DATA} ${WRKSRC}/help/*.TXT ${PSYBASE}/help/
+	@${INSTALL_DATA} ${WRKSRC}/help/*.DEU ${PSYBASE}/help/
+	@${INSTALL_DATA} ${WRKSRC}/help/*.ITA ${PSYBASE}/help/
 	${INSTALL_PROGRAM} ${WRKSRC}/psybnc ${PREFIX}/bin/
-
 	${INSTALL_DATA} ${WRKSRC}/psybnc.conf ${PREFIX}/etc/psybnc.conf.sample
 
 .include <bsd.port.mk>
diff --git a/irc/psybnc/distinfo b/irc/psybnc/distinfo
index 086697548290..b5dbf5464cc6 100644
--- a/irc/psybnc/distinfo
+++ b/irc/psybnc/distinfo
@@ -1,3 +1,3 @@
-MD5 (psyBNC2.3.1.tar.gz) = 27c0970a0945fd345c86dc27eda2d711
-SHA256 (psyBNC2.3.1.tar.gz) = 1afa1e01697f1643dfe6949b0fe723081d3a28d3786299299c760881e1fa414a
-SIZE (psyBNC2.3.1.tar.gz) = 312224
+MD5 (psyBNC-2.3.2-7.tar.gz) = c475f14b1b3a9280a123142e6e344dd8
+SHA256 (psyBNC-2.3.2-7.tar.gz) = be38468b374b0470a5728b154527019b7d613c90dc23a93053fda7cdd93f6519
+SIZE (psyBNC-2.3.2-7.tar.gz) = 312177
diff --git a/irc/psybnc/files/patch-tools-convconf.c b/irc/psybnc/files/patch-tools-convconf.c
deleted file mode 100644
index a4a7511a1729..000000000000
--- a/irc/psybnc/files/patch-tools-convconf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/convconf.c.orig	Sat Dec 18 15:03:56 2004
-+++ tools/convconf.c	Sat Dec 18 15:05:01 2004
-@@ -77,7 +77,7 @@
- 		   fprintf(outfile,"%s.%s.%s\n",fname,section,buf);
- 		}
- 	}
--	next:
-+	next:;
-     }
-     return 0x0;
- }
diff --git a/irc/psybnc/files/patch-tools-p_link.c b/irc/psybnc/files/patch-tools-p_link.c
deleted file mode 100644
index 5a6c598f8ffe..000000000000
--- a/irc/psybnc/files/patch-tools-p_link.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/p_link.c.orig	Sat Dec 18 15:05:44 2004
-+++ src/p_link.c	Sat Dec 18 15:06:05 2004
-@@ -554,7 +554,7 @@
-     }
- #endif
-     pcontext;
--br:
-+br:;
- }
- 
- /* error handler for the link checking */
diff --git a/irc/psybnc/pkg-descr b/irc/psybnc/pkg-descr
index 428cc7f32182..62c143a09cb9 100644
--- a/irc/psybnc/pkg-descr
+++ b/irc/psybnc/pkg-descr
@@ -15,7 +15,6 @@ Features include:
 . IPv6 Support
 . Much more (see README in package)
 
-
 WWW: http://www.psyBNC.at/
 
 - Mina Naguib
diff --git a/irc/psybnc/pkg-message b/irc/psybnc/pkg-message
deleted file mode 100644
index 957efa4d103e..000000000000
--- a/irc/psybnc/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-psyBNC has now been installed.
-
-You should now copy ${PREFIX}/etc/psybnc.conf.sample to
-either ${PREFIX}/etc/psybnc.conf, or as "psybnc.conf" in whatever
-direcory you'll run psybnc while in.
-
-You can then run psybnc by running:
-psybnc