Date: Sat, 4 May 2013 10:26:09 +0000 (UTC) From: TAKATSU Tomonari <tota@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317305 - in head/devel/ruby-langscan: . files Message-ID: <201305041026.r44AQ9Xi019359@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tota Date: Sat May 4 10:26:09 2013 New Revision: 317305 URL: http://svnweb.freebsd.org/changeset/ports/317305 Log: - Unbreak by using 1.2 CVS snapshot on 2007-01-15 - Trim Makefile header - Remove indefinite article from COMMENT - Adapt to new options framework - Replace tab with a single space after 'WWW:' in pkg-descr Added: head/devel/ruby-langscan/files/ head/devel/ruby-langscan/files/patch-acinclude.m4 (contents, props changed) head/devel/ruby-langscan/files/patch-configure.ac (contents, props changed) head/devel/ruby-langscan/files/patch-langscan__templace.c (contents, props changed) Modified: head/devel/ruby-langscan/Makefile head/devel/ruby-langscan/distinfo head/devel/ruby-langscan/pkg-descr head/devel/ruby-langscan/pkg-plist Modified: head/devel/ruby-langscan/Makefile ============================================================================== --- head/devel/ruby-langscan/Makefile Sat May 4 09:53:20 2013 (r317304) +++ head/devel/ruby-langscan/Makefile Sat May 4 10:26:09 2013 (r317305) @@ -2,37 +2,58 @@ # $FreeBSD$ PORTNAME= langscan -PORTVERSION= 1.2 +PORTVERSION= 1.2.20070115 CATEGORIES= devel ruby -MASTER_SITES= SF -MASTER_SITE_SUBDIR= gonzui/${PORTNAME}/${PORTVERSION} +MASTER_SITES= LOCAL +MASTER_SITE_SUBDIR= tota/${PORTNAME} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DIST_SUBDIR= ${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||} MAINTAINER= tota@FreeBSD.org -COMMENT= A program analyzer for source code search engine - -DEPRECATED= Does not work with Ruby 1.9 -EXPIRATION_DATE= 2013-05-02 +COMMENT= Program analyzer for source code search engine LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= flex>=2.5.31:${PORTSDIR}/textproc/flex \ - p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI +RUN_DEPENDS= p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI +BUILD_DEPENDS= flex>=2.5.31:${PORTSDIR}/textproc/flex -GNU_CONFIGURE= yes +USE_AUTOTOOLS= aclocal:env automake:env autoconf:env USE_RUBY= yes USE_PERL5_RUN= yes USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes +HAS_CONFIGURE= yes + +WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= ChangeLog NEWS README DOCSDIR= ${RUBY_MODDOCDIR} +OPTIONS_DEFINE= DOCS +OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options + +.include <bsd.port.pre.mk> + +CFLAGS+= -fPIC + +.if ${RUBY_VER} > 1.8 +CFLAGS+= -I${LOCALBASE}/include/ruby-${RUBY_VER} \ + -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} +PLIST_SUB+= RIPPER="@comment " +.else +PLIST_SUB+= RIPPER="" +.endif + +post-patch: + ${REINPLACE_CMD} "s|\(flex --version\)|${LOCALBASE}/bin/\1|" ${WRKSRC}/autogen.sh + ${FIND} ${WRKSRC} -name Makefile.am | ${XARGS} ${REINPLACE_CMD} "s|flex|${LOCALBASE}/bin/flex|" + +pre-configure: + cd ${CONFIGURE_WRKSRC}; ${SH} autogen.sh + post-install: ${CHMOD} ${BINMODE} ${RUBY_SITEARCHLIBDIR}/${PORTNAME}/ocaml/camlexer -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${INSTALL_WRKSRC}/${f} ${DOCSDIR}/ @@ -46,10 +67,4 @@ x-generate-plist: ${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d -depth | ${SORT} -r | ${SED} -e 's,${RUBY_SITELIBDIR},@dirrm %%RUBY_SITELIBDIR%%,' >> pkg-plist.new ${FIND} ${RUBY_SITEARCHLIBDIR}/${PORTNAME} -type d -depth | ${SORT} -r | ${SED} -e 's,${RUBY_SITEARCHLIBDIR},@dirrm %%RUBY_SITEARCHLIBDIR%%,' >> pkg-plist.new -.include <bsd.port.pre.mk> - -.if ${RUBY_VER} == 1.9 -BROKEN= does not build with ruby 1.9 -.endif - .include <bsd.port.post.mk> Modified: head/devel/ruby-langscan/distinfo ============================================================================== --- head/devel/ruby-langscan/distinfo Sat May 4 09:53:20 2013 (r317304) +++ head/devel/ruby-langscan/distinfo Sat May 4 10:26:09 2013 (r317305) @@ -1,2 +1,2 @@ -SHA256 (ruby/langscan-1.2.tar.gz) = 213125595629bf37a08b9c8f586cce5d1c40a7eebfc483c4a9eadf3f9eb703db -SIZE (ruby/langscan-1.2.tar.gz) = 574748 +SHA256 (ruby/langscan-1.2.20070115.tar.gz) = bddba4be5b12315f6eb936a5213cac3370d0e5ff8b578c6af00b1460dd7f6b70 +SIZE (ruby/langscan-1.2.20070115.tar.gz) = 144366 Added: head/devel/ruby-langscan/files/patch-acinclude.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ruby-langscan/files/patch-acinclude.m4 Sat May 4 10:26:09 2013 (r317305) @@ -0,0 +1,40 @@ +--- acinclude.m4.orig 2006-01-05 21:51:48.000000000 +0900 ++++ acinclude.m4 2013-05-04 17:57:54.000000000 +0900 +@@ -41,7 +41,7 @@ + AC_MSG_CHECKING([path to ruby library]) + if test "x$rubydir" = x; then + changequote(<<, >>) +- rubydir=`ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]'` ++ rubydir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]'` + changequote([, ]) + fi + AC_MSG_RESULT($rubydir) +@@ -57,20 +57,20 @@ + AC_MSG_CHECKING([path to ruby binary library]) + if test "x$rubyarchdir" = x; then + changequote(<<, >>) +- rubyarchdir=`ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]'` ++ rubyarchdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]'` + changequote([, ]) + fi + AC_MSG_RESULT($rubyarchdir) + AC_SUBST(rubyarchdir) + + changequote(<<, >>) +- RUBY_CC="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CC"]'`" +- RUBY_LDSHARED="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LDSHARED"]'`" +- RUBY_CFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CCDLFLAGS"] + " " + Config::MAKEFILE_CONFIG["CFLAGS"]'`" +- RUBY_DLEXT="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLEXT"]'`" +- RUBY_DLDFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLDFLAGS"]'`" +- RUBY_LIBS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBS"]'`" +- RUBY_HDRHDIR="`ruby -rmkmf -e 'puts Config::CONFIG["archdir"]'`" ++ RUBY_CC="`ruby -rrbconfig -e 'puts RbConfig::MAKEFILE_CONFIG["CC"]'`" ++ RUBY_LDSHARED="`ruby -rrbconfig -e 'puts RbConfig::MAKEFILE_CONFIG["LDSHARED"]'`" ++ RUBY_CFLAGS="`ruby -rrbconfig -e 'puts RbConfig::MAKEFILE_CONFIG["CCDLFLAGS"] + " " + RbConfig::MAKEFILE_CONFIG["CFLAGS"]'` -I\$(CFLAGS)" ++ RUBY_DLEXT="`ruby -rrbconfig -e 'puts RbConfig::MAKEFILE_CONFIG["DLEXT"]'`" ++ RUBY_DLDFLAGS="`ruby -rrbconfig -e 'puts RbConfig::MAKEFILE_CONFIG["DLDFLAGS"]'`" ++ RUBY_LIBS="`ruby -rrbconfig -e 'puts RbConfig::MAKEFILE_CONFIG["LIBS"]'`" ++ RUBY_HDRHDIR="`ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]'`" + RUBY_CPPFLAGS='-I. -I$(RUBY_HDRHDIR)' + changequote([, ]) + Added: head/devel/ruby-langscan/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ruby-langscan/files/patch-configure.ac Sat May 4 10:26:09 2013 (r317305) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2005-10-31 00:53:28.000000000 +0900 ++++ configure.ac 2013-05-04 17:44:08.000000000 +0900 +@@ -1,5 +1,6 @@ +-AC_INIT(langscan.rb) +-AM_INIT_AUTOMAKE(langscan, 1.2) ++AC_INIT(LangScan, 1.2) ++AC_CONFIG_SRCDIR(langscan.rb) ++AM_INIT_AUTOMAKE + + LANGSCAN_URI="http://gonzui.sourceforge.net/langscan/" + AC_SUBST(LANGSCAN_URI) Added: head/devel/ruby-langscan/files/patch-langscan__templace.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ruby-langscan/files/patch-langscan__templace.c Sat May 4 10:26:09 2013 (r317305) @@ -0,0 +1,15 @@ +--- langscan/_template.c.orig 2006-09-19 00:20:44.000000000 +0900 ++++ langscan/_template.c 2013-05-03 21:25:11.000000000 +0900 +@@ -11,7 +11,11 @@ + */ + + +-#include <ruby.h> ++#ifdef HAVE_RUBY_ST_H ++# include "ruby/ruby.h" ++#else ++# include "ruby.h" ++#endif + #include "langname.h" + + static VALUE token_symbol_list[ Modified: head/devel/ruby-langscan/pkg-descr ============================================================================== --- head/devel/ruby-langscan/pkg-descr Sat May 4 09:53:20 2013 (r317304) +++ head/devel/ruby-langscan/pkg-descr Sat May 4 10:26:09 2013 (r317305) @@ -19,4 +19,4 @@ Main Characteristics: * Io * Shell Script * Java * Plain Text -WWW: http://gonzui.sourceforge.net/langscan/ +WWW: http://gonzui.sourceforge.net/langscan/ Modified: head/devel/ruby-langscan/pkg-plist ============================================================================== --- head/devel/ruby-langscan/pkg-plist Sat May 4 09:53:20 2013 (r317304) +++ head/devel/ruby-langscan/pkg-plist Sat May 4 10:26:09 2013 (r317305) @@ -9,7 +9,7 @@ %%RUBY_SITEARCHLIBDIR%%/langscan/pairmatcher/pairmatcher.so %%RUBY_SITEARCHLIBDIR%%/langscan/php/php.so %%RUBY_SITEARCHLIBDIR%%/langscan/python/python.so -%%RUBY_SITEARCHLIBDIR%%/langscan/ruby/compat/ripper.so +%%RIPPER%%%%RUBY_SITEARCHLIBDIR%%/langscan/ruby/compat/ripper.so %%RUBY_SITEARCHLIBDIR%%/langscan/scheme/scheme.so %%RUBY_SITEARCHLIBDIR%%/langscan/sh/sh.so %%RUBY_SITELIBDIR%%/langscan/_common.rb @@ -36,23 +36,23 @@ %%RUBY_SITELIBDIR%%/langscan/python.rb %%RUBY_SITELIBDIR%%/langscan/rpmspec.rb %%RUBY_SITELIBDIR%%/langscan/ruby.rb -%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper.rb -%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/core.rb -%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/filter.rb -%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/lexer.rb -%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/sexp.rb +%%RIPPER%%%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper.rb +%%RIPPER%%%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/core.rb +%%RIPPER%%%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/filter.rb +%%RIPPER%%%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/lexer.rb +%%RIPPER%%%%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper/sexp.rb %%RUBY_SITELIBDIR%%/langscan/scheme.rb %%RUBY_SITELIBDIR%%/langscan/sh.rb %%RUBY_SITELIBDIR%%/langscan/text.rb -@dirrm %%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper -@dirrm %%RUBY_SITELIBDIR%%/langscan/ruby/compat -@dirrm %%RUBY_SITELIBDIR%%/langscan/ruby +%%RIPPER%%@dirrm %%RUBY_SITELIBDIR%%/langscan/ruby/compat/ripper +%%RIPPER%%@dirrm %%RUBY_SITELIBDIR%%/langscan/ruby/compat +%%RIPPER%%@dirrm %%RUBY_SITELIBDIR%%/langscan/ruby @dirrm %%RUBY_SITELIBDIR%%/langscan/perl @dirrm %%RUBY_SITELIBDIR%%/langscan @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/sh @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/scheme -@dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/ruby/compat -@dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/ruby +%%RIPPER%%@dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/ruby/compat +%%RIPPER%%@dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/ruby @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/python @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/php @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/pairmatcher
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305041026.r44AQ9Xi019359>