>Number:         24545
>Category:       pkg
>Synopsis:       
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Feb 24 11:22:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rasputin
>Release:        NetBSD 1.6X
>Organization:
Rasputin :: Jack of All Trades - Master of Nuns
>Environment:
	
	
System: NetBSD lb 1.6X NetBSD 1.6X (LITTLEBIRD) #1: Wed Sep 3 19:57:38 BST 2003 rasputin@lb:/usr/obj/usr/src/sys/arch/i386/compile/LITTLEBIRD i386
Architecture: i386
Machine: i386
>Description:
	Upgrade www/ap-ruby 0.9.7 -> 1.0.7
>How-To-Repeat:
	CSee patch below
>Fix:
	http://nine.hellooperator.net/netbsd/www_ap-ruby_0.9.7-1.0.7.diff
   (quite small so follows inline) 

	The patch bumps the version as specified. I've checked eruby 
	and amrita (CGI) functionality is ok.

	I've also removed the APXS do-install entry; the work is performed 
   in PLIST by a pair of @exec/@unexec clauses.

   Finally, I stopped apxs editing httpd.conf directly - that's just
   a pet peeve of mine so feel free to revert that chunk :)

? www_ap-ruby_0.9.7-1.0.7.diff
Index: MESSAGE
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ap-ruby/MESSAGE,v
retrieving revision 1.3
diff -r1.3 MESSAGE
7c7,13
<   LoadModule ruby_module lib/httpd/mod_ruby.so
---
> 	LoadModule ruby_module lib/httpd/mod_ruby.so
> 
> 'Include'ing the config snippet in 
> 
> 	 ${PREFIX}/examples/ruby/mod_ruby/mod_ruby.conf
> 
> may also be helpful.
Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ap-ruby/Makefile,v
retrieving revision 1.13
diff -r1.13 Makefile
6d5
< PKGREVISION=	1
19c18
< VERSION=	0.9.7
---
> VERSION=	1.0.7
24,25c23
< 		--with-eruby-includes="${BUILDLINK_PREFIX.ruby-eruby}/include" \
< 		--with-eruby-libraries="${BUILDLINK_PREFIX.ruby-eruby}/lib"
---
> 		--enable-eruby 
40d37
< 	${APXS} -i -A -n ruby ${WRKSRC}/mod_ruby.so
Index: PLIST
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ap-ruby/PLIST,v
retrieving revision 1.3
diff -r1.3 PLIST
3,4c3,4
< @exec %D/sbin/apxs -e -A -n ruby %D/%F
< @unexec %D/sbin/apxs -e -A -n ruby %D/%F
---
> @exec %D/sbin/apxs -e -n ruby %D/%F
> @unexec %D/sbin/apxs -e -n ruby %D/%F
6a7
> ${RUBY_SITELIBDIR}/apache/eruby-debug.rb
9a11
> @dirrm ${RUBY_SITELIBDIR}/apache
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ap-ruby/distinfo,v
retrieving revision 1.4
diff -r1.4 distinfo
3,4c3,4
< SHA1 (ruby/mod_ruby-0.9.7.tar.gz) = 7e7005432412efcf1c32582793f0faec8ef777ee
< Size (ruby/mod_ruby-0.9.7.tar.gz) = 41442 bytes
---
> SHA1 (ruby/mod_ruby-1.0.7.tar.gz) = c9738ef257c266e67456b4a3f87868b3f65e7372
> Size (ruby/mod_ruby-1.0.7.tar.gz) = 69035 bytes
>Release-Note:
>Audit-Trail:
>Unformatted: