From owner-svn-ports-head@FreeBSD.ORG Sat Apr 26 10:06:09 2014 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 ESMTPS id 4C9357AB; Sat, 26 Apr 2014 10:06:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3930719C9; Sat, 26 Apr 2014 10:06:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QA69gT068360; Sat, 26 Apr 2014 10:06:09 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3QA68AQ068357; Sat, 26 Apr 2014 10:06:08 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201404261006.s3QA68AQ068357@svn.freebsd.org> From: TAKATSU Tomonari Date: Sat, 26 Apr 2014 10:06:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352237 - head/www/tdiary 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.17 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: Sat, 26 Apr 2014 10:06:09 -0000 Author: tota Date: Sat Apr 26 10:06:08 2014 New Revision: 352237 URL: http://svnweb.freebsd.org/changeset/ports/352237 QAT: https://qat.redports.org/buildarchive/r352237/ Log: - Update to 4.0.3 - Remove RUBY_REQUIRE - Unmute INSTALL_DATA, INSTALL_SCRIPT and TAR - Make DOCS unconditional to stage Modified: head/www/tdiary/Makefile head/www/tdiary/distinfo head/www/tdiary/pkg-plist Modified: head/www/tdiary/Makefile ============================================================================== --- head/www/tdiary/Makefile Sat Apr 26 10:01:20 2014 (r352236) +++ head/www/tdiary/Makefile Sat Apr 26 10:06:08 2014 (r352237) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tdiary -PORTVERSION= 4.0.2 +PORTVERSION= 4.0.3 CATEGORIES?= www ruby MASTER_SITES= http://www.tdiary.org/download/ DISTNAME= ${PORTNAME}-full-v${PORTVERSION} @@ -12,14 +12,13 @@ COMMENT= Web-based diary system (like we LICENSE= GPLv2 -RUN_DEPENDS= rubygem-fastimage>=1.5.0:${PORTSDIR}/graphics/rubygem-fastimage \ +RUN_DEPENDS= rubygem-fastimage>=1.6.0:${PORTSDIR}/graphics/rubygem-fastimage \ hikidoc:${PORTSDIR}/textproc/ruby-hikidoc \ - rubygem-multi_json>=1.7.7:${PORTSDIR}/devel/rubygem-multi_json \ + rubygem-multi_json>=1.8.4:${PORTSDIR}/devel/rubygem-multi_json \ rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack NO_BUILD= yes USE_RUBY= yes -RUBY_REQUIRE= Ruby >= 193 RUBY_SHEBANG_FILES= index.fcgi \ index.rb \ @@ -60,8 +59,6 @@ REINPLACE_ARGS= -i '' OPTIONS_DEFINE= DOCS -.include - pre-patch: @${RM} ${WRKSRC}/.coveralls.yml @${RM} ${WRKSRC}/.gitignore @@ -72,8 +69,9 @@ pre-patch: @${RM} ${WRKSRC}/Procfile @${RM} ${WRKSRC}/Rakefile @${RM} ${WRKSRC}/config.ru - @${RM} -r ${WRKSRC}/.bundle - @${RM} -r ${WRKSRC}/misc/lib/bundler-1.3.5 + @${RM} ${WRKSRC}/tmp/.gitkeep + @${RM} -rf ${WRKSRC}/.bundle + @${RM} -r ${WRKSRC}/misc/lib/bundler-1.6.0.rc @${RM} -r ${WRKSRC}/public @${RM} -r ${WRKSRC}/spec @${RM} -r ${WRKSRC}/test @@ -91,21 +89,19 @@ pre-install: @${REINPLACE_CMD} '/#!\/usr\/bin\/env ruby/d' ${WRKSRC}/misc/migrate.rb do-install: - @${INSTALL_SCRIPT} ${WRKDIR}/${TDIARY_SCRIPT} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${TDIARY_SCRIPT} ${STAGEDIR}${PREFIX}/bin @-${MKDIR} ${STAGEDIR}${WWWDIR} - @${TAR} --exclude "doc" -C ${WRKSRC} -cf - . | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf - + ${TAR} --exclude "doc" -C ${WRKSRC} -cf - . | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf - post-install: @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST} @${ECHO_CMD} bin/${TDIARY_SCRIPT} >> ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} @${CAT} ${PKGMESSAGE} x-generate-plist: stage ${FIND} ${STAGEDIR}${WWWDIR} -type f -o -type l | ${SORT} | ${SED} -e 's,${STAGEDIR}${WWWDIR},%%WWWDIR%%,g' > pkg-plist.new ${FIND} ${STAGEDIR}${WWWDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${STAGEDIR}${WWWDIR},@dirrm %%WWWDIR%%,g' >> pkg-plist.new -.include +.include Modified: head/www/tdiary/distinfo ============================================================================== --- head/www/tdiary/distinfo Sat Apr 26 10:01:20 2014 (r352236) +++ head/www/tdiary/distinfo Sat Apr 26 10:06:08 2014 (r352237) @@ -1,2 +1,2 @@ -SHA256 (tdiary-full-v4.0.2.tar.gz) = 90c21f2aace7c5de1374901e1ec560ee8809ce2040507d7808e511a7cc62b510 -SIZE (tdiary-full-v4.0.2.tar.gz) = 15027180 +SHA256 (tdiary-full-v4.0.3.tar.gz) = e766d1017221336125b595a92ec16c21436a9dbbec36eafa75488e4a032968f5 +SIZE (tdiary-full-v4.0.3.tar.gz) = 77485225 Modified: head/www/tdiary/pkg-plist ============================================================================== --- head/www/tdiary/pkg-plist Sat Apr 26 10:01:20 2014 (r352236) +++ head/www/tdiary/pkg-plist Sat Apr 26 10:06:08 2014 (r352237) @@ -146,6 +146,7 @@ %%WWWDIR%%/misc/plugin/referer-antibot.rb %%WWWDIR%%/misc/plugin/referer-utf8.rb %%WWWDIR%%/misc/plugin/referer_scheme.rb +%%WWWDIR%%/misc/plugin/search-default.rb %%WWWDIR%%/misc/plugin/search_control.rb %%WWWDIR%%/misc/plugin/search_form.rb %%WWWDIR%%/misc/plugin/sn.rb @@ -153,6 +154,7 @@ %%WWWDIR%%/misc/plugin/squeeze.rb %%WWWDIR%%/misc/plugin/src.rb %%WWWDIR%%/misc/plugin/tb-show.rb +%%WWWDIR%%/misc/plugin/theme_online.rb %%WWWDIR%%/misc/plugin/title_list.rb %%WWWDIR%%/misc/plugin/title_tag.rb %%WWWDIR%%/misc/plugin/tlink.rb @@ -233,6 +235,8 @@ %%WWWDIR%%/tdiary/dispatcher/index_main.rb %%WWWDIR%%/tdiary/dispatcher/update_main.rb %%WWWDIR%%/tdiary/environment.rb +%%WWWDIR%%/tdiary/extensions.rb +%%WWWDIR%%/tdiary/extensions/core.rb %%WWWDIR%%/tdiary/filter.rb %%WWWDIR%%/tdiary/filter/default.rb %%WWWDIR%%/tdiary/filter/spam.rb @@ -447,6 +451,7 @@ %%WWWDIR%%/theme/book2-feminine/book2-feminine.css %%WWWDIR%%/theme/book3-sky/README %%WWWDIR%%/theme/book3-sky/book3-sky.css +%%WWWDIR%%/theme/bootstrap/README %%WWWDIR%%/theme/bootstrap/bootstrap.css %%WWWDIR%%/theme/bootstrap/css/bootstrap-responsive.css %%WWWDIR%%/theme/bootstrap/css/bootstrap-responsive.min.css @@ -471,6 +476,7 @@ %%WWWDIR%%/theme/bubble/bubble_anchor_b.png %%WWWDIR%%/theme/bubble/bubble_back.png %%WWWDIR%%/theme/bubble/bubble_pre.png +%%WWWDIR%%/theme/cafe-mint-julep-soda/README %%WWWDIR%%/theme/cafe-mint-julep-soda/cafe-mint-julep-soda-back-iphone.jpg %%WWWDIR%%/theme/cafe-mint-julep-soda/cafe-mint-julep-soda-back.jpg %%WWWDIR%%/theme/cafe-mint-julep-soda/cafe-mint-julep-soda-update.jpg @@ -756,6 +762,7 @@ %%WWWDIR%%/theme/gear/gear.css %%WWWDIR%%/theme/gear/gear_h2.png %%WWWDIR%%/theme/gear/gear_sanchor.png +%%WWWDIR%%/theme/genjson.rb %%WWWDIR%%/theme/germany/README %%WWWDIR%%/theme/germany/germany.css %%WWWDIR%%/theme/germany/germany_anchor.png @@ -947,6 +954,7 @@ %%WWWDIR%%/theme/greentea3/README %%WWWDIR%%/theme/greentea3/greentea3.css %%WWWDIR%%/theme/greentea3/greentea3_back.jpg +%%WWWDIR%%/theme/gustav/README %%WWWDIR%%/theme/gustav/gustav.css %%WWWDIR%%/theme/gustav/gustav_back.jpg %%WWWDIR%%/theme/gustav/gustav_back_iphone.jpg @@ -1066,6 +1074,7 @@ %%WWWDIR%%/theme/himawari/himawari_anchor.gif %%WWWDIR%%/theme/himawari/himawari_bg.jpg %%WWWDIR%%/theme/himawari/himawari_canchor.gif +%%WWWDIR%%/theme/hsbt/README %%WWWDIR%%/theme/hsbt/hsbt.css %%WWWDIR%%/theme/husen/README %%WWWDIR%%/theme/husen/husen.css @@ -1740,6 +1749,7 @@ %%WWWDIR%%/theme/teacup/teacup_anchor2.png %%WWWDIR%%/theme/teacup/teacup_h1.png %%WWWDIR%%/theme/themebench.html +%%WWWDIR%%/theme/themes.json %%WWWDIR%%/theme/thin/README %%WWWDIR%%/theme/thin/thin.css %%WWWDIR%%/theme/thin/thin_canchor.png @@ -1883,6 +1893,8 @@ %%WWWDIR%%/theme/zef/zef.css %%WWWDIR%%/update.fcgi %%WWWDIR%%/update.rb +@exec mkdir -p %D/%%WWWDIR%%/tmp +@dirrm %%WWWDIR%%/tmp @dirrm %%WWWDIR%%/theme/zef @dirrm %%WWWDIR%%/theme/yukon @dirrm %%WWWDIR%%/theme/ymck @@ -2237,6 +2249,7 @@ @dirrm %%WWWDIR%%/tdiary/lang @dirrm %%WWWDIR%%/tdiary/io @dirrm %%WWWDIR%%/tdiary/filter +@dirrm %%WWWDIR%%/tdiary/extensions @dirrm %%WWWDIR%%/tdiary/dispatcher @dirrm %%WWWDIR%%/tdiary/cache @dirrm %%WWWDIR%%/tdiary/application/extensions