svn commit: r396910 - head/net/raggle

[Dmitry Marakasov]

Author: amdmi3
Date: Mon Sep 14 17:13:50 2015
New Revision: 396910
URL: https://svnweb.freebsd.org/changeset/ports/396910

Log:
  - Add NO_ARCH
  - Remove deprecated and unused MAN1
  - Improve do-install readability
  - Switch to OPTIONS helpers
  - Install manpage
  
  PR:		202713
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (jadawin, 2 weeks)

Modified:
  head/net/raggle/Makefile
  head/net/raggle/pkg-plist

Modified: head/net/raggle/Makefile
==============================================================================
--- head/net/raggle/Makefile	Mon Sep 14 17:12:35 2015	(r396909)
+++ head/net/raggle/Makefile	Mon Sep 14 17:13:50 2015	(r396910)
@@ -3,6 +3,7 @@
 
 PORTNAME=	raggle
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.raggle.org/files/
 
@@ -15,33 +16,32 @@ USE_RUBY=	yes
 USE_RUBY_FEATURES=	rexml yaml
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
-MAN1=		raggle.1
 DOCS=		AUTHORS BUGS COPYING ChangeLog README TODO \
 		doc/default_config.rb doc/pauls_feeds.opml.gz \
 		doc/theme_documentation.txt
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/raggle ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/themes \
-	${STAGEDIR}${DATADIR}/extras/web_ui/images \
-	${STAGEDIR}${DATADIR}/extras/web_ui/inc ${STAGEDIR}${DATADIR}/extras/win32
+		${STAGEDIR}${DATADIR}/extras/web_ui/images \
+		${STAGEDIR}${DATADIR}/extras/web_ui/inc ${STAGEDIR}${DATADIR}/extras/win32
 	${INSTALL_DATA} ${WRKSRC}/extras/*.rb ${STAGEDIR}${DATADIR}/extras
 	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/*.html \
-	${STAGEDIR}${DATADIR}/extras/web_ui
+		${STAGEDIR}${DATADIR}/extras/web_ui
 	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/images/* \
-	${STAGEDIR}${DATADIR}/extras/web_ui/images
+		${STAGEDIR}${DATADIR}/extras/web_ui/images
 	${INSTALL_DATA} ${WRKSRC}/extras/web_ui/inc/* \
-	${STAGEDIR}${DATADIR}/extras/web_ui/inc
+		${STAGEDIR}${DATADIR}/extras/web_ui/inc
 	${INSTALL_DATA} ${WRKSRC}/extras/win32/* ${STAGEDIR}${DATADIR}/extras/win32
 	${INSTALL_DATA} ${WRKSRC}/themes/* ${STAGEDIR}${DATADIR}/themes
-.if ${PORT_OPTIONS:MDOCS} 
+	${INSTALL_MAN} ${WRKSRC}/raggle.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/net/raggle/pkg-plist
==============================================================================
--- head/net/raggle/pkg-plist	Mon Sep 14 17:12:35 2015	(r396909)
+++ head/net/raggle/pkg-plist	Mon Sep 14 17:13:50 2015	(r396910)
@@ -1,4 +1,5 @@
 bin/raggle
+man/man1/raggle.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING