Updated to unofficial version 1.0.0 from

https://github.com/drizztbsd/stompserver/commits/master

This version fixes stompserver for Ruby 1.9 and properly supports rake.

6 files changed, 34 insertions, 32 deletions

diff --git a/net/ruby-stompserver/Makefile b/net/ruby-stompserver/Makefile
index c2b48824df1..ce96e41a107 100644
--- a/net/ruby-stompserver/Makefile
+++ b/net/ruby-stompserver/Makefile
@@ -1,17 +1,32 @@
-# $NetBSD: Makefile,v 1.1 2012/08/12 16:13:02 imil Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/13 18:43:33 imil Exp $
 
-DISTNAME=	stompserver-0.9.9
+DISTNAME=	drizztbsd-stompserver-1c7a275
+PKGNAME=	${RUBY_PKGPREFIX}-stompserver-1.0.0
 CATEGORIES=	net
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	http://stompserver.rubyforge.org/
 COMMENT=	Stomp messaging server
 LICENSE=	mit
+MASTER_SITES=	https://nodeload.github.com/drizztbsd/stompserver/tarball/
+DISTFILES=	1c7a275272f14ba3ce9d4c7f27402e659f775498
+
+# needed for https on github
+FETCH_USING=	curl
+# FETCH_OUTPUT_ARGS does not seem to work, we'll extract ourselves
+USE_TOOLS=	tar
 
 DEPENDS+=	${RUBY_PKGPREFIX}-eventmachine>=0.12.10:../../devel/ruby-eventmachine
 DEPENDS+=	${RUBY_PKGPREFIX}-hoe>=3.0.6:../../devel/hoe
 DEPENDS+=	${RUBY_PKGPREFIX}-daemons>=1.1.8:../../misc/ruby-daemons
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+GEM_BUILD=	rake
+GEM_NAME=	stompserver-1.0.0
+
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=	VARBASE STOMPSERVER_WRKDIR
@@ -35,7 +50,7 @@ PKG_GECOS.${STOMPSERVER_USER}=stompserver server user
 PKG_HOME.${STOMPSERVER_USER}=${STOMPSERVER_WRKDIR}
 PKG_SHELL.${STOMPSERVER_USER}=${NOLOGIN}
 
-EGDIR=		${DESTDIR}${PREFIX}/share/examples/stompserver
+EGDIR=		${PREFIX}/share/examples/stompserver
 
 ST_ROOT=	${STOMPSERVER_WRKDIR}
 
@@ -78,8 +93,11 @@ FILES_SUBST+=		STOMPSERVER_RCD_PID=${ST_ROOT}/${STOMPSERVER_PIDFILE}
 
 MESSAGE_SUBST+=		STOMPSERVER_WRKDIR=${STOMPSERVER_WRKDIR}
 
+do-extract:
+	${TAR} -zxf ${DISTDIR}/${DISTFILES} -C ${WRKDIR}
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/config/stompserver.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/config/stompserver.conf ${DESTDIR}${EGDIR}
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ruby-stompserver/PLIST b/net/ruby-stompserver/PLIST
index 028a279c49f..892c3cf8776 100644
--- a/net/ruby-stompserver/PLIST
+++ b/net/ruby-stompserver/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/12 16:13:02 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/08/13 18:43:33 imil Exp $
 bin/stompserver
 ${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/.gemtest
 ${GEM_LIBDIR}/History.txt
 ${GEM_LIBDIR}/Manifest.txt
 ${GEM_LIBDIR}/README.txt
diff --git a/net/ruby-stompserver/distinfo b/net/ruby-stompserver/distinfo
index f1eef71adb4..d232aac6199 100644
--- a/net/ruby-stompserver/distinfo
+++ b/net/ruby-stompserver/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1 2012/08/12 16:13:03 imil Exp $
+$NetBSD: distinfo,v 1.2 2012/08/13 18:43:33 imil Exp $
 
-SHA1 (stompserver-0.9.9.gem) = 99ddf0bac252315d3d9a42372bd111a456467481
-RMD160 (stompserver-0.9.9.gem) = 379796f13e919466171da102d572d82ee957b2f2
-Size (stompserver-0.9.9.gem) = 31232 bytes
-SHA1 (patch-config_stompserver.conf) = 896b6636ab9106dd520ddbb9bf415e9f7fe11c8b
-SHA1 (patch-gemspec) = b1fde5ff7dd735ebf29f04f4f38f4544f1cbccbc
-SHA1 (patch-lib_stomp__server.rb) = 42059b957b3b4ba949e4610a8f9fcf8e352c8e5f
+SHA1 (1c7a275272f14ba3ce9d4c7f27402e659f775498) = 6dd3eee288b782126792205e46b668f6339a31b8
+RMD160 (1c7a275272f14ba3ce9d4c7f27402e659f775498) = e260e05bf123badddd5a07ea7eb7f2e0d16aeb2a
+Size (1c7a275272f14ba3ce9d4c7f27402e659f775498) = 28274 bytes
+SHA1 (patch-config_stompserver.conf) = 42c7a959383921f9f14dca012826708c1278a223
+SHA1 (patch-lib_stomp__server.rb) = 2703617d6f54565be7e440f5000ffe268d707c63
diff --git a/net/ruby-stompserver/patches/patch-config_stompserver.conf b/net/ruby-stompserver/patches/patch-config_stompserver.conf
index 99f08e88f3b..4f93455f409 100644
--- a/net/ruby-stompserver/patches/patch-config_stompserver.conf
+++ b/net/ruby-stompserver/patches/patch-config_stompserver.conf
@@ -1,9 +1,9 @@
-$NetBSD: patch-config_stompserver.conf,v 1.1 2012/08/12 16:13:03 imil Exp $
+$NetBSD: patch-config_stompserver.conf,v 1.2 2012/08/13 18:43:34 imil Exp $
 
 Decent configuration file with user privileges separation and proper
 filesystem locations
 
---- config/stompserver.conf.orig	2012-08-12 12:54:26.000000000 +0000
+--- config/stompserver.conf.orig	2011-03-22 12:52:14.000000000 +0000
 +++ config/stompserver.conf
 @@ -1,11 +1,14 @@
  ---
diff --git a/net/ruby-stompserver/patches/patch-gemspec b/net/ruby-stompserver/patches/patch-gemspec
deleted file mode 100644
index 89b436a1b9b..00000000000
--- a/net/ruby-stompserver/patches/patch-gemspec
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gemspec,v 1.1 2012/08/12 16:13:03 imil Exp $
-
-OVERRIDE_GEMSPEC is supposed to handle this, but the homepage field is
-broken upstream.
-
---- ../stompserver-0.9.9.gemspec.orig   2012-08-12 12:23:16.000000000 +0000
-+++ ../stompserver-0.9.9.gemspec
-@@ -104,7 +104,7 @@ files:
- - test/test_stomp_frame.rb
- - test/test_topic_manager.rb
- - test_todo/test_stomp_server.rb
--homepage: ! '    by Patrick Hurley, Lionel Bouton'
-+homepage: http://stompserver.rubyforge.org/
- licenses: 
- post_install_message: 
- rdoc_options:
diff --git a/net/ruby-stompserver/patches/patch-lib_stomp__server.rb b/net/ruby-stompserver/patches/patch-lib_stomp__server.rb
index 88b2b4a3cee..412d8e3209d 100644
--- a/net/ruby-stompserver/patches/patch-lib_stomp__server.rb
+++ b/net/ruby-stompserver/patches/patch-lib_stomp__server.rb
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_stomp__server.rb,v 1.1 2012/08/12 16:13:03 imil Exp $
+$NetBSD: patch-lib_stomp__server.rb,v 1.2 2012/08/13 18:43:34 imil Exp $
 
 Buggy code made pid relative to logdir
 
---- lib/stomp_server.rb.orig	2012-08-12 15:28:59.000000000 +0000
+--- lib/stomp_server.rb.orig	2012-08-13 12:57:02.000000000 +0000
 +++ lib/stomp_server.rb
 @@ -67,7 +67,7 @@ module StompServer
        opts[:storage] = File.join(opts[:working_dir],opts[:storage])