From f45fe2b94efd2f60eef60b92ccd5b78e933b26b9 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Thu, 21 Jun 2007 21:22:39 +0000 Subject: [PATCH] - Update to 20070620 - Take Maintainership --- irc/irssi-devel/Makefile | 17 +- irc/irssi-devel/distinfo | 6 +- irc/irssi-devel/files/patch-Makefile.in | 14 +- .../files/patch-irssi-version.h.in | 2 +- irc/irssi-devel/pkg-plist | 253 +++++++++--------- 5 files changed, 146 insertions(+), 146 deletions(-) diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile index fbf8b70174f0..57377f68d3a8 100644 --- a/irc/irssi-devel/Makefile +++ b/irc/irssi-devel/Makefile @@ -6,13 +6,12 @@ # PORTNAME= irssi -PORTVERSION= 20060518 +PORTVERSION= 20070620 CATEGORIES= irc -MASTER_SITES= http://coekie.404.be/irssi/ \ - http://mirror.inerd.com/FreeBSD/distfiles/irssi-devel/ +MASTER_SITES= http://freebsd.unixfreunde.de/sources/ PKGNAMESUFFIX= -devel -MAINTAINER= ports@FreeBSD.org +MAINTAINER= miwi@FreeBSD.org COMMENT= A modular IRC client with many features CONFLICTS= irssi-0.8* @@ -29,7 +28,7 @@ OPTIONS= PERL "Enable Perl support" on \ IPV6 "Enable IPv6" on \ BOT "Enable bot" off -WRKSRC= ${WRKDIR}/${PORTNAME}-0.8.10 +WRKSRC= ${WRKDIR}/${PORTNAME}-0.8.12-svn # USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema # for WITH_SSL option @@ -65,16 +64,16 @@ CONFIGURE_ARGS+= --with-socks .endif .if !defined(WITHOUT_IPV6) -.if ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 CATEGORIES+= ipv6 -.else -BROKEN= This version of FreeBSD does not support IPv6. Please define WITHOUT_IPV6 -.endif .endif .if defined(WITH_BOT) CONFIGURE_ARGS+= --with-bot +PLIST_SUB+= WITH_BOT="" +.else +CONFIGURE_ARGS+= --without-bot +PLIST_SUB+= WITH_BOT="@comment " .endif post-configure: diff --git a/irc/irssi-devel/distinfo b/irc/irssi-devel/distinfo index a7b979d773c8..4fed9c8d03a8 100644 --- a/irc/irssi-devel/distinfo +++ b/irc/irssi-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (irssi-20060518.tar.gz) = 464f9f7354b6b2e5e7b9bd52343e14be -SHA256 (irssi-20060518.tar.gz) = 88eef6d7de7e511d5b9d9c75b7a12899b5a0adb5b8efe30f4eecaaf225f08728 -SIZE (irssi-20060518.tar.gz) = 1071609 +MD5 (irssi-20070620.tar.gz) = fa45ca72ff3455758ce5627db429aac1 +SHA256 (irssi-20070620.tar.gz) = eadeabf386f29496fd692fa6294967eb06b8bb261de96ab06cb69c227c50eb32 +SIZE (irssi-20070620.tar.gz) = 1333800 diff --git a/irc/irssi-devel/files/patch-Makefile.in b/irc/irssi-devel/files/patch-Makefile.in index f881e9b69776..c09ba572ea9b 100644 --- a/irc/irssi-devel/files/patch-Makefile.in +++ b/irc/irssi-devel/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu May 18 22:48:12 2006 -+++ Makefile.in Tue May 23 04:02:51 2006 -@@ -130,7 +130,7 @@ +--- Makefile.in.orig 2007-06-20 22:01:50.000000000 +0000 ++++ Makefile.in 2007-06-21 22:54:10.000000000 +0000 +@@ -254,7 +254,7 @@ + @BUILD_PLUGINS_TRUE@PLUGINS = plugins 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 -@@ -490,8 +490,8 @@ - + pkginclude_HEADERS = config.h irssi-version.h +@@ -783,8 +783,8 @@ + # create default-config.h config.h: default-config.h default-theme.h -default-config.h: $(srcdir)/irssi.conf diff --git a/irc/irssi-devel/files/patch-irssi-version.h.in b/irc/irssi-devel/files/patch-irssi-version.h.in index 030b5208bd09..11d41e988bc3 100644 --- a/irc/irssi-devel/files/patch-irssi-version.h.in +++ b/irc/irssi-devel/files/patch-irssi-version.h.in @@ -5,5 +5,5 @@ #define IRSSI_VERSION "@VERSION@" -#define IRSSI_VERSION_DATE @VERSION_DATE@ -#define IRSSI_VERSION_TIME @VERSION_TIME@ -+#define IRSSI_VERSION_DATE 20060326 ++#define IRSSI_VERSION_DATE 20070620 +#define IRSSI_VERSION_TIME 2300 diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist index 9013b954d4f2..471f986b40b9 100644 --- a/irc/irssi-devel/pkg-plist +++ b/irc/irssi-devel/pkg-plist @@ -1,3 +1,4 @@ +%%WITH_BOT%%bin/botti bin/irssi @unexec if cmp -s %D/etc/irssi.conf %D/etc/irssi.conf.sample; then rm -f %D/etc/irssi.conf; fi etc/irssi.conf.sample @@ -19,6 +20,122 @@ etc/irssi.conf.sample %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so +include/irssi/config.h +include/irssi/irssi-version.h +include/irssi/src/common.h +include/irssi/src/core/args.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/channels.h +include/irssi/src/core/chat-protocols.h +include/irssi/src/core/chatnet-rec.h +include/irssi/src/core/chatnets.h +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/levels.h +include/irssi/src/core/line-split.h +include/irssi/src/core/log.h +include/irssi/src/core/masks.h +include/irssi/src/core/misc.h +include/irssi/src/core/module.h +include/irssi/src/core/modules-load.h +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.h +include/irssi/src/core/nick-rec.h +include/irssi/src/core/nicklist.h +include/irssi/src/core/nickmatch-cache.h +include/irssi/src/core/pidwait.h +include/irssi/src/core/queries.h +include/irssi/src/core/query-rec.h +include/irssi/src/core/rawlog.h +include/irssi/src/core/recode.h +include/irssi/src/core/server-connect-rec.h +include/irssi/src/core/server-rec.h +include/irssi/src/core/server-setup-rec.h +include/irssi/src/core/servers-reconnect.h +include/irssi/src/core/servers-setup.h +include/irssi/src/core/servers.h +include/irssi/src/core/session.h +include/irssi/src/core/settings.h +include/irssi/src/core/signals.h +include/irssi/src/core/special-vars.h +include/irssi/src/core/window-item-def.h +include/irssi/src/core/window-item-rec.h +include/irssi/src/core/write-buffer.h +include/irssi/src/fe-common/core/autorun.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-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-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-windows.h +include/irssi/src/fe-common/core/formats.h +include/irssi/src/fe-common/core/hilight-text.h +include/irssi/src/fe-common/core/keyboard.h +include/irssi/src/fe-common/core/module-formats.h +include/irssi/src/fe-common/core/module.h +include/irssi/src/fe-common/core/printtext.h +include/irssi/src/fe-common/core/themes.h +include/irssi/src/fe-common/core/translation.h +include/irssi/src/fe-common/core/window-activity.h +include/irssi/src/fe-common/core/window-items.h +include/irssi/src/fe-common/core/windows-layout.h +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-server.h +include/irssi/src/fe-common/irc/module-formats.h +include/irssi/src/fe-common/irc/module.h +include/irssi/src/fe-common/irc/notifylist/module-formats.h +include/irssi/src/fe-common/irc/notifylist/module.h +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-channels.h +include/irssi/src/irc/core/irc-chatnets.h +include/irssi/src/irc/core/irc-commands.h +include/irssi/src/irc/core/irc-masks.h +include/irssi/src/irc/core/irc-nicklist.h +include/irssi/src/irc/core/irc-queries.h +include/irssi/src/irc/core/irc-servers-setup.h +include/irssi/src/irc/core/irc-servers.h +include/irssi/src/irc/core/irc.h +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/servers-idle.h +include/irssi/src/irc/core/servers-redirect.h +include/irssi/src/irc/dcc/dcc-chat.h +include/irssi/src/irc/dcc/dcc-file-rec.h +include/irssi/src/irc/dcc/dcc-file.h +include/irssi/src/irc/dcc/dcc-get.h +include/irssi/src/irc/dcc/dcc-queue.h +include/irssi/src/irc/dcc/dcc-rec.h +include/irssi/src/irc/dcc/dcc-send.h +include/irssi/src/irc/dcc/dcc-server.h +include/irssi/src/irc/dcc/dcc.h +include/irssi/src/irc/dcc/module.h +include/irssi/src/irc/flood/module.h +include/irssi/src/irc/notifylist/module.h +include/irssi/src/irc/notifylist/notify-setup.h +include/irssi/src/irc/notifylist/notifylist.h +include/irssi/src/lib-config/iconfig.h +include/irssi/src/lib-config/module.h +include/irssi/src/lib-popt/findme.h +include/irssi/src/lib-popt/popt.h +include/irssi/src/lib-popt/poptint.h %%DOCSDIR%%/botnet.txt %%DOCSDIR%%/design.txt %%DOCSDIR%%/faq.html @@ -29,6 +146,7 @@ etc/irssi.conf.sample %%DOCSDIR%%/signals.txt %%DOCSDIR%%/special_vars.txt %%DOCSDIR%%/startup-HOWTO.html +%%DATADIR%%/help/accept %%DATADIR%%/help/action %%DATADIR%%/help/admin %%DATADIR%%/help/alias @@ -137,8 +255,8 @@ etc/irssi.conf.sample %%DATADIR%%/help/unsilence %%DATADIR%%/help/upgrade %%DATADIR%%/help/uping -%%DATADIR%%/help/ver %%DATADIR%%/help/userhost +%%DATADIR%%/help/ver %%DATADIR%%/help/version %%DATADIR%%/help/voice %%DATADIR%%/help/wait @@ -173,143 +291,26 @@ etc/irssi.conf.sample %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi -include/irssi/src/lib-popt/findme.h -include/irssi/src/lib-popt/popt.h -include/irssi/src/lib-popt/poptint.h -include/irssi/src/lib-config/iconfig.h -include/irssi/src/lib-config/module.h -include/irssi/src/core/args.h -include/irssi/src/core/channels.h -include/irssi/src/core/channels-setup.h -include/irssi/src/core/commands.h -include/irssi/src/core/chat-protocols.h -include/irssi/src/core/chatnets.h -include/irssi/src/core/core.h -include/irssi/src/core/expandos.h -include/irssi/src/core/ignore.h -include/irssi/src/core/levels.h -include/irssi/src/core/line-split.h -include/irssi/src/core/log.h -include/irssi/src/core/masks.h -include/irssi/src/core/misc.h -include/irssi/src/core/module.h -include/irssi/src/core/modules.h -include/irssi/src/core/modules-load.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.h -include/irssi/src/core/nick-rec.h -include/irssi/src/core/nicklist.h -include/irssi/src/core/nickmatch-cache.h -include/irssi/src/core/pidwait.h -include/irssi/src/core/queries.h -include/irssi/src/core/rawlog.h -include/irssi/src/core/recode.h -include/irssi/src/core/servers.h -include/irssi/src/core/servers-reconnect.h -include/irssi/src/core/servers-setup.h -include/irssi/src/core/session.h -include/irssi/src/core/settings.h -include/irssi/src/core/signals.h -include/irssi/src/core/special-vars.h -include/irssi/src/core/window-item-def.h -include/irssi/src/core/write-buffer.h -include/irssi/src/core/channel-rec.h -include/irssi/src/core/channel-setup-rec.h -include/irssi/src/core/chatnet-rec.h -include/irssi/src/core/query-rec.h -include/irssi/src/core/server-rec.h -include/irssi/src/core/server-setup-rec.h -include/irssi/src/core/server-connect-rec.h -include/irssi/src/core/window-item-rec.h -include/irssi/src/irc/core/bans.h -include/irssi/src/irc/core/ctcp.h -include/irssi/src/irc/core/channel-rejoin.h -include/irssi/src/irc/core/irc.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 -include/irssi/src/irc/core/irc-masks.h -include/irssi/src/irc/core/irc-nicklist.h -include/irssi/src/irc/core/irc-queries.h -include/irssi/src/irc/core/irc-servers.h -include/irssi/src/irc/core/irc-servers-setup.h -include/irssi/src/irc/core/modes.h -include/irssi/src/irc/core/mode-lists.h -include/irssi/src/irc/core/module.h -include/irssi/src/irc/core/netsplit.h -include/irssi/src/irc/core/servers-idle.h -include/irssi/src/irc/core/servers-redirect.h -include/irssi/src/irc/dcc/dcc-rec.h -include/irssi/src/irc/dcc/dcc-file-rec.h -include/irssi/src/irc/dcc/dcc.h -include/irssi/src/irc/dcc/dcc-file.h -include/irssi/src/irc/dcc/dcc-chat.h -include/irssi/src/irc/dcc/dcc-get.h -include/irssi/src/irc/dcc/dcc-send.h -include/irssi/src/irc/dcc/dcc-queue.h -include/irssi/src/irc/dcc/module.h -include/irssi/src/irc/dcc/dcc-server.h -include/irssi/src/irc/flood/module.h -include/irssi/src/irc/notifylist/notifylist.h -include/irssi/src/irc/notifylist/notify-setup.h -include/irssi/src/irc/notifylist/module.h -include/irssi/src/fe-common/core/autorun.h -include/irssi/src/fe-common/core/command-history.h -include/irssi/src/fe-common/core/chat-completion.h -include/irssi/src/fe-common/core/completion.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-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/utf8.h -include/irssi/src/fe-common/core/formats.h -include/irssi/src/fe-common/core/hilight-text.h -include/irssi/src/fe-common/core/keyboard.h -include/irssi/src/fe-common/core/module-formats.h -include/irssi/src/fe-common/core/module.h -include/irssi/src/fe-common/core/printtext.h -include/irssi/src/fe-common/core/fe-recode.h -include/irssi/src/fe-common/core/themes.h -include/irssi/src/fe-common/core/translation.h -include/irssi/src/fe-common/core/window-activity.h -include/irssi/src/fe-common/core/window-items.h -include/irssi/src/fe-common/core/windows-layout.h -include/irssi/src/fe-common/core/fe-windows.h -include/irssi/src/fe-common/irc/dcc/module.h -include/irssi/src/fe-common/irc/dcc/module-formats.h -include/irssi/src/fe-common/irc/dcc/fe-dcc.h -include/irssi/src/fe-common/irc/notifylist/module.h -include/irssi/src/fe-common/irc/notifylist/module-formats.h -include/irssi/src/fe-common/irc/fe-irc-server.h -include/irssi/src/fe-common/irc/module.h -include/irssi/src/fe-common/irc/module-formats.h -include/irssi/src/common.h -include/irssi/config.h -include/irssi/irssi-version.h @exec mkdir -p %D/lib/irssi/modules -@dirrm lib/irssi/modules -@dirrm lib/irssi -@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/themes @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% -@dirrm include/irssi/src/core +@dirrm %%DOCSDIR%% +@dirrm lib/irssi/modules +@dirrm lib/irssi @dirrm include/irssi/src/lib-popt @dirrm include/irssi/src/lib-config +@dirrm include/irssi/src/irc/notifylist +@dirrm include/irssi/src/irc/flood @dirrm include/irssi/src/irc/dcc @dirrm include/irssi/src/irc/core -@dirrm include/irssi/src/irc/flood -@dirrm include/irssi/src/irc/notifylist @dirrm include/irssi/src/irc -@dirrm include/irssi/src/fe-common/core -@dirrm include/irssi/src/fe-common/irc/dcc @dirrm include/irssi/src/fe-common/irc/notifylist +@dirrm include/irssi/src/fe-common/irc/dcc @dirrm include/irssi/src/fe-common/irc +@dirrm include/irssi/src/fe-common/core @dirrm include/irssi/src/fe-common +@dirrm include/irssi/src/core @dirrm include/irssi/src @dirrm include/irssi