Support stage, add DOCS as options.

2 files changed, 24 insertions, 27 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 84d50cff61b6..0bb31ca2b5da 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -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 <bsd.port.options.mk>
 
 # 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."
 
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 2687850ee3f6..0b07de29fd49 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -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-setup.h
 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