From owner-svn-ports-all@FreeBSD.ORG Mon Feb 10 13:24:08 2014 Return-Path: Delivered-To: svn-ports-all@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 4C2AADCA; Mon, 10 Feb 2014 13:24:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 289451C76; Mon, 10 Feb 2014 13:24:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ADO87C024085; Mon, 10 Feb 2014 13:24:08 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ADO6HB024076; Mon, 10 Feb 2014 13:24:06 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201402101324.s1ADO6HB024076@svn.freebsd.org> From: Rusmir Dusko Date: Mon, 10 Feb 2014 13:24:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343629 - in head: . devel devel/ruby-sdl devel/ruby-sdl/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 13:24:08 -0000 Author: nemysis Date: Mon Feb 10 13:24:06 2014 New Revision: 343629 URL: http://svnweb.freebsd.org/changeset/ports/343629 QAT: https://qat.redports.org/buildarchive/r343629/ Log: - Update to 2.1.3 - Change master sites to RUBYFORGE - Take maintainership - Remove DEPRECATED, EXPIRATION_DATE - Add license (LGPL21) - Add dependencies for devel/sdl_sge, japanese/libskk and devel/sdlskk - Change CONFIGURE_ARGS - Change DOCS, EXAMPLES and add DOCS, EXAMPLES Options - Support STAGEDIR - Remove obsolete REINPLACE - Strip library - Fix the usage of 'ruby' to get rid of the implicit lang/ruby dependency - Add patch, fix build on FreeBSD - Change pkg-descr - Add WWW Added: head/devel/ruby-sdl/ - copied from r331253, head/devel/ruby-sdl/ head/devel/ruby-sdl/files/ head/devel/ruby-sdl/files/patch-rubysdl_rwops.c (contents, props changed) Deleted: head/devel/ruby-sdl/pkg-plist Modified: head/MOVED head/devel/Makefile head/devel/ruby-sdl/Makefile head/devel/ruby-sdl/distinfo (contents, props changed) head/devel/ruby-sdl/pkg-descr (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Mon Feb 10 13:17:56 2014 (r343628) +++ head/MOVED Mon Feb 10 13:24:06 2014 (r343629) @@ -5128,7 +5128,6 @@ japanese/gorua||2013-10-21|Has expired: x11-toolkits/ruby-gtk||2013-10-21|Has expired: Does not work with Ruby 1.9 astro/boinc-setiathome-enhanced|astro/boinc-setiathome-v7|2013-10-21|Removed: Project is switching, use astro/boinc-setiathome-v7 instead; broken on 10.0 multimedia/ffmpeg-devel|multimedia/ffmpeg|2013-10-21|Use multimedia/ffmpeg instead -devel/ruby-sdl||2013-10-22|Has expired: Does not work with Ruby 1.9 games/magicmaze||2013-10-22|Has expired: Does not work with Ruby 1.9 lang/ruby18|lang/ruby19|2013-10-22|Has expired: Please use lang/ruby19 www/rubygem-mongrel_cluster||2013-10-22|Has expired: Does not work with Ruby 1.9 Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Mon Feb 10 13:17:56 2014 (r343628) +++ head/devel/Makefile Mon Feb 10 13:24:06 2014 (r343629) @@ -4076,6 +4076,7 @@ SUBDIR += ruby-rbprof SUBDIR += ruby-robjectteam SUBDIR += ruby-rreadline + SUBDIR += ruby-sdl SUBDIR += ruby-setup.rb SUBDIR += ruby-statgrab SUBDIR += ruby-subversion Modified: head/devel/ruby-sdl/Makefile ============================================================================== --- head/devel/ruby-sdl/Makefile Tue Oct 22 10:54:10 2013 (r331253) +++ head/devel/ruby-sdl/Makefile Mon Feb 10 13:24:06 2014 (r343629) @@ -2,21 +2,21 @@ # $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 -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= nemysis@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 @@ -27,45 +27,49 @@ USE_RUBY_EXTCONF= yes 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 +PLIST_FILES= %%RUBY_SITEARCHLIBDIR%%/sdl_ext.so \ + %%RUBY_SITELIBDIR%%/rubysdl_aliases.rb \ + %%RUBY_SITELIBDIR%%/rubysdl_compatible_ver1.rb \ + %%RUBY_SITELIBDIR%%/sdl.rb \ + %%RUBY_SITELIBDIR%%/sdl1_compatible.rb -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} - -NO_STAGE= yes -.include - -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 - -post-patch: - ${RUBY} -i -pe '/require \x27mkmf\x27/ and $$_ += "dir_config(\x27x11\x27)\n"' \ - ${WRKSRC}/${RUBY_EXTCONF} - -post-install: doc-install - -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 +PORTDOCS= * +PORTEXAMPLES= * -.include +DOCSDIR= ${RUBY_MODDOCDIR} +EXAMPLESDIR= ${RUBY_MODEXAMPLESDIR} + +DOCSRCDIR1= ${WRKSRC} +DOC_FILES_WRKSRC_JA= NEWS.ja README.ja +DOC_FILES_WRKSRC_EN= NEWS.en README.en + +DOCSRCDIRJA= ${WRKSRC}/doc +DOCSDIRJA= ${RUBY_MODDOCDIR}/doc +DOC_FILESJA= *.rsd *.rb + +DOCSRCDIREN= ${WRKSRC}/doc-en +DOCSDIREN= ${RUBY_MODDOCDIR}/doc-en +DOC_FILESEN= *.rsd + +OPTIONS_DEFINE= DOCS EXAMPLES + +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 + + @${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 Modified: head/devel/ruby-sdl/distinfo ============================================================================== --- head/devel/ruby-sdl/distinfo Tue Oct 22 10:54:10 2013 (r331253) +++ head/devel/ruby-sdl/distinfo Mon Feb 10 13:24:06 2014 (r343629) @@ -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 Added: head/devel/ruby-sdl/files/patch-rubysdl_rwops.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ruby-sdl/files/patch-rubysdl_rwops.c Mon Feb 10 13:24:06 2014 (r343629) @@ -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. Modified: head/devel/ruby-sdl/pkg-descr ============================================================================== --- head/devel/ruby-sdl/pkg-descr Tue Oct 22 10:54:10 2013 (r331253) +++ head/devel/ruby-sdl/pkg-descr Mon Feb 10 13:24:06 2014 (r343629) @@ -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