From 9fa1d217cee6d9a0ce20b4677e10ce2b449a20f6 Mon Sep 17 00:00:00 2001
From: jeremy <jeremy@openbsd.org>
Date: Tue, 26 Oct 2010 21:32:32 +0000
Subject: [PATCH] Use CONFIGURE_STYLE = ruby gem ext to clean things up.
 SHARED_ONLY = Yes wasn't set before, but it is set automatically now, which
 is the correct setting.  This requires removing PFRAG.shared and integrating
 the contents into PLIST.

ok landry, phessler, sthen
---
 sysutils/god/Makefile          | 11 ++++-------
 sysutils/god/pkg/PFRAG.shared  |  3 ---
 sysutils/god/pkg/PLIST         |  5 +++--
 www/ruby-fcgi/Makefile         | 11 +++++------
 www/ruby-fcgi/pkg/PFRAG.shared |  3 ---
 www/ruby-fcgi/pkg/PLIST        |  5 +++--
 6 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 sysutils/god/pkg/PFRAG.shared
 delete mode 100644 www/ruby-fcgi/pkg/PFRAG.shared

diff --git a/sysutils/god/Makefile b/sysutils/god/Makefile
index 9177a04f820..5187514868c 100644
--- a/sysutils/god/Makefile
+++ b/sysutils/god/Makefile
@@ -1,26 +1,23 @@
-# $OpenBSD: Makefile,v 1.5 2010/09/28 20:12:18 jeremy Exp $
+# $OpenBSD: Makefile,v 1.6 2010/10/26 21:32:32 jeremy Exp $
 
 COMMENT=	system monitoring framework written in Ruby
 
 DISTNAME=	god-0.7.3
-REVISION =      2
+REVISION =      3
 CATEGORIES=	sysutils
 
-# mit
+# MIT
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c m
-LIB_DEPENDS=	${MODRUBY_LIB_DEPENDS}
-
 MODULES=	lang/ruby
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	:ruby-hoe->=1.4.0:devel/ruby-hoe
 
-CONFIGURE_STYLE=ruby gem
+CONFIGURE_STYLE=ruby gem ext
 
 post-install:
 	@mkdir -p ${PREFIX}/share/examples/god
diff --git a/sysutils/god/pkg/PFRAG.shared b/sysutils/god/pkg/PFRAG.shared
deleted file mode 100644
index 3692f98a557..00000000000
--- a/sysutils/god/pkg/PFRAG.shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/10/08 20:52:27 jcs Exp $
-lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/god/kqueue_handler_ext.so
-lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/kqueue_handler_ext.so
diff --git a/sysutils/god/pkg/PLIST b/sysutils/god/pkg/PLIST
index b6935484f91..d4e65d6f8aa 100644
--- a/sysutils/god/pkg/PLIST
+++ b/sysutils/god/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/09/23 22:30:28 jeremy Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.3 2010/10/26 21:32:32 jeremy Exp $
 bin/god
 lib/ruby/gems/${MODRUBY_REV}/cache/${DISTNAME}.gem
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/
@@ -851,6 +850,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/god/kqueue_handler.o
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/god/mkmf.log
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/god/netlink_handler.c
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/god/netlink_handler.o
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/god/kqueue_handler_ext.so
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/init/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/init/god
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/
@@ -903,6 +903,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/god/task.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/god/timeline.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/god/trigger.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/god/watch.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/kqueue_handler_ext.so
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/configs/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/configs/child_events/
diff --git a/www/ruby-fcgi/Makefile b/www/ruby-fcgi/Makefile
index 320b340b483..792fb821b3a 100644
--- a/www/ruby-fcgi/Makefile
+++ b/www/ruby-fcgi/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2010/09/28 20:12:19 jeremy Exp $
+# $OpenBSD: Makefile,v 1.9 2010/10/26 21:34:30 jeremy Exp $
 
 COMMENT=	ruby FastCGI library
 
 DISTNAME=	fcgi-0.8.7
 PKGNAME=	ruby-${DISTNAME}
-REVISION=	2
+REVISION=	3
 CATEGORIES=	www 
 
 # ruby license
@@ -15,12 +15,11 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=	lang/ruby
 
-WANTLIB=	c m
+WANTLIB=	fcgi
 
-LIB_DEPENDS=	${MODRUBY_LIB_DEPENDS} \
-		fcgi:fcgi->=2.4.0:www/fcgi
+LIB_DEPENDS=	:fcgi->=2.4.0:www/fcgi
 
-CONFIGURE_STYLE=ruby gem
+CONFIGURE_STYLE=ruby gem ext
 CONFIGURE_ARGS=	--with-fcgi-include=${LOCALBASE}/include \
 		--with-fcgi-lib=${LOCALBASE}/lib
 
diff --git a/www/ruby-fcgi/pkg/PFRAG.shared b/www/ruby-fcgi/pkg/PFRAG.shared
deleted file mode 100644
index 515b674e0dc..00000000000
--- a/www/ruby-fcgi/pkg/PFRAG.shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/05/29 20:19:49 jcs Exp $
-lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/fcgi/fcgi.so
-lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/fcgi.so
diff --git a/www/ruby-fcgi/pkg/PLIST b/www/ruby-fcgi/pkg/PLIST
index 39495274ac6..beed6a05ee9 100644
--- a/www/ruby-fcgi/pkg/PLIST
+++ b/www/ruby-fcgi/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/29 20:19:49 jcs Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.2 2010/10/26 21:34:30 jeremy Exp $
 lib/ruby/gems/${MODRUBY_REV}/cache/${DISTNAME}.gem
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/
@@ -14,6 +13,8 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/fcgi/extconf.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/fcgi/fcgi.c
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/fcgi/fcgi.o
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/fcgi/mkmf.log
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ext/fcgi/fcgi.so
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/fcgi.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/fcgi.so
 lib/ruby/gems/${MODRUBY_REV}/specifications/${DISTNAME}.gemspec