diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index cb75f006c146..45c71ac286d5 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -1,74 +1,84 @@
 PORTNAME=	bitchx
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES+=	irc
 MASTER_SITES=	SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Feature-rich scriptable IRC client
 WWW=		http://www.bitchx.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		cpe gmake ncurses
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
 		--libdir="${PREFIX}/share"
 
+MAKE_JOBS_UNSAFE=	yes
+
 CONFLICTS_INSTALL?=	zh-bitchx
 
-OPTIONS_SUB=	yes
+DATADIR=	${PREFIX}/share/bx
+DOCSDIR=	${PREFIX}/share/bx/help
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
-DOCSDIR=	${PREFIX}/share/bx/help
 PORTDOCS=	*
-DATADIR=	${PREFIX}/share/bx
-
-MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS LANG_HE IPV6 LATIN PLUGINS SSL TOGGLES
 OPTIONS_DEFAULT=	PLUGINS SSL
+OPTIONS_SUB=	yes
 
 LATIN_DESC=	Recommended for ISO-8859-1 display
 PLUGINS_DESC=	Build a handful of BitchX plugins
 TOGGLES_DESC=	Disable annoyance toggles
 
 IPV6_CONFIGURE_ENABLE=	ipv6
-
-SSL_CONFIGURE_WITH=	ssl="${OPENSSLBASE}"
-SSL_USES=		ssl
-
 PLUGINS_CONFIGURE_WITH=	plugins="${PLUGIN_LIST:C/\$$/,/g}"
+SSL_USES=		ssl
+SSL_CONFIGURE_WITH=	ssl="${OPENSSLBASE}"
 
 PLUGIN_LIST=	abot acro arcfour autocycle blowfish cavlink cdrom encrypt \
 		europa fserv hint nap nicklist pkga possum qbx qmail wavplay
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's|SSLeay|ERR_get_error|' ${WRKSRC}/configure
 
 post-patch-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
-post-patch-LATIN-on:
-	${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \
-		${WRKSRC}/include/config.h
-
 post-patch-LANG_HE-on:
 	${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \
 		${WRKSRC}/include/config.h
 
+post-patch-LATIN-on:
+	${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \
+		${WRKSRC}/include/config.h
+
 post-patch-TOGGLES-on:
 	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_AWAY ON|DEFAULT_AUTO_AWAY OFF|' \
 		${WRKSRC}/include/config.h
 	${REINPLACE_CMD} -e 's|DEFAULT_KICK_OPS ON|DEFAULT_KICK_OPS OFF|' \
 		${WRKSRC}/include/config.h
 	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_REJOIN ON|DEFAULT_AUTO_REJOIN OFF|' \
 		${WRKSRC}/include/config.h
 
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/bx/plugins/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/bx/wserv
+
 .include <bsd.port.mk>
diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist
index c3bed8d5e068..d90c66f1e53e 100644
--- a/irc/bitchx/pkg-plist
+++ b/irc/bitchx/pkg-plist
@@ -1,78 +1,78 @@
-@unexec if [ -f %D/%%DATADIR%%/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi
 bin/BitchX
 bin/BitchX-%%DISTVERSION%%
 bin/scr-bx
 man/man1/BitchX.1.gz
 %%DATADIR%%/BitchX.help
 %%DATADIR%%/BitchX.ircnames
 %%DATADIR%%/BitchX.quit
 %%DATADIR%%/BitchX.kick
 @dir %%DATADIR%%/plugins
 %%PLUGINS%%%%DATADIR%%/plugins/BitchX.hints
 %%PLUGINS%%%%DATADIR%%/plugins/acro.so
 %%PLUGINS%%%%DATADIR%%/plugins/autobot.so
 %%PLUGINS%%%%DATADIR%%/plugins/blowfish.so
 %%PLUGINS%%%%DATADIR%%/plugins/cavlink.so
 %%PLUGINS%%%%DATADIR%%/plugins/encrypt.so
 %%PLUGINS%%%%DATADIR%%/plugins/fserv.so
 %%PLUGINS%%%%DATADIR%%/plugins/hint.so
 %%PLUGINS%%%%DATADIR%%/plugins/nap.so
 %%PLUGINS%%%%DATADIR%%/plugins/pkga.so
 %%PLUGINS%%%%DATADIR%%/plugins/possum.so
 %%PLUGINS%%%%DATADIR%%/plugins/qmail.so
 %%PLUGINS%%%%DATADIR%%/plugins/wavplay.so
 %%PLUGINS%%%%DATADIR%%/plugins/qbx.so
 %%PLUGINS%%%%DATADIR%%/plugins/arcfour.so
 %%PLUGINS%%%%DATADIR%%/plugins/autocycle.so
 %%PLUGINS%%%%DATADIR%%/plugins/cdrom.so
 %%PLUGINS%%%%DATADIR%%/plugins/nicklist.so
 %%DATADIR%%/script/SCRIPTS
 %%DATADIR%%/script/actplug.gmz
 %%DATADIR%%/script/bxglobal
 %%DATADIR%%/script/bxtcl.tcl
 %%DATADIR%%/script/cyp1.0k.tar.gz
 %%DATADIR%%/script/dcc_fserve-0.50.tgz
 %%DATADIR%%/script/example-.bitchxrc
 %%DATADIR%%/script/file.tcl
 %%DATADIR%%/script/fserve+vfs.tar.gz
 %%DATADIR%%/script/logger.bx
 %%DATADIR%%/script/menu.bx
 %%DATADIR%%/script/operchallenge-1.3.tar
 %%DATADIR%%/script/query.bx
 %%DATADIR%%/script/auto_resume
 %%DATADIR%%/script/fserve.irc
 %%DATADIR%%/script/query
 %%DATADIR%%/translation/ASCII
 %%DATADIR%%/translation/CP437
 %%DATADIR%%/translation/CP850
 %%DATADIR%%/translation/DANISH
 %%DATADIR%%/translation/DEC_MCS
 %%DATADIR%%/translation/DG_MCS
 %%DATADIR%%/translation/DUTCH
 %%DATADIR%%/translation/FINNISH
 %%DATADIR%%/translation/FRENCH
 %%DATADIR%%/translation/FRENCH_CANADIAN
 %%DATADIR%%/translation/GERMAN
 %%DATADIR%%/translation/HP_MCS
 %%DATADIR%%/translation/IRV
 %%DATADIR%%/translation/ITALIAN
 %%DATADIR%%/translation/JIS
 %%DATADIR%%/translation/MACINTOSH
 %%DATADIR%%/translation/NEXT
 %%DATADIR%%/translation/NORWEGIAN_1
 %%DATADIR%%/translation/NORWEGIAN_2
 %%DATADIR%%/translation/POLISH
 %%DATADIR%%/translation/POLISH_NOPL
 %%DATADIR%%/translation/PORTUGUESE
 %%DATADIR%%/translation/PORTUGUESE_COM
 %%DATADIR%%/translation/RUSSIAN
 %%DATADIR%%/translation/RUSSIAN_ALT
 %%DATADIR%%/translation/RUSSIAN_WIN
 %%DATADIR%%/translation/SPANISH
 %%DATADIR%%/translation/SWEDISH
 %%DATADIR%%/translation/SWEDISH_NAMES
 %%DATADIR%%/translation/SWEDISH_NAMES_COM
 %%DATADIR%%/translation/SWISS
 %%DATADIR%%/translation/UNITED_KINGDOM
 %%DATADIR%%/translation/UNITED_KINGDOM_COM
 %%DATADIR%%/wserv
+@rmtry %%DATADIR%%/script/bxglobal.old