diff options
| author | knu <knu@FreeBSD.org> | 2002-02-20 05:52:50 +0000 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2002-02-20 05:52:50 +0000 |
| commit | 1a2c0bc0e359366fd584e6fc137f13bce49746dc (patch) | |
| tree | 51104402f28003cfd28fcecee380a7abb2dcc253 | |
| parent | f5e709f5206d1190960560d16a608518266137d4 (diff) | |
| download | FreeBSD-ports-1a2c0bc0e359366fd584e6fc137f13bce49746dc.zip FreeBSD-ports-1a2c0bc0e359366fd584e6fc137f13bce49746dc.tar.gz | |
Include databases/ruby-bdb1.
Improve the extconf.rb detection routine in Makefile.
Bump PORTREVISION.
| -rw-r--r-- | lang/ruby16_static/Makefile | 11 | ||||
| -rw-r--r-- | lang/ruby_static/Makefile | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile index 866f882..7932ed5 100644 --- a/lang/ruby16_static/Makefile +++ b/lang/ruby16_static/Makefile @@ -7,6 +7,7 @@ PORTNAME= ruby_static PORTVERSION= ${RUBY_PORTVERSION} +PORTREVISION?= 1 CATEGORIES= lang ruby ipv6 MASTER_SITES= # none DISTFILES= # none @@ -20,8 +21,9 @@ USE_RUBY= yes USE_AUTOCONF= yes # Beware, because gdbm is under GPL, you must treat the whole binary -# as GPL says. +# as GPL says if you include gdbm in it. EXT_PORTS= archivers/ruby-zlib \ + databases/ruby-bdb1 \ devel/ruby-strscan _PORTSDIR= ${.CURDIR}/../.. _RUBY_PORTDIR= ${_PORTSDIR}/${RUBY_PORT} @@ -77,10 +79,13 @@ do-extract: ${MKDIR} ${WRKDIR} ${LN} -sf `cd ${_RUBY_PORTDIR} && ${MAKE} -V WRKSRC` ${WRKSRC} .for p in ${EXT_PORTS} + m="${p:T:S,^ruby-,,}"; \ wrksrc=$$(cd ${_PORTSDIR}/${p} && ${MAKE} -V WRKSRC) ; \ - extdir=$$(find -L $$wrksrc -name extconf.rb); \ + extdir=$$(${FIND} -L $$wrksrc -name extconf.rb | \ + ${XARGS} ${GREP} -l create_makefile | ${HEAD} -1 ); \ extdir=$${extdir%/extconf.rb}; \ - ${CP} -RPp $$extdir ${WRKSRC}/ext/ + ${CP} -RPp $$extdir ${WRKSRC}/ext/$$m; \ + ${TOUCH} ${WRKSRC}/ext/$$m/MANIFEST .endfor .if defined(STATIC) ${ECHO_CMD} "option nodynamic" > ${WRKSRC}/ext/Setup diff --git a/lang/ruby_static/Makefile b/lang/ruby_static/Makefile index 866f882..7932ed5 100644 --- a/lang/ruby_static/Makefile +++ b/lang/ruby_static/Makefile @@ -7,6 +7,7 @@ PORTNAME= ruby_static PORTVERSION= ${RUBY_PORTVERSION} +PORTREVISION?= 1 CATEGORIES= lang ruby ipv6 MASTER_SITES= # none DISTFILES= # none @@ -20,8 +21,9 @@ USE_RUBY= yes USE_AUTOCONF= yes # Beware, because gdbm is under GPL, you must treat the whole binary -# as GPL says. +# as GPL says if you include gdbm in it. EXT_PORTS= archivers/ruby-zlib \ + databases/ruby-bdb1 \ devel/ruby-strscan _PORTSDIR= ${.CURDIR}/../.. _RUBY_PORTDIR= ${_PORTSDIR}/${RUBY_PORT} @@ -77,10 +79,13 @@ do-extract: ${MKDIR} ${WRKDIR} ${LN} -sf `cd ${_RUBY_PORTDIR} && ${MAKE} -V WRKSRC` ${WRKSRC} .for p in ${EXT_PORTS} + m="${p:T:S,^ruby-,,}"; \ wrksrc=$$(cd ${_PORTSDIR}/${p} && ${MAKE} -V WRKSRC) ; \ - extdir=$$(find -L $$wrksrc -name extconf.rb); \ + extdir=$$(${FIND} -L $$wrksrc -name extconf.rb | \ + ${XARGS} ${GREP} -l create_makefile | ${HEAD} -1 ); \ extdir=$${extdir%/extconf.rb}; \ - ${CP} -RPp $$extdir ${WRKSRC}/ext/ + ${CP} -RPp $$extdir ${WRKSRC}/ext/$$m; \ + ${TOUCH} ${WRKSRC}/ext/$$m/MANIFEST .endfor .if defined(STATIC) ${ECHO_CMD} "option nodynamic" > ${WRKSRC}/ext/Setup |
