Date: Thu, 8 Jun 2006 20:41:23 +1000 From: Alastair Rankine <arsptr@internode.on.net> To: Pav Lucistnik <pav@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/98418: Update port: www/instiki multiple fixes Message-ID: <3918A0B6-B4F0-49E4-A2D2-9E2CF4670074@internode.on.net> In-Reply-To: <200606052119.k55LJvoK062418@freefall.freebsd.org> References: <200606052119.k55LJvoK062418@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail-1--342608119 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Good point. Let's try that again from the top... --Apple-Mail-1--342608119 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="instiki.patch" Content-Disposition: attachment; filename=instiki.patch diff -U 2 -rN /usr/ports/www/instiki/Makefile ./Makefile --- /usr/ports/www/instiki/Makefile Wed May 3 18:00:07 2006 +++ ./Makefile Thu Jun 8 19:58:59 2006 @@ -1,6 +1,2 @@ -# New ports collection makefile for: instiki -# Date created: 4 January 2005 -# Whom: Kelley Reynolds <kelley@insidesystems.net> -# # $FreeBSD: ports/www/instiki/Makefile,v 1.8 2006/05/03 08:00:07 pav Exp $ # @@ -9,16 +5,13 @@ PORTVERSION= 0.11.0 CATEGORIES= www ruby -MASTER_SITES= http://rubyforge.org/frs/download.php/9296/ \ - http://rubyforge.rubyuser.de/instiki/ +MASTER_SITES= http://rubyforge.rubyuser.de/instiki/ EXTRACT_SUFX= .tgz -MAINTAINER= arsptr@optusnet.com.au +MAINTAINER= arsptr@internode.on.net COMMENT= Easy to set up wiki clone implemented in ruby RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/sqlite3_api.so:${PORTSDIR}/databases/ruby-sqlite3 BUILD_DEPENDS+= ${RUN_DEPENDS} rake:${PORTSDIR}/devel/rubygem-rake -PATCH_DEPENDS= ${BUILD_DEPENDS} -NO_BUILD= yes USE_RUBY= yes USE_RUBY_FEATURES= 1.8 @@ -35,5 +28,7 @@ RUBY_SHEBANG_FILES=instiki -post-patch: +OPTIONS= PORT_BLUECLOTH "Use BlueCloth gem from ports" On + +do-build: ( cd ${WRKSRC}/db/ && \ rake environment RAILS_ENV=production migrate ) @@ -41,6 +36,29 @@ do-install: ${CP} -pR ${WRKSRC}/ ${PREFIX}/${INSTIKIDIR} - ${CP} ${PREFIX}/${INSTIKIDIR}/db/production.db.sqlite3 ${PREFIX}/${INSTIKIDIR}/db/default.db.sqlite3 + ${CP} ${PREFIX}/${INSTIKIDIR}/db/production.db.sqlite3 \ + ${PREFIX}/${INSTIKIDIR}/db/default.db.sqlite3 ${CHMOD} +x ${PREFIX}/${INSTIKIDIR}/instiki -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(WITH_PORT_BLUECLOTH) + +# can't include this because it redefines do-install. +# .include "${PORTSDIR}/devel/ruby-gems/Makefile.common" + +# For now, copy and paste the definition of SPEC_DIR from the above +REV= 1.8 +GEMS_BASE_DIR= lib/ruby/gems/${REV} +SPEC_DIR= ${GEMS_BASE_DIR}/specifications + +RUN_DEPENDS+= ${LOCALBASE}/${SPEC_DIR}/BlueCloth-1.0.0.gemspec:${PORTSDIR}/www/rubygem-bluecloth + +EXTRA_PATCHES+= ${FILESDIR}/bluecloth-patch-lib-chunks-engines-rb + +post-patch: + ${RM} ${WRKSRC}/lib/chunks/engines.rb.orig + +.endif + +.include <bsd.port.post.mk> + diff -U 2 -rN /usr/ports/www/instiki/files/bluecloth-patch-lib-chunks-engines-rb ./files/bluecloth-patch-lib-chunks-engines-rb --- /usr/ports/www/instiki/files/bluecloth-patch-lib-chunks-engines-rb Thu Jan 1 10:00:00 1970 +++ ./files/bluecloth-patch-lib-chunks-engines-rb Thu Jun 8 19:49:44 2006 @@ -0,0 +1,12 @@ +--- lib/chunks/engines.rb.orig Sun Mar 12 15:57:24 2006 ++++ lib/chunks/engines.rb Tue Jun 6 22:45:16 2006 +@@ -35,7 +35,8 @@ + + class Markdown < AbstractEngine + def mask +- require_dependency 'bluecloth_tweaked' ++ require_dependency 'rubygems' ++ require_gem 'BlueCloth' + BlueCloth.new(@content, @content.options[:engine_opts]).to_html + end + end diff -U 2 -rN /usr/ports/www/instiki/files/instiki.in ./files/instiki.in --- /usr/ports/www/instiki/files/instiki.in Tue May 2 00:32:28 2006 +++ ./files/instiki.in Thu May 4 11:27:13 2006 @@ -24,5 +24,5 @@ : ${instiki_flags="--port %%INSTIKIPORT%% --daemon"} -sig_stop=-KILL +sig_stop=KILL load_rc_config $name --Apple-Mail-1--342608119 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed On 05/06/2006, at 9:19 PM, Pav Lucistnik wrote: > Synopsis: Update port: www/instiki multiple fixes > > State-Changed-From-To: open->feedback > State-Changed-By: pav > State-Changed-When: Mon Jun 5 21:19:33 UTC 2006 > State-Changed-Why: > Are you sure you don't need rake as patch dependency? You're > running it > in post-patch: target... > > > Responsible-Changed-From-To: freebsd-ports-bugs->pav > Responsible-Changed-By: pav > Responsible-Changed-When: Mon Jun 5 21:19:33 UTC 2006 > Responsible-Changed-Why: > Track > > http://www.freebsd.org/cgi/query-pr.cgi?pr=98418 --Apple-Mail-1--342608119--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3918A0B6-B4F0-49E4-A2D2-9E2CF4670074>