Bug 175272

Comment 1 Edwin Groothuis 2013-01-14 00:50:10 UTC

Responsible Changed
From-To: freebsd-ports-bugs->tota

Over to maintainer (via the GNATS Auto Assign Tool)

Comment 2 dfilter service 2013-01-14 05:02:23 UTC

Author: tota
Date: Mon Jan 14 05:02:10 2013
New Revision: 310359
URL: http://svnweb.freebsd.org/changeset/ports/310359

Log:
  - Adopt OptionsNG
  
  PR:		ports/175272 (based on)
  Submitted by:	Yasuhiro KIMURA <yasu_AT_utahime_DOT_org>

Modified:
  head/www/tdiary/Makefile

Modified: head/www/tdiary/Makefile
==============================================================================
--- head/www/tdiary/Makefile	Mon Jan 14 03:45:02 2013	(r310358)
+++ head/www/tdiary/Makefile	Mon Jan 14 05:02:10 2013	(r310359)
@@ -61,23 +61,12 @@ TDIARY_LANG=	en
 
 REINPLACE_ARGS=	-i ''
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS NORA
+OPTIONS_DEFAULT=	NORA
 
-.if ${RUBY_VER} == 1.9
-.if !defined(RUBY_PROVIDED)
-IGNORE=	requires Ruby 1.9.1 or later
-.endif
-.endif
+NORA_DESC=	Use Nora
 
-.if ${RUBY_VER} == 1.8
-.if !defined(RUBY_PROVIDED)
-IGNORE=	requires Ruby 1.8.5 or later
-.endif
-RUN_DEPENDS+=	${DEPEND_RUBY_ICONV}
-.if !defined(WITHOUT_TDIARY_NORA)
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
-.endif
-.endif
+.include <bsd.port.options.mk>
 
 pre-patch:
 	@${RM} ${WRKSRC}/.gitignore
@@ -115,7 +104,7 @@ do-install:
 post-install:
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
 	@${ECHO_CMD} bin/${TDIARY_SCRIPT} >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
@@ -125,4 +114,22 @@ x-generate-plist:
 	${FIND} ${WWWDIR} -type f -o -type l | ${SORT} | ${SED} -e 's,${WWWDIR},%%WWWDIR%%,g' > pkg-plist.new
 	${FIND} ${WWWDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${WWWDIR},@dirrm %%WWWDIR%%,g' >> pkg-plist.new
 
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} == 1.9
+.if !defined(RUBY_PROVIDED)
+IGNORE=	requires Ruby 1.9.1 or later
+.endif
+.endif
+
+.if ${RUBY_VER} == 1.8
+.if !defined(RUBY_PROVIDED)
+IGNORE=	requires Ruby 1.8.5 or later
+.endif
+RUN_DEPENDS+=	${DEPEND_RUBY_ICONV}
+.if ${PORT_OPTIONS:MNORA}
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
+.endif
+.endif
+
 .include <bsd.port.post.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 3 TAKATSU Tomonari 2013-01-14 05:44:22 UTC

State Changed
From-To: open->closed

Committed. Thanks!