diff options
| -rw-r--r-- | lang/ruby16_static/Makefile | 20 | ||||
| -rw-r--r-- | lang/ruby_static/Makefile | 20 |
2 files changed, 36 insertions, 4 deletions
diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile index 7932ed5e6c15..f4cdcba1620a 100644 --- a/lang/ruby16_static/Makefile +++ b/lang/ruby16_static/Makefile @@ -18,8 +18,6 @@ BUILD_DEPENDS= ${NONEXISTENT}:${.CURDIR}/../../${RUBY_PORT}:patch USE_RUBY= yes -USE_AUTOCONF= yes - # Beware, because gdbm is under GPL, you must treat the whole binary # as GPL says if you include gdbm in it. EXT_PORTS= archivers/ruby-zlib \ @@ -36,6 +34,19 @@ EXT_PORTS+= devel/ruby-fnmatch BUILD_DEPENDS+= ${NONEXISTENT}:${_PORTSDIR}/${p}:patch .endfor +.if defined(RUBY_VER) +.if ${RUBY_VER} > 1.6 +NEWAUTOCONF= yes +.endif +.endif + +.if defined(NEWAUTOCONF) +BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf +GNU_CONFIGURE= yes +.else +USE_AUTOCONF= yes +.endif + WRKSRC= ${RUBY_WRKSRC} DESCR= ${_RUBY_PORTDIR}/pkg-descr @@ -95,6 +106,11 @@ do-extract: (cd ${WRKSRC}/ext && \ for x in *; do [ -d $$x ] && echo $$x >> Setup; done) +.if defined(NEWAUTOCONF) +pre-configure: + cd ${WRKSRC}; autoconf +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${RUBY_NAME} ${RUBY_WITH_SUFFIX}_s .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} diff --git a/lang/ruby_static/Makefile b/lang/ruby_static/Makefile index 7932ed5e6c15..f4cdcba1620a 100644 --- a/lang/ruby_static/Makefile +++ b/lang/ruby_static/Makefile @@ -18,8 +18,6 @@ BUILD_DEPENDS= ${NONEXISTENT}:${.CURDIR}/../../${RUBY_PORT}:patch USE_RUBY= yes -USE_AUTOCONF= yes - # Beware, because gdbm is under GPL, you must treat the whole binary # as GPL says if you include gdbm in it. EXT_PORTS= archivers/ruby-zlib \ @@ -36,6 +34,19 @@ EXT_PORTS+= devel/ruby-fnmatch BUILD_DEPENDS+= ${NONEXISTENT}:${_PORTSDIR}/${p}:patch .endfor +.if defined(RUBY_VER) +.if ${RUBY_VER} > 1.6 +NEWAUTOCONF= yes +.endif +.endif + +.if defined(NEWAUTOCONF) +BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf +GNU_CONFIGURE= yes +.else +USE_AUTOCONF= yes +.endif + WRKSRC= ${RUBY_WRKSRC} DESCR= ${_RUBY_PORTDIR}/pkg-descr @@ -95,6 +106,11 @@ do-extract: (cd ${WRKSRC}/ext && \ for x in *; do [ -d $$x ] && echo $$x >> Setup; done) +.if defined(NEWAUTOCONF) +pre-configure: + cd ${WRKSRC}; autoconf +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${RUBY_NAME} ${RUBY_WITH_SUFFIX}_s .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} |