Upgrade to 0.8.17.

4 files changed, 15 insertions, 25 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 8c9a8fe50a42..ee3bb5ac95d1 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	irssi
-PORTVERSION=	0.8.16
-PORTREVISION=	1
+PORTVERSION=	0.8.17
+PORTREVISION=	0
 CATEGORIES?=	irc
 MASTER_SITES=	http://mirror.irssi.org/
 
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index 604786e75165..74bfeda5461c 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irssi-0.8.16.tar.bz2) = 3f7afed2a2754f1f5bf5cf2c87476f3c4d4aa5d71f9f4f68d05f927220d19f97
-SIZE (irssi-0.8.16.tar.bz2) = 986129
+SHA256 (irssi-0.8.17.tar.bz2) = 3c9600cad2edf58f1d012febc1a0ba844274df6e331c01a9e935467705166807
+SIZE (irssi-0.8.17.tar.bz2) = 1102196
diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in
index ad0f81678883..cc00adaaa263 100644
--- a/irc/irssi/files/patch-Makefile.in
+++ b/irc/irssi/files/patch-Makefile.in
@@ -1,22 +1,22 @@
---- Makefile.in.orig	Sun Dec 11 15:57:00 2005
-+++ Makefile.in	Sun Dec 11 15:57:45 2005
-@@ -255,7 +255,7 @@
- @BUILD_PLUGINS_TRUE@PLUGINS = plugins
+--- Makefile.in.orig	2014-10-11 16:58:14.000000000 +0800
++++ Makefile.in	2014-10-13 11:47:58.867951923 +0800
+@@ -397,7 +397,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
  SUBDIRS = src docs scripts
  confdir = $(sysconfdir)
 -conf_DATA = irssi.conf
 +conf_DATA = irssi.conf.sample
  themedir = $(datadir)/irssi/themes
  theme_DATA = default.theme colorless.theme
- pkginclude_HEADERS = config.h irssi-version.h
-@@ -784,8 +784,8 @@
- # create default-config.h
- config.h: default-config.h default-theme.h
+ pkginclude_HEADERS = irssi-config.h irssi-version.h
+@@ -981,8 +981,8 @@ uninstall-am: uninstall-confDATA uninsta
+ 
+ @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
  
 -default-config.h: $(srcdir)/irssi.conf
 -	$(srcdir)/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
+ 
  default-theme.h: $(srcdir)/default.theme
  	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h
- 
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 01cb511f1ef8..e95f3466a18a 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,6 +1,6 @@
 %%WITH_BOT%%bin/botti
 bin/irssi
-etc/irssi.conf.sample
+@sample etc/irssi.conf.sample
 include/irssi/irssi-config.h
 include/irssi/irssi-version.h
 include/irssi/src/common.h
@@ -170,8 +170,6 @@ man/man1/irssi.1.gz
 %%DATADIR%%/help/ignore
 %%DATADIR%%/help/info
 %%DATADIR%%/help/invite
-%%DATADIR%%/help/invitelist
-%%DATADIR%%/help/ircnet
 %%DATADIR%%/help/ison
 %%DATADIR%%/help/join
 %%DATADIR%%/help/kick
@@ -198,7 +196,6 @@ man/man1/irssi.1.gz
 %%DATADIR%%/help/netsplit
 %%DATADIR%%/help/network
 %%DATADIR%%/help/nick
-%%DATADIR%%/help/note
 %%DATADIR%%/help/notice
 %%DATADIR%%/help/notify
 %%DATADIR%%/help/op
@@ -216,17 +213,13 @@ man/man1/irssi.1.gz
 %%DATADIR%%/help/restart
 %%DATADIR%%/help/rmreconns
 %%DATADIR%%/help/rmrejoins
-%%DATADIR%%/help/rping
 %%DATADIR%%/help/save
-%%DATADIR%%/help/say
 %%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
@@ -243,7 +236,7 @@ man/man1/irssi.1.gz
 %%DATADIR%%/help/unquery
 %%DATADIR%%/help/unsilence
 %%DATADIR%%/help/upgrade
-%%DATADIR%%/help/uping
+%%DATADIR%%/help/uptime
 %%DATADIR%%/help/userhost
 %%DATADIR%%/help/ver
 %%DATADIR%%/help/version
@@ -251,13 +244,10 @@ man/man1/irssi.1.gz
 %%DATADIR%%/help/wait
 %%DATADIR%%/help/wall
 %%DATADIR%%/help/wallops
-%%DATADIR%%/help/watch
 %%DATADIR%%/help/who
 %%DATADIR%%/help/whois
 %%DATADIR%%/help/whowas
 %%DATADIR%%/help/window
-%%DATADIR%%/help/wjoin
-%%DATADIR%%/help/wquery
 %%DATADIR%%/scripts/autoop.pl
 %%DATADIR%%/scripts/autorejoin.pl
 %%DATADIR%%/scripts/buf.pl