From owner-svn-ports-head@FreeBSD.ORG Wed Sep 25 01:08:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E82498F6; Wed, 25 Sep 2013 01:08:39 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C6B98298A; Wed, 25 Sep 2013 01:08:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8P18dUq083394; Wed, 25 Sep 2013 01:08:39 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8P18dv9083392; Wed, 25 Sep 2013 01:08:39 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201309250108.r8P18dv9083392@svn.freebsd.org> From: "Vanilla I. Shu" Date: Wed, 25 Sep 2013 01:08:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328227 - head/irc/irssi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Sep 2013 01:08:40 -0000 Author: vanilla Date: Wed Sep 25 01:08:39 2013 New Revision: 328227 URL: http://svnweb.freebsd.org/changeset/ports/328227 Log: Support stage, add DOCS as options. Modified: head/irc/irssi/Makefile head/irc/irssi/pkg-plist Modified: head/irc/irssi/Makefile ============================================================================== --- head/irc/irssi/Makefile Wed Sep 25 00:54:08 2013 (r328226) +++ head/irc/irssi/Makefile Wed Sep 25 01:08:39 2013 (r328227) @@ -17,12 +17,10 @@ USES= pkgconfig ncurses gmake USE_BZIP2= yes GNU_CONFIGURE= yes -MAN1= irssi.1 - -OPTIONS_DEFINE= PERL PROXY SOCKS IPV6 BOT +OPTIONS_DEFINE= PERL PROXY SOCKS IPV6 BOT DOCS SOCKS_DESC= Socks proxy support BOT_DESC= Bot support -OPTIONS_DEFAULT= PERL IPV6 +OPTIONS_DEFAULT= PERL IPV6 DOCS # USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema # for WITH_SSL option @@ -33,7 +31,6 @@ CONFIGURE_ARGS+= --disable-ssl USE_OPENSSL= yes .endif -NO_STAGE= yes .include # Process options. @@ -74,15 +71,16 @@ 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 @${ECHO_MSG} "You may install x11-themes/irssi-themes for" @${ECHO_MSG} " additional themes." Modified: head/irc/irssi/pkg-plist ============================================================================== --- head/irc/irssi/pkg-plist Wed Sep 25 00:54:08 2013 (r328226) +++ head/irc/irssi/pkg-plist Wed Sep 25 01:08:39 2013 (r328227) @@ -1,6 +1,5 @@ %%WITH_BOT%%bin/botti bin/irssi -etc/irssi.conf etc/irssi.conf.sample include/irssi/irssi-config.h include/irssi/irssi-version.h @@ -114,7 +113,6 @@ include/irssi/src/irc/notifylist/notify- include/irssi/src/irc/notifylist/notifylist.h include/irssi/src/lib-config/iconfig.h include/irssi/src/lib-config/module.h -@exec mkdir -p %D/lib/irssi/modules %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.la %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so @@ -123,26 +121,27 @@ include/irssi/src/lib-config/module.h %%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/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 -%%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 +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 @@ -281,16 +280,16 @@ include/irssi/src/lib-config/module.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 -@dirrm %%DATADIR%%/themes -@dirrm %%DATADIR%%/scripts -@dirrm %%DATADIR%%/help -@dirrm %%DATADIR%% -@dirrm %%DOCSDIR%% @dirrm lib/irssi/modules @dirrm lib/irssi @dirrm include/irssi/src/lib-config