diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 40f57dd7df21..1814f50972cb 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -1,68 +1,59 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 1.2.2 -PORTREVISION= 1 +DISTVERSION= 1.3-dev-344 +DISTVERSIONSUFFIX= -gf57dcfe9 PORTEPOCH= 1 CATEGORIES?= irc -MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ MAINTAINER= dor.bsd@xm0.uk COMMENT= Modular IRC client with many features LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf cpe gettext-runtime gmake gnome libtool localbase \ - ncurses pkgconfig tar:xz +# Until upstream makes a new release disable cpe +USES= gettext-runtime gnome meson localbase:ldflags ncurses \ + pkgconfig ssl USE_GNOME= glib20 +USE_LDCONFIG= yes -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +USE_GITHUB= yes +GH_TAGNAME= f57dcfe -OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC -OPTIONS_DEFAULT= BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR +MESON_ARGS= -Dinstall-glib=no -Ddisable-gregex=no -Dstatic-dependency=no \ + -Dwith-fuzzer=no -Dwithout-textui=no -OPTIONS_SUB= yes -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-otr \ - --with-libotr-inc-prefix=${PREFIX}/include -OTR_CONFIGURE_OFF= --with-otr=no -OTR_CONFIGURE_WITH= otr +# 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_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_MESON_YES= with-bot +CAPSICUM_MESON_YES= with-capsicum 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= Truecolor (24bit) support -TRUECOLOR_CONFIGURE_ENABLE= true-color -UTF8PROC_DESC= utf8proc support +OTR_MESON_YES= with-otr +PERL_USES= perl5 +PERL_MESON_YES= with-perl +PROXY_MESON_YES= with-proxy +TRUECOLOR_MESON_YES= enable-true-color UTF8PROC_LIB_DEPENDS= libutf8proc.so:textproc/utf8proc -UTF8PROC_CONFIGURE_ENABLE= utf8proc - -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --disable-ssl -.else -USES+= ssl -.endif +UTF8PROC_MESON_NO= disable-utf8proc post-install: - @${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 + @${MV} ${WRKSRC}/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample .include diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo index 2d1f117cce34..c141c0cb40a5 100644 --- a/irc/irssi/distinfo +++ b/irc/irssi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1568194739 -SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578 -SIZE (irssi-1.2.2.tar.xz) = 1140844 +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 diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in deleted file mode 100644 index dce4daddc1ab..000000000000 --- a/irc/irssi/files/patch-Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index 933d33cad86f..000000000000 --- a/irc/irssi/files/patch-configure.ac +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 new file mode 100644 index 000000000000..e0d74ec6ae5b --- /dev/null +++ b/irc/irssi/files/patch-meson.build @@ -0,0 +1,22 @@ +--- 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 + #include + int main() diff --git a/irc/irssi/files/patch-perl-Makefile b/irc/irssi/files/patch-perl-Makefile deleted file mode 100644 index 7979e1cd5451..000000000000 --- a/irc/irssi/files/patch-perl-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/pkg-plist b/irc/irssi/pkg-plist index a76b8ac85af4..d25739eacb27 100644 --- a/irc/irssi/pkg-plist +++ b/irc/irssi/pkg-plist @@ -1,290 +1,290 @@ %%BOT%%bin/botti bin/irssi @sample etc/irssi.conf.sample include/irssi/irssi-config.h include/irssi/irssi-version.h include/irssi/src/common.h include/irssi/src/core/args.h %%CAPSICUM%%include/irssi/src/core/capsicum.h include/irssi/src/core/channel-rec.h include/irssi/src/core/channel-setup-rec.h include/irssi/src/core/channels-setup.h include/irssi/src/core/channels.h include/irssi/src/core/chat-protocols.h include/irssi/src/core/chatnet-rec.h include/irssi/src/core/chatnets.h include/irssi/src/core/commands.h include/irssi/src/core/core.h include/irssi/src/core/expandos.h include/irssi/src/core/ignore.h include/irssi/src/core/iregex.h include/irssi/src/core/levels.h include/irssi/src/core/line-split.h include/irssi/src/core/log.h include/irssi/src/core/masks.h include/irssi/src/core/misc.h include/irssi/src/core/module.h include/irssi/src/core/modules-load.h include/irssi/src/core/modules.h include/irssi/src/core/net-disconnect.h include/irssi/src/core/net-nonblock.h include/irssi/src/core/net-sendbuffer.h include/irssi/src/core/network-openssl.h include/irssi/src/core/network.h include/irssi/src/core/nick-rec.h include/irssi/src/core/nicklist.h include/irssi/src/core/nickmatch-cache.h include/irssi/src/core/pidwait.h 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 include/irssi/src/core/servers-reconnect.h include/irssi/src/core/servers-setup.h include/irssi/src/core/servers.h include/irssi/src/core/session.h include/irssi/src/core/settings.h include/irssi/src/core/signals.h include/irssi/src/core/special-vars.h include/irssi/src/core/tls.h include/irssi/src/core/utf8.h include/irssi/src/core/window-item-def.h include/irssi/src/core/window-item-rec.h include/irssi/src/core/write-buffer.h include/irssi/src/fe-common/core/chat-completion.h include/irssi/src/fe-common/core/command-history.h include/irssi/src/fe-common/core/completion.h %%CAPSICUM%%include/irssi/src/fe-common/core/fe-capsicum.h include/irssi/src/fe-common/core/fe-channels.h include/irssi/src/fe-common/core/fe-common-core.h include/irssi/src/fe-common/core/fe-core-commands.h include/irssi/src/fe-common/core/fe-exec.h include/irssi/src/fe-common/core/fe-messages.h include/irssi/src/fe-common/core/fe-queries.h include/irssi/src/fe-common/core/fe-recode.h include/irssi/src/fe-common/core/fe-settings.h include/irssi/src/fe-common/core/fe-tls.h include/irssi/src/fe-common/core/fe-windows.h include/irssi/src/fe-common/core/formats.h include/irssi/src/fe-common/core/hilight-text.h include/irssi/src/fe-common/core/keyboard.h include/irssi/src/fe-common/core/module-formats.h include/irssi/src/fe-common/core/module.h include/irssi/src/fe-common/core/printtext.h include/irssi/src/fe-common/core/themes.h include/irssi/src/fe-common/core/window-activity.h include/irssi/src/fe-common/core/window-items.h include/irssi/src/fe-common/core/windows-layout.h include/irssi/src/fe-common/irc/dcc/fe-dcc.h include/irssi/src/fe-common/irc/dcc/module-formats.h include/irssi/src/fe-common/irc/dcc/module.h include/irssi/src/fe-common/irc/fe-irc-channels.h include/irssi/src/fe-common/irc/fe-irc-server.h include/irssi/src/fe-common/irc/module-formats.h include/irssi/src/fe-common/irc/module.h include/irssi/src/fe-common/irc/notifylist/module-formats.h include/irssi/src/fe-common/irc/notifylist/module.h include/irssi/src/fe-text/gui-printtext.h include/irssi/src/fe-text/gui-windows.h 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 include/irssi/src/irc/core/channel-events.h include/irssi/src/irc/core/channel-rejoin.h include/irssi/src/irc/core/ctcp.h include/irssi/src/irc/core/irc-cap.h include/irssi/src/irc/core/irc-channels.h include/irssi/src/irc/core/irc-chatnets.h include/irssi/src/irc/core/irc-commands.h include/irssi/src/irc/core/irc-masks.h include/irssi/src/irc/core/irc-nicklist.h include/irssi/src/irc/core/irc-queries.h include/irssi/src/irc/core/irc-servers-setup.h include/irssi/src/irc/core/irc-servers.h include/irssi/src/irc/core/irc.h include/irssi/src/irc/core/mode-lists.h include/irssi/src/irc/core/modes.h include/irssi/src/irc/core/module.h include/irssi/src/irc/core/netsplit.h include/irssi/src/irc/core/sasl.h include/irssi/src/irc/core/servers-idle.h include/irssi/src/irc/core/servers-redirect.h include/irssi/src/irc/dcc/dcc-chat.h include/irssi/src/irc/dcc/dcc-file-rec.h include/irssi/src/irc/dcc/dcc-file.h include/irssi/src/irc/dcc/dcc-get.h include/irssi/src/irc/dcc/dcc-queue.h include/irssi/src/irc/dcc/dcc-rec.h include/irssi/src/irc/dcc/dcc-send.h include/irssi/src/irc/dcc/dcc-server.h include/irssi/src/irc/dcc/dcc.h include/irssi/src/irc/dcc/module.h include/irssi/src/irc/flood/module.h include/irssi/src/irc/notifylist/module.h 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 -%%PROXY%%lib/irssi/modules/libirc_proxy.a +%%PERL%%lib/irssi/modules/libfe_perl.so %%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 %%PERL%%%%SITE_ARCH%%/Irssi/UI.pm %%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so %%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 %%PORTDOCS%%%%DOCSDIR%%/design.txt %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/faq.txt %%PORTDOCS%%%%DOCSDIR%%/formats.txt %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/perl.txt %%PORTDOCS%%%%DOCSDIR%%/signals.txt %%PORTDOCS%%%%DOCSDIR%%/special_vars.txt %%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.html %%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.txt %%DATADIR%%/help/accept %%DATADIR%%/help/action %%DATADIR%%/help/admin %%DATADIR%%/help/alias %%DATADIR%%/help/away %%DATADIR%%/help/ban %%DATADIR%%/help/beep %%DATADIR%%/help/bind %%DATADIR%%/help/cat %%DATADIR%%/help/cd %%DATADIR%%/help/channel %%DATADIR%%/help/clear %%DATADIR%%/help/completion %%DATADIR%%/help/connect %%DATADIR%%/help/ctcp %%DATADIR%%/help/cycle %%DATADIR%%/help/dcc %%DATADIR%%/help/dehilight %%DATADIR%%/help/deop %%DATADIR%%/help/devoice %%DATADIR%%/help/die %%DATADIR%%/help/disconnect %%DATADIR%%/help/echo %%DATADIR%%/help/eval %%DATADIR%%/help/exec %%DATADIR%%/help/flushbuffer %%DATADIR%%/help/format %%DATADIR%%/help/hash %%DATADIR%%/help/help %%DATADIR%%/help/hilight %%DATADIR%%/help/ignore %%DATADIR%%/help/info %%DATADIR%%/help/invite %%DATADIR%%/help/irssiproxy %%DATADIR%%/help/ison %%DATADIR%%/help/join %%DATADIR%%/help/kick %%DATADIR%%/help/kickban %%DATADIR%%/help/kill %%DATADIR%%/help/knock %%DATADIR%%/help/knockout %%DATADIR%%/help/lastlog %%DATADIR%%/help/layout %%DATADIR%%/help/levels %%DATADIR%%/help/links %%DATADIR%%/help/list %%DATADIR%%/help/load %%DATADIR%%/help/log %%DATADIR%%/help/lusers %%DATADIR%%/help/map %%DATADIR%%/help/me %%DATADIR%%/help/mircdcc %%DATADIR%%/help/mode %%DATADIR%%/help/motd %%DATADIR%%/help/msg %%DATADIR%%/help/names %%DATADIR%%/help/nctcp %%DATADIR%%/help/netsplit %%DATADIR%%/help/network %%DATADIR%%/help/nick %%DATADIR%%/help/notice %%DATADIR%%/help/notify %%DATADIR%%/help/op %%DATADIR%%/help/oper %%DATADIR%%/help/otr %%DATADIR%%/help/part %%DATADIR%%/help/ping %%DATADIR%%/help/query %%DATADIR%%/help/quit %%DATADIR%%/help/quote %%DATADIR%%/help/rawlog %%DATADIR%%/help/recode %%DATADIR%%/help/reconnect %%DATADIR%%/help/rehash %%DATADIR%%/help/reload %%DATADIR%%/help/restart %%DATADIR%%/help/rmreconns %%DATADIR%%/help/rmrejoins %%DATADIR%%/help/save %%DATADIR%%/help/sconnect %%DATADIR%%/help/script %%DATADIR%%/help/scrollback %%DATADIR%%/help/server %%DATADIR%%/help/servlist %%DATADIR%%/help/set %%DATADIR%%/help/silence %%DATADIR%%/help/squery %%DATADIR%%/help/squit %%DATADIR%%/help/stats %%DATADIR%%/help/statusbar %%DATADIR%%/help/time %%DATADIR%%/help/toggle %%DATADIR%%/help/topic %%DATADIR%%/help/trace %%DATADIR%%/help/ts %%DATADIR%%/help/unalias %%DATADIR%%/help/unban %%DATADIR%%/help/unignore %%DATADIR%%/help/unload %%DATADIR%%/help/unnotify %%DATADIR%%/help/unquery %%DATADIR%%/help/unsilence %%DATADIR%%/help/upgrade %%DATADIR%%/help/uptime %%DATADIR%%/help/userhost %%DATADIR%%/help/ver %%DATADIR%%/help/version %%DATADIR%%/help/voice %%DATADIR%%/help/wait %%DATADIR%%/help/wall %%DATADIR%%/help/wallops %%DATADIR%%/help/who %%DATADIR%%/help/whois %%DATADIR%%/help/whowas %%DATADIR%%/help/window %%DATADIR%%/scripts/autoop.pl %%DATADIR%%/scripts/autorejoin.pl %%DATADIR%%/scripts/buf.pl -%%DATADIR%%/scripts/command.pl %%DATADIR%%/scripts/dns.pl %%DATADIR%%/scripts/kills.pl %%DATADIR%%/scripts/mail.pl %%DATADIR%%/scripts/mlock.pl -%%DATADIR%%/scripts/msg-event.pl %%DATADIR%%/scripts/quitmsg.pl -%%DATADIR%%/scripts/redirect.pl %%DATADIR%%/scripts/scriptassist.pl %%DATADIR%%/scripts/usercount.pl %%DATADIR%%/themes/colorless.theme %%DATADIR%%/themes/default.theme @dir lib/irssi/modules