ports/98418: Update port: www/instiki multiple fixes

[Alastair Rankine]

>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 at 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 <kelley at insidesystems.net>
-#
 # $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 at optusnet.com.au
+MAINTAINER=	arsptr at 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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.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 <bsd.port.post.mk>
+
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: