Attachment #189866 for bug #225196

Lines 1-7 Link Here

(-)b/irc/irssi/Makefile (-3 / +5 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= irssi	3	PORTNAME= irssi
4	PORTVERSION= 1.0.6	4	PORTVERSION= 1.1.0
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	CATEGORIES?= irc	6	CATEGORIES?= irc
7	MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/	7	MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
Lines 17-24 GNU_CONFIGURE= yes Link Here
17	INSTALL_TARGET= install-strip	17	INSTALL_TARGET= install-strip
18	USE_GNOME= glib20	18	USE_GNOME= glib20
19		19
20	OPTIONS_DEFINE= PERL PROXY SOCKS BOT DOCS TRUECOLOR	20	OPTIONS_DEFINE= PERL PROXY SOCKS BOT DOCS TRUECOLOR CAPSICUM
21	OPTIONS_DEFAULT= PERL	21	OPTIONS_DEFAULT= PERL CAPSICUM
22	OPTIONS_SUB= yes	22	OPTIONS_SUB= yes
23	SOCKS_DESC= Socks proxy support	23	SOCKS_DESC= Socks proxy support
24	SOCKS_CONFIGURE_WITH= socks	24	SOCKS_CONFIGURE_WITH= socks
Lines 30-35 PERL_CONFIGURE_OFF= --with-perl=no Link Here
30	PROXY_CONFIGURE_WITH= proxy	30	PROXY_CONFIGURE_WITH= proxy
31	TRUECOLOR_DESC= Truecolor (24bit) support	31	TRUECOLOR_DESC= Truecolor (24bit) support
32	TRUECOLOR_CONFIGURE_ENABLE= true-color	32	TRUECOLOR_CONFIGURE_ENABLE= true-color
		33	CAPSICUM_DESC= Capsicum support
		34	CAPSICUM_CONFIGURE_WITH= capsicum
33		35
34	.if defined(WITHOUT_SSL)	36	.if defined(WITHOUT_SSL)
35	CONFIGURE_ARGS+= --disable-ssl	37	CONFIGURE_ARGS+= --disable-ssl

Lines 1-3 Link Here

(-)b/irc/irssi/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1515269268	1	TIMESTAMP = 1516051171
2	SHA256 (irssi-1.0.6.tar.xz) = 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585	2	SHA256 (irssi-1.1.0.tar.xz) = 109bab173d046391212b330de1f86611ed72af247e6886c18bee73265c2d5f02
3	SIZE (irssi-1.0.6.tar.xz) = 1033428	3	SIZE (irssi-1.1.0.tar.xz) = 1078596




--- 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 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
 EXTRA_DIST = \
 	ChangeLog \
@@ -965,8 +965,8 @@
 
 #.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




include/irssi/irssi-version.h
include/irssi/src/common.h
include/irssi/src/core/args.h
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/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/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/fe-common/core/chat-completion.h
include/irssi/src/fe-common/core/command-history.h
include/irssi/src/fe-common/core/completion.h
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-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

%%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
%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
%%PORTDOCS%%%%DOCSDIR%%/design.txt
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/faq.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/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

Return to bug 225196

Lines 1-22 Link Here

(-)b/irc/irssi/files/patch-Makefile.in (-12 / +12 lines)
1	--- Makefile.in.orig 2017-03-10 16:43:21 UTC	1	--- Makefile.in.orig 2018-01-15 21:35:25.062300000 +0000
2	+++ Makefile.in	2	+++ Makefile.in 2018-01-15 21:36:17.578923000 +0000
3	@@ -404,7 +404,7 @@ BUILT_SOURCES = default-config.h default	3	@@ -409,7 +409,7 @@
4	CLEANFILES = default-config.h default-theme.h	4	CLEANFILES = default-config.h default-theme.h
5	SUBDIRS = src docs scripts	5	SUBDIRS = src tests docs scripts themes utils
6	confdir = $(sysconfdir)	6	confdir = $(sysconfdir)
7	-conf_DATA = irssi.conf	7	-conf_DATA = irssi.conf
8	+conf_DATA = irssi.conf.sample	8	+conf_DATA = irssi.conf.sample
9	themedir = $(datadir)/irssi/themes
10	theme_DATA = default.theme colorless.theme
11	pkginclude_HEADERS = irssi-config.h irssi-version.h	9	pkginclude_HEADERS = irssi-config.h irssi-version.h
12	@@ -990,8 +990,8 @@ uninstall-am: uninstall-confDATA uninsta	10	EXTRA_DIST = \
		11	ChangeLog \
		12	@@ -965,8 +965,8 @@
13		13
14	@MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h	14	#.PHONY: irssi-version.h
15		15
16	-default-config.h: $(srcdir)/irssi.conf	16	-default-config.h: $(srcdir)/irssi.conf
17	- $(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h	17	- $(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
18	+default-config.h: $(srcdir)/irssi.conf.sample	18	+default-config.h: $(srcdir)/irssi.conf.sample
19	+ $(srcdir)/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h	19	+ $(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
20		20
21	default-theme.h: $(srcdir)/default.theme	21	default-theme.h: $(srcdir)/themes/default.theme
22	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h	22	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h

Lines 5-10 include/irssi/irssi-config.h Link Here

(-)b/irc/irssi/pkg-plist (-1 / +12 lines)
5	include/irssi/irssi-version.h	5	include/irssi/irssi-version.h
6	include/irssi/src/common.h	6	include/irssi/src/common.h
7	include/irssi/src/core/args.h	7	include/irssi/src/core/args.h
		8	include/irssi/src/core/capsicum.h
8	include/irssi/src/core/channel-rec.h	9	include/irssi/src/core/channel-rec.h
9	include/irssi/src/core/channel-setup-rec.h	10	include/irssi/src/core/channel-setup-rec.h
10	include/irssi/src/core/channels-setup.h	11	include/irssi/src/core/channels-setup.h
Lines 16-21 include/irssi/src/core/commands.h Link Here
16	include/irssi/src/core/core.h	17	include/irssi/src/core/core.h
17	include/irssi/src/core/expandos.h	18	include/irssi/src/core/expandos.h
18	include/irssi/src/core/ignore.h	19	include/irssi/src/core/ignore.h
		20	include/irssi/src/core/iregex.h
19	include/irssi/src/core/levels.h	21	include/irssi/src/core/levels.h
20	include/irssi/src/core/line-split.h	22	include/irssi/src/core/line-split.h
21	include/irssi/src/core/log.h	23	include/irssi/src/core/log.h
Lines 27-32 include/irssi/src/core/modules.h Link Here
27	include/irssi/src/core/net-disconnect.h	29	include/irssi/src/core/net-disconnect.h
28	include/irssi/src/core/net-nonblock.h	30	include/irssi/src/core/net-nonblock.h
29	include/irssi/src/core/net-sendbuffer.h	31	include/irssi/src/core/net-sendbuffer.h
		32	include/irssi/src/core/network-openssl.h
30	include/irssi/src/core/network.h	33	include/irssi/src/core/network.h
31	include/irssi/src/core/nick-rec.h	34	include/irssi/src/core/nick-rec.h
32	include/irssi/src/core/nicklist.h	35	include/irssi/src/core/nicklist.h
Lines 54-59 include/irssi/src/core/write-buffer.h Link Here
54	include/irssi/src/fe-common/core/chat-completion.h	57	include/irssi/src/fe-common/core/chat-completion.h
55	include/irssi/src/fe-common/core/command-history.h	58	include/irssi/src/fe-common/core/command-history.h
56	include/irssi/src/fe-common/core/completion.h	59	include/irssi/src/fe-common/core/completion.h
		60	include/irssi/src/fe-common/core/fe-capsicum.h
57	include/irssi/src/fe-common/core/fe-channels.h	61	include/irssi/src/fe-common/core/fe-channels.h
58	include/irssi/src/fe-common/core/fe-common-core.h	62	include/irssi/src/fe-common/core/fe-common-core.h
59	include/irssi/src/fe-common/core/fe-core-commands.h	63	include/irssi/src/fe-common/core/fe-core-commands.h
Lines 61-66 include/irssi/src/fe-common/core/fe-exec.h Link Here
61	include/irssi/src/fe-common/core/fe-messages.h	65	include/irssi/src/fe-common/core/fe-messages.h
62	include/irssi/src/fe-common/core/fe-queries.h	66	include/irssi/src/fe-common/core/fe-queries.h
63	include/irssi/src/fe-common/core/fe-recode.h	67	include/irssi/src/fe-common/core/fe-recode.h
		68	include/irssi/src/fe-common/core/fe-settings.h
64	include/irssi/src/fe-common/core/fe-tls.h	69	include/irssi/src/fe-common/core/fe-tls.h
65	include/irssi/src/fe-common/core/fe-windows.h	70	include/irssi/src/fe-common/core/fe-windows.h
66	include/irssi/src/fe-common/core/formats.h	71	include/irssi/src/fe-common/core/formats.h
Lines 125-135 include/irssi/src/lib-config/module.h Link Here
125	%%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm	130	%%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm
126	%%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm	131	%%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm
127	%%PERL%%%%SITE_ARCH%%/Irssi/UI.pm	132	%%PERL%%%%SITE_ARCH%%/Irssi/UI.pm
		133	%%PERL%%%%SITE_ARCH%%/auto/Irssi/.packlist
		134	%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/.packlist
128	%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so	135	%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so
129	%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so	136	%%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so
		137	%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/.packlist
130	%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so	138	%%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so
		139	%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/.packlist
131	%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so	140	%%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so
132	man/man1/irssi.1.gz	141	man/man1/irssi.1.gz
		142	%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt
133	%%PORTDOCS%%%%DOCSDIR%%/design.txt	143	%%PORTDOCS%%%%DOCSDIR%%/design.txt
134	%%PORTDOCS%%%%DOCSDIR%%/faq.html	144	%%PORTDOCS%%%%DOCSDIR%%/faq.html
135	%%PORTDOCS%%%%DOCSDIR%%/faq.txt	145	%%PORTDOCS%%%%DOCSDIR%%/faq.txt
Lines 139-144 man/man1/irssi.1.gz Link Here
139	%%PORTDOCS%%%%DOCSDIR%%/signals.txt	149	%%PORTDOCS%%%%DOCSDIR%%/signals.txt
140	%%PORTDOCS%%%%DOCSDIR%%/special_vars.txt	150	%%PORTDOCS%%%%DOCSDIR%%/special_vars.txt
141	%%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.html	151	%%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.html
		152	%%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.txt
142	%%DATADIR%%/help/accept	153	%%DATADIR%%/help/accept
143	%%DATADIR%%/help/action	154	%%DATADIR%%/help/action
144	%%DATADIR%%/help/admin	155	%%DATADIR%%/help/admin
Lines 217-227 man/man1/irssi.1.gz Link Here
217	%%DATADIR%%/help/rmreconns	228	%%DATADIR%%/help/rmreconns
218	%%DATADIR%%/help/rmrejoins	229	%%DATADIR%%/help/rmrejoins
219	%%DATADIR%%/help/save	230	%%DATADIR%%/help/save
220	%%DATADIR%%/help/servlist
221	%%DATADIR%%/help/sconnect	231	%%DATADIR%%/help/sconnect
222	%%DATADIR%%/help/script	232	%%DATADIR%%/help/script
223	%%DATADIR%%/help/scrollback	233	%%DATADIR%%/help/scrollback
224	%%DATADIR%%/help/server	234	%%DATADIR%%/help/server
		235	%%DATADIR%%/help/servlist
225	%%DATADIR%%/help/set	236	%%DATADIR%%/help/set
226	%%DATADIR%%/help/silence	237	%%DATADIR%%/help/silence
227	%%DATADIR%%/help/squery	238	%%DATADIR%%/help/squery