Attachment 189998 Details for Bug 225196 – irc/irssi: 1.1.0 diff

[patch] irc/irssi: 1.1.0 diff

irssi-1.1.0-4.diff (text/plain), 6.41 KB, created by David O'Rourke on 2018-01-23 12:29:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David O'Rourke

Created: 2018-01-23 12:29:42 UTC

Size: 6.41 KB

patch

obsolete

>diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
>index d8accd49f552..4903dd584c85 100644
>--- a/irc/irssi/Makefile
>+++ b/irc/irssi/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	irssi
>-PORTVERSION=	1.0.6
>+PORTVERSION=	1.1.0
> PORTEPOCH=	1
> CATEGORIES?=	irc
> MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
>@@ -17,8 +17,19 @@ GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USE_GNOME=	glib20
> 
>+.include <bsd.port.options.mk>
>+
> OPTIONS_DEFINE=	PERL PROXY SOCKS BOT DOCS TRUECOLOR
> OPTIONS_DEFAULT=	PERL
>+
>+# If we're on FreeBSD >= releng/11.0, offer the Capsicum option.
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100121
>+OPTIONS_DEFINE+=	CAPSICUM
>+OPTIONS_DEFAULT+=	CAPSICUM
>+.else
>+CONFIGURE_ARGS+=	--without-capsicum
>+.endif
>+
> OPTIONS_SUB=	yes
> SOCKS_DESC=	Socks proxy support
> SOCKS_CONFIGURE_WITH=	socks
>@@ -30,6 +41,8 @@ PERL_CONFIGURE_OFF=	--with-perl=no
> PROXY_CONFIGURE_WITH=	proxy
> TRUECOLOR_DESC=	Truecolor (24bit) support
> TRUECOLOR_CONFIGURE_ENABLE=	true-color
>+CAPSICUM_DESC=	Capsicum support
>+CAPSICUM_CONFIGURE_WITH=	capsicum
> 
> .if defined(WITHOUT_SSL)
> CONFIGURE_ARGS+=	--disable-ssl
>diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
>index e900e759b784..b8e27eb421bd 100644
>--- a/irc/irssi/distinfo
>+++ b/irc/irssi/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1515269268
>-SHA256 (irssi-1.0.6.tar.xz) = 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585
>-SIZE (irssi-1.0.6.tar.xz) = 1033428
>+TIMESTAMP = 1516051171
>+SHA256 (irssi-1.1.0.tar.xz) = 109bab173d046391212b330de1f86611ed72af247e6886c18bee73265c2d5f02
>+SIZE (irssi-1.1.0.tar.xz) = 1078596
>diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in
>index 2dafb005246b..5059d4929c7e 100644
>--- a/irc/irssi/files/patch-Makefile.in
>+++ b/irc/irssi/files/patch-Makefile.in
>@@ -1,22 +1,22 @@
>---- Makefile.in.orig	2017-03-10 16:43:21 UTC
>-+++ Makefile.in
>-@@ -404,7 +404,7 @@ BUILT_SOURCES = default-config.h default
>+--- Makefile.in.orig	2018-01-15 21:35:25.062300000 +0000
>++++ Makefile.in	2018-01-15 21:36:17.578923000 +0000
>+@@ -409,7 +409,7 @@
>  CLEANFILES = default-config.h default-theme.h
>- SUBDIRS = src docs scripts
>+ SUBDIRS = src tests docs scripts themes utils
>  confdir = $(sysconfdir)
> -conf_DATA = irssi.conf
> +conf_DATA = irssi.conf.sample
>- themedir = $(datadir)/irssi/themes
>- theme_DATA = default.theme colorless.theme
>  pkginclude_HEADERS = irssi-config.h irssi-version.h
>-@@ -990,8 +990,8 @@ uninstall-am: uninstall-confDATA uninsta
>+ EXTRA_DIST = \
>+ 	ChangeLog \
>+@@ -965,8 +965,8 @@
>  
>- @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
>+ #.PHONY: irssi-version.h
>  
> -default-config.h: $(srcdir)/irssi.conf
>--	$(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
>+-	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
> +default-config.h: $(srcdir)/irssi.conf.sample
>-+	$(srcdir)/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
>++	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
>  
>- default-theme.h: $(srcdir)/default.theme
>- 	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.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/pkg-plist b/irc/irssi/pkg-plist
>index dbe81b57d373..d69d47d9035c 100644
>--- a/irc/irssi/pkg-plist
>+++ b/irc/irssi/pkg-plist
>@@ -5,6 +5,7 @@ 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
>@@ -16,6 +17,7 @@ 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
>@@ -27,6 +29,7 @@ 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
>@@ -54,6 +57,7 @@ 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
>@@ -61,6 +65,7 @@ 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
>@@ -125,11 +130,16 @@ include/irssi/src/lib-config/module.h
> %%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
> %%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
> %%PERL%%%%SITE_ARCH%%/Irssi/UI.pm
>+%%PERL%%%%SITE_ARCH%%/auto/Irssi/.packlist
>+%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/.packlist
> %%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so
> %%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
>+%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/.packlist
> %%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
>+%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/.packlist
> %%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
> man/man1/irssi.1.gz
>+%%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
> %%PORTDOCS%%%%DOCSDIR%%/design.txt
> %%PORTDOCS%%%%DOCSDIR%%/faq.html
> %%PORTDOCS%%%%DOCSDIR%%/faq.txt
>@@ -139,6 +149,7 @@ man/man1/irssi.1.gz
> %%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
>@@ -217,11 +228,11 @@ man/man1/irssi.1.gz
> %%DATADIR%%/help/rmreconns
> %%DATADIR%%/help/rmrejoins
> %%DATADIR%%/help/save
>-%%DATADIR%%/help/servlist
> %%DATADIR%%/help/sconnect
> %%DATADIR%%/help/script
> %%DATADIR%%/help/scrollback
> %%DATADIR%%/help/server
>+%%DATADIR%%/help/servlist
> %%DATADIR%%/help/set
> %%DATADIR%%/help/silence
> %%DATADIR%%/help/squery

Flags:

dor.bsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 225196: 189770 | 189866 | 189983 | 189998 | 190007 | 190236