Index: head/irc/psybnc/Makefile
===================================================================
--- head/irc/psybnc/Makefile	(revision 395535)
+++ head/irc/psybnc/Makefile	(revision 395536)
@@ -1,64 +1,66 @@
 # Created by: Mina Naguib <webmaster@topfx.com>
 # $FreeBSD$
 
 PORTNAME=	psybnc
 DISTVERSION=	2.3.2-9
 PORTREVISION=	2
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://www.psybnc.at/download/beta/
 DISTNAME=	psyBNC-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful IRC bouncer
 
+LICENSE=	GPLv1 # or later (though COPYING is GPLv2)
+
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/psybnc
 PSYBASE?=	${PREFIX}/psybnc
 MAKE_ARGS=	PSYBASE=${PSYBASE}
 SUB_FILES=	pkg-message
 SUB_LIST=	PSYBASE=${PSYBASE}
 PLIST_SUB=	PSYBASE=${PSYBASE:S,^${PREFIX}/,,}
 
 OPTIONS_DEFINE=	MENUCONFIG
 MENUCONFIG_DESC=Configure using menu
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMENUCONFIG}
 IS_INTERACTIVE=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#=help/#=${PSYBASE}/help/#' ${WRKSRC}/lang/*
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024
 	@${REINPLACE_CMD} -e 's,gcc,clang -Wno-return-type,g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,gcc,clang -Wno-return-type,g' ${WRKSRC}/tools/autoconf.c
 .endif
 
 do-configure:
 .if ${PORT_OPTIONS:MMENUCONFIG}
 	cd ${WRKSRC} && make menuconfig
 .else
 # Fool makefile.out into believing certs are unnecessary
 	${TOUCH} ${WRKSRC}/key/psybnc.cert.pem
 .endif
 
 do-install:
 	${INSTALL} -d ${STAGEDIR}${PSYBASE}/lang/ ${STAGEDIR}${PSYBASE}/key/ ${STAGEDIR}${PSYBASE}/help/
 	${INSTALL_DATA} ${WRKSRC}/lang/INFO ${STAGEDIR}${PSYBASE}/lang/
 	${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${STAGEDIR}${PSYBASE}/lang/
 	${INSTALL_DATA} ${WRKSRC}/src/ssl.cnf ${STAGEDIR}${PSYBASE}/key/
 	${INSTALL_DATA} ${WRKSRC}/help/*.TXT ${STAGEDIR}${PSYBASE}/help/
 	${INSTALL_DATA} ${WRKSRC}/help/*.DEU ${STAGEDIR}${PSYBASE}/help/
 	${INSTALL_DATA} ${WRKSRC}/help/*.ITA ${STAGEDIR}${PSYBASE}/help/
 	${INSTALL_PROGRAM} ${WRKSRC}/psybnc ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/psybnc.conf ${STAGEDIR}${PREFIX}/etc/psybnc.conf.sample
 
 post-install:
 	if [ -f ${WRKSRC}/key/psybnc.req.pem ]; then \
 	    ${INSTALL_DATA} ${WRKSRC}/key/psybnc.cert.pem ${STAGEDIR}${PSYBASE}/key/; \
 	    ${INSTALL_DATA} ${WRKSRC}/key/psybnc.key.pem ${STAGEDIR}${PSYBASE}/key/; \
 	    ${INSTALL_DATA} ${WRKSRC}/key/psybnc.req.pem ${STAGEDIR}${PSYBASE}/key/; \
 	fi
 
 .include <bsd.port.mk>
Index: head/irc/psybnc/pkg-plist
===================================================================
--- head/irc/psybnc/pkg-plist	(revision 395535)
+++ head/irc/psybnc/pkg-plist	(revision 395536)
@@ -1,252 +1,250 @@
 bin/psybnc
-@unexec cmp -s %D/etc/psybnc.conf.sample %D/etc/psybnc.conf && rm -f %D/etc/psybnc.conf || true
-etc/psybnc.conf.sample
-@exec cp -np %D/%F %B/psybnc.conf
+@sample etc/psybnc.conf.sample
 %%PSYBASE%%/lang/INFO
 %%PSYBASE%%/lang/english.lng
 %%PSYBASE%%/lang/german.lng
 %%PSYBASE%%/lang/italiano.lng
 %%PSYBASE%%/help/ADDLOG.TXT
 %%PSYBASE%%/help/DELLOG.TXT
 %%PSYBASE%%/help/LISTLOGS.TXT
 %%PSYBASE%%/help/PLAYTRAFFICLOG.TXT
 %%PSYBASE%%/help/PROXY.TXT
 %%PSYBASE%%/help/SETLEAVEMSG.TXT
 %%PSYBASE%%/help/SETAWAYNICK.TXT
 %%PSYBASE%%/help/ADDAUTOOP.TXT
 %%PSYBASE%%/help/DELAUTOOP.TXT
 %%PSYBASE%%/help/LISTAUTOOPS.TXT
 %%PSYBASE%%/help/SRELOAD.TXT
 %%PSYBASE%%/help/ADDALLOW.TXT
 %%PSYBASE%%/help/ADDASK.TXT
 %%PSYBASE%%/help/ADDBAN.TXT
 %%PSYBASE%%/help/ADDDCC.TXT
 %%PSYBASE%%/help/ADDNETWORK.TXT
 %%PSYBASE%%/help/ADDOP.TXT
 %%PSYBASE%%/help/ADDSERVER.TXT
 %%PSYBASE%%/help/ADDUSER.TXT
 %%PSYBASE%%/help/BCONNECT.TXT
 %%PSYBASE%%/help/BHELP.TXT
 %%PSYBASE%%/help/BKILL.TXT
 %%PSYBASE%%/help/BQUIT.TXT
 %%PSYBASE%%/help/BWHO.TXT
 %%PSYBASE%%/help/DELALLOW.TXT
 %%PSYBASE%%/help/DELASK.TXT
 %%PSYBASE%%/help/DELBAN.TXT
 %%PSYBASE%%/help/DELDCC.TXT
 %%PSYBASE%%/help/DELENCRYPT.TXT
 %%PSYBASE%%/help/LISTASK.TXT
 %%PSYBASE%%/help/DELLINK.TXT
 %%PSYBASE%%/help/DELNETWORK.TXT
 %%PSYBASE%%/help/DELOP.TXT
 %%PSYBASE%%/help/DELSERVER.TXT
 %%PSYBASE%%/help/DELTRANSLATE.TXT
 %%PSYBASE%%/help/DELUSER.TXT
 %%PSYBASE%%/help/ENCRYPT.TXT
 %%PSYBASE%%/help/ERASEMAINLOG.TXT
 %%PSYBASE%%/help/ERASEPRIVATELOG.TXT
 %%PSYBASE%%/help/ERASETRAFFICLOG.TXT
 %%PSYBASE%%/help/JUMP.TXT
 %%PSYBASE%%/help/LINKFROM.TXT
 %%PSYBASE%%/help/LINKTO.TXT
 %%PSYBASE%%/help/LISTALLOW.TXT
 %%PSYBASE%%/help/AIDLE.TXT
 %%PSYBASE%%/help/LISTBANS.TXT
 %%PSYBASE%%/help/LISTDCC.TXT
 %%PSYBASE%%/help/LISTENCRYPT.TXT
 %%PSYBASE%%/help/LISTLINKS.TXT
 %%PSYBASE%%/help/LISTOPS.TXT
 %%PSYBASE%%/help/LISTSERVERS.TXT
 %%PSYBASE%%/help/MADMIN.TXT
 %%PSYBASE%%/help/NAMEBOUNCER.TXT
 %%PSYBASE%%/help/PASSWORD.TXT
 %%PSYBASE%%/help/PLAYMAINLOG.TXT
 %%PSYBASE%%/help/PLAYPRIVATELOG.TXT
 %%PSYBASE%%/help/RELAYLINK.TXT
 %%PSYBASE%%/help/SETAWAY.TXT
 %%PSYBASE%%/help/SETUSERNAME.TXT
 %%PSYBASE%%/help/SOCKSTAT.TXT
 %%PSYBASE%%/help/TRANSLATE.TXT
 %%PSYBASE%%/help/UNADMIN.TXT
 %%PSYBASE%%/help/BVHOST.DEU
 %%PSYBASE%%/help/ADDIGNORE.DEU
 %%PSYBASE%%/help/ADDIGNORE.TXT
 %%PSYBASE%%/help/RELINK.TXT
 %%PSYBASE%%/help/DCCCHAT.TXT
 %%PSYBASE%%/help/DCCANSWER.TXT
 %%PSYBASE%%/help/DCCSEND.TXT
 %%PSYBASE%%/help/DCCGET.TXT
 %%PSYBASE%%/help/DCCCANCEL.TXT
 %%PSYBASE%%/help/BREHASH.TXT
 %%PSYBASE%%/help/LISTTASKS.TXT
 %%PSYBASE%%/help/SWITCHNET.TXT
 %%PSYBASE%%/help/DCCENABLE.TXT
 %%PSYBASE%%/help/AUTOREJOIN.TXT
 %%PSYBASE%%/help/LEAVEQUIT.TXT
 %%PSYBASE%%/help/AUTOGETDCC.TXT
 %%PSYBASE%%/help/ADDALLOW.DEU
 %%PSYBASE%%/help/ADDASK.DEU
 %%PSYBASE%%/help/ADDAUTOOP.DEU
 %%PSYBASE%%/help/ADDBAN.DEU
 %%PSYBASE%%/help/ADDDCC.DEU
 %%PSYBASE%%/help/ADDLOG.DEU
 %%PSYBASE%%/help/ADDNETWORK.DEU
 %%PSYBASE%%/help/ADDOP.DEU
 %%PSYBASE%%/help/ADDSERVER.DEU
 %%PSYBASE%%/help/ADDUSER.DEU
 %%PSYBASE%%/help/AIDLE.DEU
 %%PSYBASE%%/help/AUTOGETDCC.DEU
 %%PSYBASE%%/help/AUTOREJOIN.DEU
 %%PSYBASE%%/help/BCONNECT.DEU
 %%PSYBASE%%/help/BHELP.DEU
 %%PSYBASE%%/help/BKILL.DEU
 %%PSYBASE%%/help/BQUIT.DEU
 %%PSYBASE%%/help/BREHASH.DEU
 %%PSYBASE%%/help/BWHO.DEU
 %%PSYBASE%%/help/DCCANSWER.DEU
 %%PSYBASE%%/help/DCCCANCEL.DEU
 %%PSYBASE%%/help/DCCCHAT.DEU
 %%PSYBASE%%/help/DCCENABLE.DEU
 %%PSYBASE%%/help/DCCGET.DEU
 %%PSYBASE%%/help/DCCSEND.DEU
 %%PSYBASE%%/help/DELALLOW.DEU
 %%PSYBASE%%/help/DELASK.DEU
 %%PSYBASE%%/help/DELAUTOOP.DEU
 %%PSYBASE%%/help/DELBAN.DEU
 %%PSYBASE%%/help/DELDCC.DEU
 %%PSYBASE%%/help/DELENCRYPT.DEU
 %%PSYBASE%%/help/DELLINK.DEU
 %%PSYBASE%%/help/DELLOG.DEU
 %%PSYBASE%%/help/DELNETWORK.DEU
 %%PSYBASE%%/help/DELOP.DEU
 %%PSYBASE%%/help/DELSERVER.DEU
 %%PSYBASE%%/help/DELTRANSLATE.DEU
 %%PSYBASE%%/help/DELUSER.DEU
 %%PSYBASE%%/help/ENCRYPT.DEU
 %%PSYBASE%%/help/ERASEMAINLOG.DEU
 %%PSYBASE%%/help/ERASEPRIVATELOG.DEU
 %%PSYBASE%%/help/ERASETRAFFICLOG.DEU
 %%PSYBASE%%/help/JUMP.DEU
 %%PSYBASE%%/help/LEAVEQUIT.DEU
 %%PSYBASE%%/help/LINKFROM.DEU
 %%PSYBASE%%/help/LINKTO.DEU
 %%PSYBASE%%/help/LISTALLOW.DEU
 %%PSYBASE%%/help/LISTASK.DEU
 %%PSYBASE%%/help/LISTAUTOOPS.DEU
 %%PSYBASE%%/help/LISTBANS.DEU
 %%PSYBASE%%/help/LISTDCC.DEU
 %%PSYBASE%%/help/LISTENCRYPT.DEU
 %%PSYBASE%%/help/LISTLINKS.DEU
 %%PSYBASE%%/help/LISTLOGS.DEU
 %%PSYBASE%%/help/LISTOPS.DEU
 %%PSYBASE%%/help/LISTSERVERS.DEU
 %%PSYBASE%%/help/LISTTASKS.DEU
 %%PSYBASE%%/help/MADMIN.DEU
 %%PSYBASE%%/help/NAMEBOUNCER.DEU
 %%PSYBASE%%/help/PASSWORD.DEU
 %%PSYBASE%%/help/PLAYMAINLOG.DEU
 %%PSYBASE%%/help/PLAYPRIVATELOG.DEU
 %%PSYBASE%%/help/PLAYTRAFFICLOG.DEU
 %%PSYBASE%%/help/PROXY.DEU
 %%PSYBASE%%/help/RELAYLINK.DEU
 %%PSYBASE%%/help/RELINK.DEU
 %%PSYBASE%%/help/SETAWAY.DEU
 %%PSYBASE%%/help/SETAWAYNICK.DEU
 %%PSYBASE%%/help/SETLEAVEMSG.DEU
 %%PSYBASE%%/help/DELIGNORE.DEU
 %%PSYBASE%%/help/DELIGNORE.TXT
 %%PSYBASE%%/help/SETUSERNAME.DEU
 %%PSYBASE%%/help/SOCKSTAT.DEU
 %%PSYBASE%%/help/SRELOAD.DEU
 %%PSYBASE%%/help/SWITCHNET.DEU
 %%PSYBASE%%/help/TRANSLATE.DEU
 %%PSYBASE%%/help/UNADMIN.DEU
 %%PSYBASE%%/help/BVHOST.ITA
 %%PSYBASE%%/help/LISTIGNORES.DEU
 %%PSYBASE%%/help/LISTIGNORES.TXT
 %%PSYBASE%%/help/SETLANG.DEU
 %%PSYBASE%%/help/SETLANG.TXT
 %%PSYBASE%%/help/ADDALLOW.ITA
 %%PSYBASE%%/help/ADDASK.ITA
 %%PSYBASE%%/help/ADDAUTOOP.ITA
 %%PSYBASE%%/help/ADDBAN.ITA
 %%PSYBASE%%/help/ADDDCC.ITA
 %%PSYBASE%%/help/ADDIGNORE.ITA
 %%PSYBASE%%/help/ADDLOG.ITA
 %%PSYBASE%%/help/ADDNETWORK.ITA
 %%PSYBASE%%/help/ADDOP.ITA
 %%PSYBASE%%/help/ADDSERVER.ITA
 %%PSYBASE%%/help/ADDUSER.ITA
 %%PSYBASE%%/help/AIDLE.ITA
 %%PSYBASE%%/help/AUTOGETDCC.ITA
 %%PSYBASE%%/help/AUTOREJOIN.ITA
 %%PSYBASE%%/help/BCONNECT.ITA
 %%PSYBASE%%/help/BHELP.ITA
 %%PSYBASE%%/help/BKILL.ITA
 %%PSYBASE%%/help/BQUIT.ITA
 %%PSYBASE%%/help/BREHASH.ITA
 %%PSYBASE%%/help/BWHO.ITA
 %%PSYBASE%%/help/DCCANSWER.ITA
 %%PSYBASE%%/help/DCCCANCEL.ITA
 %%PSYBASE%%/help/DCCCHAT.ITA
 %%PSYBASE%%/help/DCCENABLE.ITA
 %%PSYBASE%%/help/DCCGET.ITA
 %%PSYBASE%%/help/DCCSEND.ITA
 %%PSYBASE%%/help/JUMP.ITA
 %%PSYBASE%%/help/DELALLOW.ITA
 %%PSYBASE%%/help/DELASK.ITA
 %%PSYBASE%%/help/DELAUTOOP.ITA
 %%PSYBASE%%/help/DELBAN.ITA
 %%PSYBASE%%/help/DELDCC.ITA
 %%PSYBASE%%/help/DELENCRYPT.ITA
 %%PSYBASE%%/help/DELIGNORE.ITA
 %%PSYBASE%%/help/DELLINK.ITA
 %%PSYBASE%%/help/DELLOG.ITA
 %%PSYBASE%%/help/DELNETWORK.ITA
 %%PSYBASE%%/help/DELOP.ITA
 %%PSYBASE%%/help/DELSERVER.ITA
 %%PSYBASE%%/help/DELTRANSLATE.ITA
 %%PSYBASE%%/help/DELUSER.ITA
 %%PSYBASE%%/help/ENCRYPT.ITA
 %%PSYBASE%%/help/ERASEMAINLOG.ITA
 %%PSYBASE%%/help/ERASEPRIVATELOG.ITA
 %%PSYBASE%%/help/ERASETRAFFICLOG.ITA
 %%PSYBASE%%/help/LEAVEQUIT.ITA
 %%PSYBASE%%/help/LINKFROM.ITA
 %%PSYBASE%%/help/LINKTO.ITA
 %%PSYBASE%%/help/LISTALLOW.ITA
 %%PSYBASE%%/help/LISTASK.ITA
 %%PSYBASE%%/help/LISTAUTOOPS.ITA
 %%PSYBASE%%/help/LISTBANS.ITA
 %%PSYBASE%%/help/LISTDCC.ITA
 %%PSYBASE%%/help/LISTENCRYPT.ITA
 %%PSYBASE%%/help/LISTIGNORES.ITA
 %%PSYBASE%%/help/LISTLINKS.ITA
 %%PSYBASE%%/help/LISTLOGS.ITA
 %%PSYBASE%%/help/LISTOPS.ITA
 %%PSYBASE%%/help/LISTSERVERS.ITA
 %%PSYBASE%%/help/LISTTASKS.ITA
 %%PSYBASE%%/help/MADMIN.ITA
 %%PSYBASE%%/help/NAMEBOUNCER.ITA
 %%PSYBASE%%/help/PASSWORD.ITA
 %%PSYBASE%%/help/PLAYMAINLOG.ITA
 %%PSYBASE%%/help/PLAYPRIVATELOG.ITA
 %%PSYBASE%%/help/PLAYTRAFFICLOG.ITA
 %%PSYBASE%%/help/PROXY.ITA
 %%PSYBASE%%/help/RELAYLINK.ITA
 %%PSYBASE%%/help/RELINK.ITA
 %%PSYBASE%%/help/SETAWAY.ITA
 %%PSYBASE%%/help/SETAWAYNICK.ITA
 %%PSYBASE%%/help/SETLANG.ITA
 %%PSYBASE%%/help/SETLEAVEMSG.ITA
 %%PSYBASE%%/help/SETUSERNAME.ITA
 %%PSYBASE%%/help/SOCKSTAT.ITA
 %%PSYBASE%%/help/SRELOAD.ITA
 %%PSYBASE%%/help/SWITCHNET.ITA
 %%PSYBASE%%/help/TRANSLATE.ITA
 %%PSYBASE%%/help/UNADMIN.ITA
 %%PSYBASE%%/help/BVHOST.TXT
 %%PSYBASE%%/help/DCCSENDME.TXT
 %%PSYBASE%%/help/DCCSENDME.ITA
 %%PSYBASE%%/help/DCCSENDME.DEU
 %%PSYBASE%%/key/ssl.cnf