From owner-freebsd-ruby@FreeBSD.ORG Sat Feb 8 19:25:51 2014 Return-Path: Delivered-To: freebsd-ruby@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 604C6E4E; Sat, 8 Feb 2014 19:25:51 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3B2991777; Sat, 8 Feb 2014 19:25:51 +0000 (UTC) Received: from nemysis4now (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with SMTP id s18JPmcc083243; Sat, 8 Feb 2014 19:25:49 GMT (envelope-from nemysis@FreeBSD.org) Received: by nemysis4now (sSMTP sendmail emulation); Sat, 08 Feb 2014 20:25:48 +0100 Date: Sat, 8 Feb 2014 20:25:48 +0100 From: Rusmir Dusko To: freebsd-ruby@freebsd.org Subject: devel/ruby-sdl update to 2.1.3 Message-ID: <20140208192548.GA6181@nemysis4now> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="qMm9M+Fa2AknHoGS" Content-Disposition: inline User-Agent: Mutt/1.5.22 (2013-10-16) Cc: nemysis@FreeBSD.org X-BeenThere: freebsd-ruby@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: FreeBSD-specific Ruby discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Feb 2014 19:25:51 -0000 --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello I have updated devel/ruby-sdl to 2.1.3 Works very good and have to tested with my deleted Port games/magicmaze - Update to 2.1.3 - Change master sites to RUBYFORGE - Remove DEPRECATED, EXPIRATION_DATE - Add license (LGPL21) - Add dependencies for devel/sdl_sge, japanese/libskk and devel/sdlskk - Change CONFIGURE_ARGS - Support STAGEDIR - Change DOCS, EXAMPLES and add DOCS, EXAMPLES Options - Remove obsolete REINPLACE - Add patch, fix build on FreeBSD - Change pkg-descr - Add WWW Please approve these changes. Please commit or should I commit. Work close to Upstream, which have me set patch, now is build for FreeBSD fixed. Have sent PR for japanese/libskk and updated, that works devel/ruby-sdl ports/186181 [PATCH] japanese/libskk Update to 1.0.1, Fix build with Clang I have adopted devel/sdlskk and changed to use CONFIGURE_ARGS+= --with-pic -- Best regards, Rusmir Dusko --qMm9M+Fa2AknHoGS Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="ruby-sdl.diff" Index: Makefile =================================================================== --- Makefile (revision 330064) +++ Makefile (working copy) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= sdl -PORTVERSION= 1.3.1 -PORTREVISION= 8 +PORTVERSION= 2.1.3 CATEGORIES= devel graphics audio ruby -MASTER_SITES= http://www.kmc.gr.jp/~ohai/rubysdl/ +MASTER_SITES= RUBYFORGE/ruby${PORTNAME}/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ruby${PORTNAME}-${PORTVERSION} DIST_SUBDIR= ruby @@ -13,14 +12,16 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby extension library to use SDL library -DEPRECATED= Does not work with Ruby 1.9 -EXPIRATION_DATE= 2013-10-10 +LICENSE= LGPL21 -BUILD_DEPENDS= ${NONEXISTENT}:${RUBY_OPENGL_PORTDIR}:patch +LIB_DEPENDS= libSGE.so:${PORTSDIR}/devel/sdl_sge \ + libskk.so:${PORTSDIR}/japanese/libskk \ + libSDLSKK.so.2.0:${PORTSDIR}/devel/sdlskk RUBY_OPENGL_PORTDIR= ${PORTSDIR}/graphics/ruby-opengl RUBY_OPENGL_WRKSRC_CMD= cd ${RUBY_OPENGL_PORTDIR}; ${MAKE} -V WRKSRC + USE_SDL= mixer image ttf sdl USE_RUBY= yes USE_RUBY_EXTCONF= yes @@ -27,45 +28,43 @@ CONFIGURE_ARGS= --with-sdl-config="sdl-config" \ --enable-opengl --linkoglmodule \ - --with-x11-dir="${LOCALBASE}" + --with-x11-dir="${LOCALBASE}" \ + --disable-pthreads INSTALL_TARGET= site-install -RUBY_RD_FILES= rubysdl_doc.en.rd \ - rubysdl_doc_old.rd +PORTDOCS= * +PORTEXAMPLES= * -DOCS_EN= NEWS.en README.en rubysdl_const_list.txt \ - ${RUBY_RD_FILES:M*.en.rd} \ - ${RUBY_RD_HTML_FILES:M*.en.html} -DOCS_JA= NEWS.ja README.ja \ - ${RUBY_RD_FILES:N*.en.rd} \ - ${RUBY_RD_HTML_FILES:N*.en.html} +DOCSDIR= ${RUBY_MODDOCDIR} +EXAMPLESDIR= ${RUBY_MODEXAMPLESDIR} -NO_STAGE= yes -.include +DOCSRCDIR1= ${WRKSRC} +DOC_FILES_WRKSRC_JA= NEWS.ja README.ja +DOC_FILES_WRKSRC_EN= NEWS.en README.en -post-extract: - dir=`${RUBY_OPENGL_WRKSRC_CMD}`; \ - for f in rbogl.h rbogl.c ogl.c glu.c; do \ - ${LN} -fs $$dir/$$f ${WRKSRC}/; \ - done +DOCSRCDIRJA= ${WRKSRC}/doc +DOCSDIRJA= ${RUBY_MODDOCDIR}/doc +DOC_FILESJA= *.rsd *.rb -post-patch: - ${RUBY} -i -pe '/require \x27mkmf\x27/ and $$_ += "dir_config(\x27x11\x27)\n"' \ - ${WRKSRC}/${RUBY_EXTCONF} +DOCSRCDIREN= ${WRKSRC}/doc-en +DOCSDIREN= ${RUBY_MODDOCDIR}/doc-en +DOC_FILESEN= *.rsd -post-install: doc-install +OPTIONS_DEFINE= DOCS EXAMPLES -doc-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${RUBY_MODEXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/ - ${MKDIR} ${RUBY_MODDOCDIR}/ja -.for f in ${DOCS_EN} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ -.endfor -.for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/ -.endfor -.endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ruby/site_ruby/1.9/*/sdl_ext.so + @${REINPLACE_CMD} -e 's|ruby|${LOCALBASE}/bin/ruby|g' ${WRKSRC}/doc/rsd.rb -.include + @${MKDIR} ${STAGEDIR}${DOCSDIR}/ja + ${INSTALL_DATA} ${DOC_FILES_WRKSRC_JA:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}/ja/ + ${INSTALL_DATA} ${DOC_FILES_WRKSRC_EN:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + + @${MKDIR} ${STAGEDIR}${DOCSDIR}/doc/ja + ${INSTALL_DATA} ${DOC_FILESJA:S|^|${DOCSRCDIRJA}/|} ${STAGEDIR}${DOCSDIR}/doc/ja/ + ${INSTALL_DATA} ${DOC_FILESEN:S|^|${DOCSRCDIREN}/|} ${STAGEDIR}${DOCSDIR}/doc/ + + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${EXAMPLESDIR} + +.include Index: distinfo =================================================================== --- distinfo (revision 330064) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (ruby/rubysdl-1.3.1.tar.gz) = a4b4841f9259cd1a792e6407ca7ae83439aa39926606154a952ea5c663314891 -SIZE (ruby/rubysdl-1.3.1.tar.gz) = 264856 +SHA256 (ruby/rubysdl-2.1.3.tar.gz) = 77390eac2e7c99208622ab48377a6caaddb1f5f5efdc4bd96d05efacecd94bcd +SIZE (ruby/rubysdl-2.1.3.tar.gz) = 795424 Index: files/patch-rubysdl_rwops.c =================================================================== --- files/patch-rubysdl_rwops.c (revision 0) +++ files/patch-rubysdl_rwops.c (working copy) @@ -0,0 +1,12 @@ +--- ./rubysdl_rwops.c.orig 2012-04-07 17:50:01.000000000 +0200 ++++ ./rubysdl_rwops.c 2013-10-16 09:54:34.000000000 +0200 +@@ -70,6 +70,9 @@ + return 0; + } + ++#ifdef close ++#undef close ++#endif + /* WARNING: +obj+ is not marked when GC starts, + so you should use `volatile' when this function is used + and you should not take out this RWops pointer to ruby's world. Property changes on: files/patch-rubysdl_rwops.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: pkg-descr =================================================================== --- pkg-descr (revision 330064) +++ pkg-descr (working copy) @@ -1,6 +1,4 @@ Ruby/SDL is a Ruby extension library to use SDL library. Currently 3D features are unsupported. -SGE support will be enabled after SGE is ported. - -Author: Ippei Obayashi +WWW: http://www.kmc.gr.jp/~ohai/rubysdl.en.html \ No newline at end of file Index: pkg-plist =================================================================== --- pkg-plist (revision 330064) +++ pkg-plist (working copy) @@ -1,43 +1,5 @@ -%%RUBY_SITEARCHLIBDIR%%/sdl.so +%%RUBY_SITEARCHLIBDIR%%/sdl_ext.so %%RUBY_SITELIBDIR%%/rubysdl_aliases.rb +%%RUBY_SITELIBDIR%%/rubysdl_compatible_ver1.rb %%RUBY_SITELIBDIR%%/sdl.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/aadraw.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/alpha.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/alphadraw.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bfont.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cdrom.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/collision.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cursor.bmp -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cursor.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ellipses.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/event2.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/font.bmp -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/font.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/fpstimer.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/icon.bmp -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/joy2.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/kanji.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/movesp.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/playmod.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plaympeg.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/playwave.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/randrect.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.ttf -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sdlskk.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sgetest.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/stetris.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgl.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testsprite.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/transformblit.rb -%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS.en -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_const_list.txt -%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/NEWS.ja -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja -%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc_old.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc_old.rd -%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja -%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% +%%RUBY_SITELIBDIR%%/sdl1_compatible.rb --qMm9M+Fa2AknHoGS--