irc/irssi: Revert to 1.2.2

The reason for the revert is complaints on IRC and questions to the maintainer
via email.

This commit:

  - Restores the port to what it was before 1.3
  - Bumps PORTEPOCH and PORTREVISION to 2
    - These were both at 1 on the previous 1.2.2 package
  - Fixes a minor issue when compiling with OTR (--with-otr being passed twice)
  - Includes a patch for a glib related issue where pushing ctrl+space could break the client

This commit brings the port back inline with the current release version of
irssi as advertised on their download page (1.2.2 client + glib patch).

PR:		254237
Submitted by:	David O'Rourke <dor.bsd@xm0.uk> (maintainer)

12 files changed, 282 insertions, 83 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 31db844a0afb..4310d9eb67ba 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	irssi
-DISTVERSION=	1.3-dev-344
-DISTVERSIONSUFFIX=	-gf57dcfe9
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	1.2.2
+PORTREVISION=	2
+PORTEPOCH=	2
 CATEGORIES?=	irc
+MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
 
 MAINTAINER=	dor.bsd@xm0.uk
 COMMENT=	Modular IRC client with many features
@@ -14,51 +14,57 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Until upstream makes a new release disable cpe
-USES=		compiler:c11 gettext-runtime gnome meson localbase:ldflags \
-		ncurses perl5 pkgconfig ssl
+USES=		autoreconf cpe gettext-runtime gmake gnome libtool localbase \
+		ncurses pkgconfig tar:xz
 USE_GNOME=	glib20
-USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_TAGNAME=	f57dcfe
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
-MESON_ARGS=	-Dinstall-glib=no -Ddisable-gregex=no -Dstatic-dependency=no \
-		-Dwith-fuzzer=no -Dwithout-textui=no
-
-# Default linker (bfd) in FreeBSD 11 breaks compilation
-LDFLAGS_FreeBSD_11=	-fuse-ld=lld
-
-# Force OpenSSL from base
-CPPFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl ${LDFLAGS_${OPSYS}_${OSREL:R}}
-
-OPTIONS_DEFINE=		BOT CAPSICUM DOCS OTR PERL PROXY TRUECOLOR UTF8PROC
-OPTIONS_DEFAULT=	BOT CAPSICUM PERL PROXY TRUECOLOR
+OPTIONS_DEFINE=		BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR \
+			UTF8PROC
+OPTIONS_DEFAULT=	BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR
 OPTIONS_SUB=		yes
 
-BOT_DESC=		Bot support
-CAPSICUM_DESC=		Capsicum support
-OTR_DESC=		OTR (off-the-record) support
-TRUECOLOR_DESC=		True color support
-UTF8PROC_DESC=		utf8proc support
+BOT_DESC=			Bot support
+BOT_CONFIGURE_WITH=		bot
+CAPSICUM_DESC=			Capsicum support
+CAPSICUM_CONFIGURE_WITH=	capsicum
+OTR_DESC=			OTR (off-the-record) support
+OTR_CONFIGURE_ON=		--with-libotr-inc-prefix=${PREFIX}/include
+OTR_CONFIGURE_OFF=		--with-otr=no
+OTR_CONFIGURE_WITH=		otr
+OTR_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt \
+				libgpg-error.so:security/libgpg-error \
+				libotr.so:security/libotr
+PERL_USES=			perl5
+PERL_CONFIGURE_ON=		--with-perl-lib=site
+PERL_CONFIGURE_OFF=		--with-perl=no
+PROXY_CONFIGURE_WITH=		proxy
+SOCKS_DESC=			Socks proxy support
+SOCKS_CONFIGURE_WITH=		socks
+TRUECOLOR_DESC=			True color support
+TRUECOLOR_CONFIGURE_ENABLE=	true-color
+UTF8PROC_DESC=			utf8proc support
+UTF8PROC_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
+UTF8PROC_CONFIGURE_ENABLE=	utf8proc
 
-BOT_MESON_YES=		with-bot
-CAPSICUM_MESON_YES=	with-capsicum
-OTR_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
-			libotr.so:security/libotr
-OTR_MESON_YES=		with-otr
-PERL_MESON_YES=		with-perl
-PROXY_MESON_YES=	with-proxy
-TRUECOLOR_MESON_YES=	enable-true-color
-UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
-UTF8PROC_MESON_NO=	disable-utf8proc
+.if defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--disable-ssl
+.else
+USES+=		ssl
+.endif
 
-PERL_USE_OFF=	perl5=build
-
-post-install-PERL-off:
-	@${RM} -r ${STAGEDIR}${DATADIR}/scripts
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
+	@${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf \
+		${STAGEDIR}${PREFIX}/etc/irssi.conf.sample
+
+post-install-PERL-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irc/Irc.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/TextUI/TextUI.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/UI/UI.so
 
 .include <bsd.port.mk>
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index c141c0cb40a5..4131bae2724f 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605383170
-SHA256 (irssi-irssi-1.3-dev-344-gf57dcfe9-f57dcfe_GH0.tar.gz) = d3aa102674dafdcaf82af214994405492f51ab0695d837ef2f1a2af64bf662d6
-SIZE (irssi-irssi-1.3-dev-344-gf57dcfe9-f57dcfe_GH0.tar.gz) = 794837
+TIMESTAMP = 1615547467
+SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578
+SIZE (irssi-1.2.2.tar.xz) = 1140844
diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in
new file mode 100644
index 000000000000..dce4daddc1ab
--- /dev/null
+++ b/irc/irssi/files/patch-Makefile.in
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	2019-02-11 17:35:31 UTC
++++ Makefile.in
+@@ -421,7 +421,7 @@ BUILT_SOURCES = default-config.h default-theme.h irssi
+ CLEANFILES = default-config.h default-theme.h
+ SUBDIRS = src tests docs scripts themes utils
+ confdir = $(sysconfdir)
+-conf_DATA = irssi.conf
++conf_DATA = irssi.conf.sample
+ pkginclude_HEADERS = irssi-config.h irssi-version.h
+ EXTRA_DIST = \
+ 	ChangeLog \
+@@ -980,8 +980,8 @@ uninstall-am: uninstall-confDATA uninstall-pkgincludeH
+ 
+ @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
+ 
+-default-config.h: $(srcdir)/irssi.conf
+-	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
++default-config.h: $(srcdir)/irssi.conf.sample
++	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
+ 
+ default-theme.h: $(srcdir)/themes/default.theme
+ 	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h
diff --git a/irc/irssi/files/patch-configure.ac b/irc/irssi/files/patch-configure.ac
new file mode 100644
index 000000000000..933d33cad86f
--- /dev/null
+++ b/irc/irssi/files/patch-configure.ac
@@ -0,0 +1,15 @@
+--- configure.ac.orig	2019-02-11 17:35:17 UTC
++++ configure.ac
+@@ -322,7 +322,11 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], [
+ 	AC_CHECK_LIB([ssl], [SSL_library_init], [
+ 		LIBS="$LIBS -lssl -lcrypto"
+ 	], [
+-		AC_MSG_ERROR([The OpenSSL library was not found])
++		AC_CHECK_LIB([ssl], [OPENSSL_init_ssl], [
++			LIBS="$LIBS -lssl -lcrypto"
++		], [
++			AC_MSG_ERROR([The OpenSSL library was not found])
++		])
+ 	])
+ ])
+ 
diff --git a/irc/irssi/files/patch-meson.build b/irc/irssi/files/patch-meson.build
deleted file mode 100644
index e0d74ec6ae5b..000000000000
--- a/irc/irssi/files/patch-meson.build
+++ /dev/null
@@ -1,22 +0,0 @@
---- meson.build.orig	2020-09-26 14:51:26 UTC
-+++ meson.build
-@@ -273,8 +273,8 @@ endif
- dep += glib_dep
- dep += gmodule_dep
- 
--openssl_dep = dependency('openssl', static : want_static_dependency)
--dep += openssl_dep
-+#openssl_dep = dependency('openssl', static : want_static_dependency)
-+#dep += openssl_dep
- 
- ############
- # utf8proc #
-@@ -363,7 +363,7 @@ if want_perl
-     version : perl_version)
- 
-   ####
--  if not cc.compiles('''
-+  if not cc.links('''
- #include <EXTERN.h>
- #include <perl.h>
- int main()
diff --git a/irc/irssi/files/patch-perl-Makefile b/irc/irssi/files/patch-perl-Makefile
new file mode 100644
index 000000000000..7979e1cd5451
--- /dev/null
+++ b/irc/irssi/files/patch-perl-Makefile
@@ -0,0 +1,22 @@
+--- src/perl/Makefile.am.orig	2019-02-11 17:27:58 UTC
++++ src/perl/Makefile.am
+@@ -145,7 +145,7 @@ all-local:
+ 
+ install-exec-local:
+ 	for dir in $(perl_dirs); do \
+-	  cd $$dir && $(MAKE) install && cd ..; \
++	  cd $$dir && $(MAKE) pure_install && cd ..; \
+ 	done
+ 
+ clean-generic:
+--- src/perl/Makefile.in.orig	2019-02-11 17:35:32 UTC
++++ src/perl/Makefile.in
+@@ -898,7 +898,7 @@ all-local:
+ 
+ install-exec-local:
+ 	for dir in $(perl_dirs); do \
+-	  cd $$dir && $(MAKE) install && cd ..; \
++	  cd $$dir && $(MAKE) pure_install && cd ..; \
+ 	done
+ 
+ clean-generic:
diff --git a/irc/irssi/files/patch-src_core_modules.c b/irc/irssi/files/patch-src_core_modules.c
new file mode 100644
index 000000000000..c0961ce9bcb9
--- /dev/null
+++ b/irc/irssi/files/patch-src_core_modules.c
@@ -0,0 +1,20 @@
+--- src/core/modules.c.orig	2021-03-13 16:34:06 UTC
++++ src/core/modules.c
+@@ -214,7 +214,7 @@ MODULE_FILE_REC *module_register_full(const char *name
+ 		module = g_new0(MODULE_REC, 1);
+ 		module->name = g_strdup(name);
+ 
+-                modules = g_slist_append(modules, module);
++                modules = g_slist_prepend(modules, module);
+ 	}
+ 
+ 	file = module_file_find(module, submodule);
+@@ -226,7 +226,7 @@ MODULE_FILE_REC *module_register_full(const char *name
+ 	file->name = g_strdup(submodule);
+         file->defined_module_name = g_strdup(defined_module_name);
+ 
+-	module->files = g_slist_append(module->files, file);
++	module->files = g_slist_prepend(module->files, file);
+         return file;
+ }
+ 
diff --git a/irc/irssi/files/patch-src_core_servers-reconnect.c b/irc/irssi/files/patch-src_core_servers-reconnect.c
new file mode 100644
index 000000000000..f7bc7ffd728d
--- /dev/null
+++ b/irc/irssi/files/patch-src_core_servers-reconnect.c
@@ -0,0 +1,61 @@
+--- src/core/servers-reconnect.c.orig	2019-08-29 13:48:46 UTC
++++ src/core/servers-reconnect.c
+@@ -151,10 +151,6 @@ static int server_reconnect_timeout(void)
+ 
+ static void sserver_connect(SERVER_SETUP_REC *rec, SERVER_CONNECT_REC *conn)
+ {
+-        conn->family = rec->family;
+-	conn->address = g_strdup(rec->address);
+-	if (conn->port == 0) conn->port = rec->port;
+-
+ 	server_setup_fill_reconn(conn, rec);
+ 	server_reconnect_add(conn, rec->last_connect+reconnect_time);
+ 	server_connect_unref(conn);
+@@ -181,10 +177,20 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, 
+ 	dest->tag = g_strdup(src->tag);
+ 
+ 	if (connect_info) {
+-                dest->family = src->family;
++		dest->family = src->family;
+ 		dest->address = g_strdup(src->address);
+ 		dest->port = src->port;
+ 		dest->password = g_strdup(src->password);
++
++		dest->use_tls = src->use_tls;
++		dest->tls_cert = g_strdup(src->tls_cert);
++		dest->tls_pkey = g_strdup(src->tls_pkey);
++		dest->tls_verify = src->tls_verify;
++		dest->tls_cafile = g_strdup(src->tls_cafile);
++		dest->tls_capath = g_strdup(src->tls_capath);
++		dest->tls_ciphers = g_strdup(src->tls_ciphers);
++		dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
++		dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
+ 	}
+ 
+ 	dest->chatnet = g_strdup(src->chatnet);
+@@ -207,16 +213,6 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, 
+ 	dest->no_autosendcmd = src->no_autosendcmd;
+ 	dest->unix_socket = src->unix_socket;
+ 
+-	dest->use_tls = src->use_tls;
+-	dest->tls_cert = g_strdup(src->tls_cert);
+-	dest->tls_pkey = g_strdup(src->tls_pkey);
+-	dest->tls_verify = src->tls_verify;
+-	dest->tls_cafile = g_strdup(src->tls_cafile);
+-	dest->tls_capath = g_strdup(src->tls_capath);
+-	dest->tls_ciphers = g_strdup(src->tls_ciphers);
+-	dest->tls_pinned_cert = g_strdup(src->tls_pinned_cert);
+-	dest->tls_pinned_pubkey = g_strdup(src->tls_pinned_pubkey);
+-
+ 	return dest;
+ }
+ 
+@@ -293,7 +289,7 @@ static void sig_reconnect(SERVER_REC *server)
+ 		    (!rec->last_connect || !rec->last_failed ||
+ 		     rec->last_connect < now-FAILED_RECONNECT_WAIT)) {
+ 			if (rec == sserver)
+-                                conn->port = server->connrec->port;
++				conn->port = server->connrec->port;
+ 			sserver_connect(rec, conn);
+ 			return;
+ 		}
diff --git a/irc/irssi/files/patch-src_core_servers-setup.c b/irc/irssi/files/patch-src_core_servers-setup.c
new file mode 100644
index 000000000000..e565d2cd1eb5
--- /dev/null
+++ b/irc/irssi/files/patch-src_core_servers-setup.c
@@ -0,0 +1,72 @@
+--- src/core/servers-setup.c.orig	2019-08-29 13:48:46 UTC
++++ src/core/servers-setup.c
+@@ -108,6 +108,35 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn
+ 	if (sserver->password != NULL && conn->password == NULL)
+ 		conn->password = g_strdup(sserver->password);
+ 
++	if (sserver->no_proxy)
++		g_free_and_null(conn->proxy);
++
++	if (sserver->family != 0 && conn->family == 0)
++		conn->family = sserver->family;
++	if (sserver->address && !conn->address)
++		conn->address = g_strdup(sserver->address);
++	if (sserver->port > 0 && conn->port <= 0)
++		conn->port = sserver->port;
++
++	conn->use_tls = sserver->use_tls;
++	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
++		conn->tls_cert = g_strdup(sserver->tls_cert);
++	if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
++		conn->tls_pkey = g_strdup(sserver->tls_pkey);
++	if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
++		conn->tls_pass = g_strdup(sserver->tls_pass);
++	conn->tls_verify = sserver->tls_verify;
++	if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
++		conn->tls_cafile = g_strdup(sserver->tls_cafile);
++	if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
++		conn->tls_capath = g_strdup(sserver->tls_capath);
++	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
++		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
++	if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
++		conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
++	if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
++		conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
++
+ 	signal_emit("server setup fill reconn", 2, conn, sserver);
+ }
+ 
+@@ -158,33 +187,6 @@ static void server_setup_fill_server(SERVER_CONNECT_RE
+ 	g_return_if_fail(IS_SERVER_SETUP(sserver));
+ 
+ 	sserver->last_connect = time(NULL);
+-
+-        if (sserver->no_proxy)
+-		g_free_and_null(conn->proxy);
+-
+-	if (sserver->family != 0 && conn->family == 0)
+-                conn->family = sserver->family;
+-	if (sserver->port > 0 && conn->port <= 0)
+-		conn->port = sserver->port;
+-
+-	conn->use_tls = sserver->use_tls;
+-	if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_cert[0] != '\0')
+-		conn->tls_cert = g_strdup(sserver->tls_cert);
+-	if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_pkey[0] != '\0')
+-		conn->tls_pkey = g_strdup(sserver->tls_pkey);
+-	if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_pass[0] != '\0')
+-		conn->tls_pass = g_strdup(sserver->tls_pass);
+-	conn->tls_verify = sserver->tls_verify;
+-	if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->tls_cafile[0] != '\0')
+-		conn->tls_cafile = g_strdup(sserver->tls_cafile);
+-	if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->tls_capath[0] != '\0')
+-		conn->tls_capath = g_strdup(sserver->tls_capath);
+-	if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver->tls_ciphers[0] != '\0')
+-		conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
+-	if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL && sserver->tls_pinned_cert[0] != '\0')
+-		conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
+-	if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL && sserver->tls_pinned_pubkey[0] != '\0')
+-		conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
+ 
+ 	server_setup_fill_reconn(conn, sserver);
+ 
diff --git a/irc/irssi/files/patch-src_fe-text_term-terminfo.c b/irc/irssi/files/patch-src_fe-text_term-terminfo.c
new file mode 100644
index 000000000000..90a4774c014c
--- /dev/null
+++ b/irc/irssi/files/patch-src_fe-text_term-terminfo.c
@@ -0,0 +1,15 @@
+--- src/fe-text/term-terminfo.c.orig	2019-08-29 13:48:46 UTC
++++ src/fe-text/term-terminfo.c
+@@ -672,7 +672,11 @@ void term_stop(void)
+ 
+ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
+ {
+-	unichar c = g_utf8_get_char_validated((char *)buffer, size);
++	unichar c = g_utf8_get_char_validated((char *) buffer, size);
++
++	/* GLib >= 2.63 do not accept Unicode NUL anymore */
++	if (c == (unichar) -2 && *buffer == 0 && size > 0)
++		c = 0;
+ 
+ 	switch (c) {
+ 	case (unichar)-1:
diff --git a/irc/irssi/pkg-message b/irc/irssi/pkg-message
deleted file mode 100644
index 70df6c6425c5..000000000000
--- a/irc/irssi/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-If Perl support was enabled during compilation you need to load the module
-by adding:
-
-load perl
-
-to ~/.irssi/startup
-EOM
-}
-]
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 0d37578458d7..f75a37a79b30 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -39,7 +39,6 @@ include/irssi/src/core/queries.h
 include/irssi/src/core/query-rec.h
 include/irssi/src/core/rawlog.h
 include/irssi/src/core/recode.h
-include/irssi/src/core/refstrings.h
 include/irssi/src/core/server-connect-rec.h
 include/irssi/src/core/server-rec.h
 include/irssi/src/core/server-setup-rec.h
@@ -94,7 +93,6 @@ include/irssi/src/fe-text/mainwindows.h
 include/irssi/src/fe-text/statusbar.h
 include/irssi/src/fe-text/statusbar-item.h
 include/irssi/src/fe-text/term.h
-include/irssi/src/fe-text/textbuffer-formats.h
 include/irssi/src/fe-text/textbuffer-view.h
 include/irssi/src/fe-text/textbuffer.h
 include/irssi/src/irc/core/bans.h
@@ -134,10 +132,10 @@ include/irssi/src/irc/notifylist/notify-setup.h
 include/irssi/src/irc/notifylist/notifylist.h
 include/irssi/src/lib-config/iconfig.h
 include/irssi/src/lib-config/module.h
-%%PERL%%lib/irssi/modules/libfe_perl.so
+%%PROXY%%lib/irssi/modules/libirc_proxy.a
 %%PROXY%%lib/irssi/modules/libirc_proxy.so
+%%OTR%%lib/irssi/modules/libotr_core.a
 %%OTR%%lib/irssi/modules/libotr_core.so
-%%PERL%%lib/irssi/modules/libperl_core.so
 %%PERL%%%%SITE_ARCH%%/Irssi.pm
 %%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
 %%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
@@ -146,7 +144,6 @@ include/irssi/src/lib-config/module.h
 %%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
 %%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
 %%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
-libdata/pkgconfig/irssi-1.pc
 man/man1/irssi.1.gz
 %%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
 %%PORTDOCS%%%%DOCSDIR%%/design.html
@@ -278,11 +275,14 @@ man/man1/irssi.1.gz
 %%PERL%%%%DATADIR%%/scripts/autoop.pl
 %%PERL%%%%DATADIR%%/scripts/autorejoin.pl
 %%PERL%%%%DATADIR%%/scripts/buf.pl
+%%PERL%%%%DATADIR%%/scripts/command.pl
 %%PERL%%%%DATADIR%%/scripts/dns.pl
 %%PERL%%%%DATADIR%%/scripts/kills.pl
 %%PERL%%%%DATADIR%%/scripts/mail.pl
 %%PERL%%%%DATADIR%%/scripts/mlock.pl
+%%PERL%%%%DATADIR%%/scripts/msg-event.pl
 %%PERL%%%%DATADIR%%/scripts/quitmsg.pl
+%%PERL%%%%DATADIR%%/scripts/redirect.pl
 %%PERL%%%%DATADIR%%/scripts/scriptassist.pl
 %%PERL%%%%DATADIR%%/scripts/usercount.pl
 %%DATADIR%%/themes/colorless.theme