update to irssi-0.8.18, from viq (maintainer), plus re-add the PKGSPEC line

to avoid breaking modules
This commit is contained in:
sthen 2016-03-18 09:27:56 +00:00
parent 06d0e1e41a
commit 391cf4828d
7 changed files with 20 additions and 61 deletions

View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.61 2015/12/29 22:54:49 sthen Exp $
# $OpenBSD: Makefile,v 1.62 2016/03/18 09:27:56 sthen Exp $
SHARED_ONLY = Yes
COMMENT = modular IRC client with many features (ipv6,socks,proxy)
V = 0.8.17
V = 0.8.18
DISTNAME = irssi-$V
PKGSPEC = irssi-=$V
EXTRACT_SUFX = .tar.bz2
CATEGORIES = net
HOMEPAGE = http://www.irssi.org/
@ -22,7 +20,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c crypto m ncurses perl pthread ssl util pcre glib-2.0
WANTLIB += gmodule-2.0
MASTER_SITES = https://github.com/irssi-import/irssi/releases/download/$V/
MASTER_SITES = https://github.com/irssi/irssi/releases/download/${V}/
FLAVORS = socks
FLAVOR ?=

View File

@ -1,2 +1,2 @@
SHA256 (irssi-0.8.17.tar.bz2) = PJYAytLt9Y8dAS/rwaC6hEJ0324zHAGp6TVGdwUWaAc=
SIZE (irssi-0.8.17.tar.bz2) = 1102196
SHA256 (irssi-0.8.18.tar.gz) = MAQ3hIFbuGSxu2aoLB5lnDJb4KGN3PdvwQGBLjbDnCA=
SIZE (irssi-0.8.18.tar.gz) = 1563130

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-docs_irssi_1,v 1.5 2015/12/29 22:44:37 sthen Exp $
--- docs/irssi.1.orig Sat Oct 11 09:42:36 2014
+++ docs/irssi.1 Tue Dec 29 16:47:56 2015
@@ -62,10 +62,10 @@ show a help message.
.SH SEE ALSO
.B Irssi
has been supplied with a huge amount of documentation. Check /help or look
-at the files contained by /usr/share/doc/irssi*
+at the files contained by ${PREFIX}/share/irssi/* and ${PREFIX}/share/doc/irssi/*
.SH FILES
.TP
-.I /etc/irssi.conf
+.I ${SYSCONFDIR}/irssi/irssi.conf
Global configuration file
.TP
.I ~/.irssi/config
@@ -80,13 +80,18 @@ Default irssi theme
.I ~/.irssi/away.log
Logged messages in away status
.TP
-.I /usr/share/irssi/help/
-Directory including many help files
+.I ${PREFIX}/share/irssi/help/
+.RS .3
+.I ${PREFIX}/share/doc/irssi/
+.RE
+.RS
+Directories including many help files
+.RE
.TP
-.I /usr/share/irssi/scripts/
+.I ${SYSCONFDIR}/irssi/scripts/
Global scripts directory
.TP
-.I /usr/share/irssi/themes/
+.I ${SYSCONFDIR}/irssi/themes/
Global themes directory
.TP
.I ~/.irssi/scripts/

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_settings_c,v 1.4 2009/05/23 17:47:01 martynas Exp $
--- src/core/settings.c.orig Tue Mar 31 22:50:02 2009
+++ src/core/settings.c Sun Apr 5 01:22:16 2009
@@ -647,7 +647,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
$OpenBSD: patch-src_core_settings_c,v 1.5 2016/03/18 09:27:57 sthen Exp $
--- src/core/settings.c.orig Tue Dec 15 13:06:50 2015
+++ src/core/settings.c Tue Dec 29 15:53:22 2015
@@ -648,7 +648,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
else {
/* user configuration file not found, use the default one
from sysconfdir */

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.7 2015/12/29 22:44:37 sthen Exp $
--- src/fe-common/core/Makefile.in.orig Sat Oct 11 09:58:14 2014
+++ src/fe-common/core/Makefile.in Tue Dec 29 16:47:56 2015
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.8 2016/03/18 09:27:57 sthen Exp $
--- src/fe-common/core/Makefile.in.orig Tue Dec 15 10:23:01 2015
+++ src/fe-common/core/Makefile.in Tue Dec 29 16:11:32 2015
@@ -365,7 +365,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_perl_Makefile_in,v 1.7 2015/12/29 22:44:37 sthen Exp $
--- src/perl/Makefile.in.orig Sat Oct 11 09:58:14 2014
+++ src/perl/Makefile.in Tue Dec 29 16:47:56 2015
$OpenBSD: patch-src_perl_Makefile_in,v 1.8 2016/03/18 09:27:57 sthen Exp $
--- src/perl/Makefile.in.orig Tue Dec 15 10:23:01 2015
+++ src/perl/Makefile.in Tue Dec 29 16:12:22 2015
@@ -378,7 +378,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/fe-common/core \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2015/12/29 22:44:37 sthen Exp $
@comment $OpenBSD: PLIST,v 1.22 2016/03/18 09:27:57 sthen Exp $
@bin bin/irssi
include/irssi/
include/irssi/irssi-config
@ -80,6 +80,7 @@ include/irssi/src/fe-common/irc/dcc/
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
@ -93,6 +94,7 @@ include/irssi/src/irc/core/
include/irssi/src/irc/core/bans.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
@ -106,6 +108,7 @@ 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/
@ -186,12 +189,8 @@ share/examples/irssi/scripts/quitmsg.pl
@sample ${SYSCONFDIR}/irssi/scripts/quitmsg.pl
share/examples/irssi/scripts/redirect.pl
@sample ${SYSCONFDIR}/irssi/scripts/redirect.pl
share/examples/irssi/scripts/sb_search.pl
@sample ${SYSCONFDIR}/irssi/scripts/sb_search.pl
share/examples/irssi/scripts/scriptassist.pl
@sample ${SYSCONFDIR}/irssi/scripts/scriptassist.pl
share/examples/irssi/scripts/splitlong.pl
@sample ${SYSCONFDIR}/irssi/scripts/splitlong.pl
share/examples/irssi/scripts/usercount.pl
@sample ${SYSCONFDIR}/irssi/scripts/usercount.pl
share/examples/irssi/themes/
@ -235,6 +234,7 @@ share/irssi/help/hilight
share/irssi/help/ignore
share/irssi/help/info
share/irssi/help/invite
share/irssi/help/irssiproxy
share/irssi/help/ison
share/irssi/help/join
share/irssi/help/kick