Attachment 223207 Details for Bug 254237 – irc/irssi: Revert to 1.2.2

[patch] irc/irssi: Revert to 1.2.2

irssi-1.2.2.2.diff (text/plain), 12.87 KB, created by David O'Rourke on 2021-03-12 13:08:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David O'Rourke

Created: 2021-03-12 13:08:17 UTC

Size: 12.87 KB

patch

obsolete

>Index: irc/irssi/Makefile
>===================================================================
>--- irc/irssi/Makefile	(revision 568147)
>+++ irc/irssi/Makefile	(working copy)
>@@ -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_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>
>Index: irc/irssi/distinfo
>===================================================================
>--- irc/irssi/distinfo	(revision 568147)
>+++ irc/irssi/distinfo	(working copy)
>@@ -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
>Index: irc/irssi/files/patch-Makefile.in
>===================================================================
>--- irc/irssi/files/patch-Makefile.in	(nonexistent)
>+++ irc/irssi/files/patch-Makefile.in	(working copy)
>@@ -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
>
>Property changes on: irc/irssi/files/patch-Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: irc/irssi/files/patch-configure.ac
>===================================================================
>--- irc/irssi/files/patch-configure.ac	(nonexistent)
>+++ irc/irssi/files/patch-configure.ac	(working copy)
>@@ -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])
>++		])
>+ 	])
>+ ])
>+ 
>
>Property changes on: irc/irssi/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: irc/irssi/files/patch-meson.build
>===================================================================
>--- irc/irssi/files/patch-meson.build	(revision 568147)
>+++ irc/irssi/files/patch-meson.build	(nonexistent)
>@@ -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()
>
>Property changes on: irc/irssi/files/patch-meson.build
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: irc/irssi/files/patch-perl-Makefile
>===================================================================
>--- irc/irssi/files/patch-perl-Makefile	(nonexistent)
>+++ irc/irssi/files/patch-perl-Makefile	(working copy)
>@@ -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:
>
>Property changes on: irc/irssi/files/patch-perl-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: irc/irssi/files/patch-src_fe-text_term-terminfo.c
>===================================================================
>--- irc/irssi/files/patch-src_fe-text_term-terminfo.c	(nonexistent)
>+++ irc/irssi/files/patch-src_fe-text_term-terminfo.c	(working copy)
>@@ -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:
>
>Property changes on: irc/irssi/files/patch-src_fe-text_term-terminfo.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: irc/irssi/pkg-message
>===================================================================
>--- irc/irssi/pkg-message	(revision 568147)
>+++ irc/irssi/pkg-message	(nonexistent)
>@@ -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
>-}
>-]
>
>Property changes on: irc/irssi/pkg-message
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: irc/irssi/pkg-plist
>===================================================================
>--- irc/irssi/pkg-plist	(revision 568147)
>+++ irc/irssi/pkg-plist	(working copy)
>@@ -39,7 +39,6 @@
> 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/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/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 @@
> %%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 @@
> %%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

Flags:

dor.bsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 254237: 223207 | 223233