- Update to 20140530

- Stage support

3 files changed, 54 insertions, 56 deletions

diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 7f3be64cd2f1..e4e7ed58097c 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -1,38 +1,31 @@
-# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
 # $FreeBSD$
 
 PORTNAME=	irssi
-PORTVERSION=	20130915
+PORTVERSION=	20140530
 CATEGORIES=	irc
-MASTER_SITES=	http://mirror.shatow.net/freebsd/${PORTNAME}/ \
-		http://bsdcrew.de/distfiles/ \
-		http://mirror.irssi.org/snapshots/
+MASTER_SITES=	http://mirror.irssi.org/snapshots/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A modular IRC client with many features
 
-LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
 
 CONFLICTS=	irssi-0.8*
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake
+USES=		pkgconfig ncurses gmake
+CONFIGURE_ARGS=	--with-ncurses=${NCURSESBASE}
 
-MAN1=		irssi.1
-
-OPTIONS_DEFINE=	PERL PROXY SOCKS IPV6 BOT SSL
+OPTIONS_DEFINE=	PERL PROXY SOCKS IPV6 BOT SSL DOCS
 SOCKS_DESC=	Socks proxy support
 BOT_DESC=	Bot support
 OPTIONS_DEFAULT=	PERL IPV6 SSL
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.16-rc1
+WRKSRC=	${WRKDIR}/${PORTNAME}-0.8.17-svn
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-# Process options.
-
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
 .else
@@ -77,14 +70,19 @@ PLIST_SUB+=	WITH_BOT="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e 's|/etc|${PREFIX}&|' \
 		${WRKSRC}/docs/irssi.1
+.if empty(PORT_OPTIONS:MDOCS)
+	${REINPLACE_CMD} -e \
+		'/^install-data-am:/ s|install-docDATA||' \
+		${WRKSRC}/docs/Makefile.in
+.endif
 
 post-configure:
 	@${MV} ${WRKSRC}/irssi.conf ${WRKSRC}/irssi.conf.sample
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/irssi.conf ]; then \
-		${ECHO} "Installing default configuration file."; \
-		${INSTALL_DATA} ${WRKSRC}/irssi.conf.sample ${PREFIX}/etc/irssi.conf ; \
-	fi
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules
+.if ${PORT_OPTIONS:MPERL}
+	@${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
+.endif
 
 .include <bsd.port.mk>
diff --git a/irc/irssi-devel/distinfo b/irc/irssi-devel/distinfo
index 444ea80cbf1a..7395e3599177 100644
--- a/irc/irssi-devel/distinfo
+++ b/irc/irssi-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irssi-20130915.tar.gz) = 915b7a584917cffed9c343a24f9e07d02947677d754dd466aba6369c9be87344
-SIZE (irssi-20130915.tar.gz) = 1333350
+SHA256 (irssi-20140530.tar.gz) = 19fcf60befbf517bf3d5239ae5b58cf02893560337a2426870c5c977b5f5b54d
+SIZE (irssi-20140530.tar.gz) = 1334300
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index f3d2d5d8e2dc..1c260ff85f9e 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -1,26 +1,6 @@
 %%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
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.la
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
-%%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/irssi-config.h
 include/irssi/irssi-version.h
 include/irssi/src/common.h
@@ -98,6 +78,7 @@ 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/fe-text/statusbar-item.h
 include/irssi/src/irc/core/bans.h
 include/irssi/src/irc/core/channel-rejoin.h
 include/irssi/src/irc/core/ctcp.h
@@ -132,16 +113,35 @@ 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/fe-text/statusbar-item.h
-%%DOCSDIR%%/design.txt
-%%DOCSDIR%%/faq.html
-%%DOCSDIR%%/faq.txt
-%%DOCSDIR%%/formats.txt
-%%DOCSDIR%%/manual.txt
-%%DOCSDIR%%/perl.txt
-%%DOCSDIR%%/signals.txt
-%%DOCSDIR%%/special_vars.txt
-%%DOCSDIR%%/startup-HOWTO.html
+%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
+%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.la
+%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
+%%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
+man/man1/irssi.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/design.txt
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.txt
+%%PORTDOCS%%%%DOCSDIR%%/formats.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/perl.txt
+%%PORTDOCS%%%%DOCSDIR%%/signals.txt
+%%PORTDOCS%%%%DOCSDIR%%/special_vars.txt
+%%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.html
 %%DATADIR%%/help/accept
 %%DATADIR%%/help/action
 %%DATADIR%%/help/admin
@@ -280,17 +280,17 @@ include/irssi/src/fe-text/statusbar-item.h
 %%DATADIR%%/scripts/usercount.pl
 %%DATADIR%%/themes/colorless.theme
 %%DATADIR%%/themes/default.theme
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
 %%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
 @exec mkdir -p %D/lib/irssi/modules
-@dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/scripts
-@dirrmtry %%DATADIR%%/help
-@dirrmtry %%DATADIR%%
-@dirrm %%DOCSDIR%%
 @dirrmtry lib/irssi/modules
 @dirrmtry lib/irssi
 @dirrm include/irssi/src/lib-config
@@ -299,12 +299,12 @@ include/irssi/src/fe-text/statusbar-item.h
 @dirrm include/irssi/src/irc/dcc
 @dirrm include/irssi/src/irc/core
 @dirrm include/irssi/src/irc
+@dirrm include/irssi/src/fe-text
 @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/fe-text
 @dirrm include/irssi/src/core
 @dirrm include/irssi/src
 @dirrm include/irssi