diff options
| -rw-r--r-- | www/ap-python/Makefile | 7 | ||||
| -rw-r--r-- | www/ap-ruby/Makefile | 18 |
2 files changed, 12 insertions, 13 deletions
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index 5f5f7037711..7ea87cc0e01 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:00 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/10/25 12:59:09 wiz Exp $ # DISTNAME= mod_python-2.7.6 @@ -11,10 +11,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.modpython.org/ COMMENT= Python interpretter embedded into Apache -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache - PLIST_SRC= ${WRKDIR}/.PLIST_SRC +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN} MAKE_ENV+= PYTHONBIN=${PYTHONBIN} @@ -33,5 +32,5 @@ post-install: -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} ) .include "../../lang/python/extension.mk" -.include "../../www/apache/buildlink.mk" +.include "../../www/apache/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile index e00362c4766..9a8a1f0ed81 100644 --- a/www/ap-ruby/Makefile +++ b/www/ap-ruby/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.9 2002/03/20 15:09:40 taca Exp $ -# $FreeBSD: ports/www/mod_ruby/Makefile,v 1.10 2000/12/31 10:14:53 knu Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/25 12:58:27 wiz Exp $ +# DISTNAME= mod_ruby-${VERSION} PKGNAME= ap-${RUBY_PKGNAMEPREFIX}${VERSION} @@ -10,19 +10,17 @@ MAINTAINER= taca@netbsd.org HOMEPAGE= http://www.modruby.net/ COMMENT= Apache module that embeds Ruby interpreter within -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache -DEPENDS+= ${RUBY_PKGNAMEPREFIX}eruby>=0.9:../../textproc/ruby-eruby - +USE_BUILDLINK2= YES DIST_SUBDIR= ruby -USE_RUBY= yes +USE_RUBY= YES RUBY_REQD= 1.6 VERSION= 0.9.7 HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./configure.rb CONFIGURE_ARGS= --with-apxs="${APXS}" \ - --with-eruby-includes="${LOCALBASE}/include" \ - --with-eruby-libraries="${LOCALBASE}/lib" + --with-eruby-includes="${BUILDLINK_PREFIX.ruby-eruby}/include" \ + --with-eruby-libraries="${BUILDLINK_PREFIX.ruby-eruby}/lib" INSTALL_TARGET= site-install CONF_FILES= ${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf \ @@ -45,7 +43,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mod_ruby .endfor -.include "../../www/apache/buildlink.mk" .include "../../lang/ruby-base/Makefile.common" +.include "../../lang/ruby-base/buildlink2.mk" +.include "../../textproc/ruby-eruby/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" |