From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 3 07:30:13 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B6E716A47F for ; Sat, 3 Jun 2006 07:30:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9C3943D49 for ; Sat, 3 Jun 2006 07:30:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k537UCM6009516 for ; Sat, 3 Jun 2006 07:30:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k537UCTx009512; Sat, 3 Jun 2006 07:30:12 GMT (envelope-from gnats) Resent-Date: Sat, 3 Jun 2006 07:30:12 GMT Resent-Message-Id: <200606030730.k537UCTx009512@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alastair Rankine Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A778C16A473 for ; Sat, 3 Jun 2006 07:28:34 +0000 (UTC) (envelope-from a_rankine@optusnet.com.au) Received: from smtp1.adl2.internode.on.net (smtp1.adl2.internode.on.net [203.16.214.181]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDDE943D49 for ; Sat, 3 Jun 2006 07:28:33 +0000 (GMT) (envelope-from a_rankine@optusnet.com.au) Received: from claude.girtby.info (ppp41-70.lns2.syd6.internode.on.net [59.167.41.70]) by smtp1.adl2.internode.on.net (8.13.6/8.13.5) with ESMTP id k537SVHX048606 for ; Sat, 3 Jun 2006 16:58:32 +0930 (CST) (envelope-from a_rankine@optusnet.com.au) Received: by claude.girtby.info (Postfix, from userid 504) id AB9CE2E695; Sat, 3 Jun 2006 17:28:31 +1000 (EST) Message-Id: <20060603072831.AB9CE2E695@claude.girtby.info> Date: Sat, 3 Jun 2006 17:28:31 +1000 (EST) From: Alastair Rankine To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/98418: Update port: www/instiki multiple fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alastair Rankine List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jun 2006 07:30:13 -0000 >Number: 98418 >Category: ports >Synopsis: Update port: www/instiki multiple fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jun 03 07:30:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alastair Rankine >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD claude.girtby.info 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed May 10 07:16:01 EST 2006 root@claude.girtby.info:/usr/obj/usr/src/sys/CLAUDE i386 >Description: >How-To-Repeat: >Fix: * Change maintainer email address * Fix rc.d file to use SIGKILL to terminate * Add new port option to use bluecloth from ports (improved Markdown syntax support) * Remove unfetchable MASTER_SITE URL --- instiki.patch begins here --- diff -U 2 -r /usr/ports/www/instiki/Makefile ./Makefile --- /usr/ports/www/instiki/Makefile Wed May 3 18:00:07 2006 +++ ./Makefile Sat Jun 3 16:50:05 2006 @@ -1,6 +1,2 @@ -# New ports collection makefile for: instiki -# Date created: 4 January 2005 -# Whom: Kelley Reynolds -# # $FreeBSD: ports/www/instiki/Makefile,v 1.8 2006/05/03 08:00:07 pav Exp $ # @@ -9,14 +5,12 @@ 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 @@ -35,4 +29,6 @@ RUBY_SHEBANG_FILES=instiki +OPTIONS= PORT_BLUECLOTH "Use BlueCloth gem from ports (updated Markdown formatter)" On + post-patch: ( cd ${WRKSRC}/db/ && \ @@ -44,3 +40,12 @@ ${CHMOD} +x ${PREFIX}/${INSTIKIDIR}/instiki -.include +.include + +.if defined(WITH_PORT_BLUECLOTH) +RUN_DEPENDS+= ${LOCALBASE}/${SPEC_DIR}/bluecloth-1.0.0.gemspec:${PORTSDIR}/ruby/rubygem-rubygem-bluecloth + +EXTRA_PATCHES+= ${FILESDIR}/bluecloth-patch-lib-chunks-engines-rb +.endif + +.include + Only in ./files: bluecloth-patch-lib-chunks-engines-rb diff -U 2 -r /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 --- instiki.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: