From 90fbe119af0e346f77e75ee5a4a938d07a5d414e Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 14 Dec 2000 15:25:20 +0000 Subject: [PATCH] a few BUILD_DEPENDS -> LIB_DEPENDS --- www/php3/Makefile | 17 ++++++++--------- www/php4/Makefile | 29 ++++++++++++++--------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/www/php3/Makefile b/www/php3/Makefile index c47f1408e3e..bb495b41c56 100644 --- a/www/php3/Makefile +++ b/www/php3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2000/12/14 14:04:09 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2000/12/14 15:25:20 brad Exp $ DISTNAME= php-3.0.18 PKGNAME= php3-3.0.18 @@ -31,26 +31,25 @@ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \ LIB_DEPENDS+= expat.1.::textproc/expat FLAVORS= imap mysql postgresql - -FLAVOR?= +FLAVOR?= .if ${FLAVOR:L:Mimap} CONFIGURE_ARGS+= --with-imap=${PREFIX} -BUILD_DEPENDS+= ${PREFIX}/lib/libc-client.a::mail/c-client +LIB_DEPENDS+= c-client.2::mail/c-client .else CONFIGURE_ARGS+= --without-imap .endif .if ${FLAVOR:L:Mmysql} CONFIGURE_ARGS+= --with-mysql -BUILD_DEPENDS+= ${PREFIX}/lib/mysql/libmysqlclient.a::databases/mysql +LIB_DEPENDS+= mysqlclient.6::databases/mysql .else CONFIGURE_ARGS+= --without-mysql .endif .if ${FLAVOR:L:Mpostgresql} CONFIGURE_ARGS+= --with-pgsql -BUILD_DEPENDS+= ${PREFIX}/pgsql/lib/libpq.a::databases/postgresql +LIB_DEPENDS+= pq.2::databases/postgresql .else CONFIGURE_ARGS+= --without-pgsql .endif @@ -61,9 +60,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/php3 ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/php3 ${INSTALL_DATA} ${WRKSRC}/php3.ini-dist ${PREFIX}/share/doc/php3 - sed 's,y0y0y0,${TRUEPREFIX},' \ + @sed 's,y0y0y0,${TRUEPREFIX},' \ <${FILESDIR}/php3-enable >${PREFIX}/sbin/php3-enable - chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php3-enable - chmod ${BINMODE} ${PREFIX}/sbin/php3-enable + @chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php3-enable + @chmod ${BINMODE} ${PREFIX}/sbin/php3-enable .include diff --git a/www/php4/Makefile b/www/php4/Makefile index 1d07977de56..b59767b36d2 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2000/11/28 15:44:31 jakob Exp $ +# $OpenBSD: Makefile,v 1.12 2000/12/14 15:25:20 brad Exp $ DISTNAME= php-4.0.3pl1 PKGNAME= php4-4.0.3pl1 @@ -46,18 +46,18 @@ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \ FLAVORS+= gdbm gettext ftp imap ldap mhash mm recode snmp FLAVORS+= gd no_x11 pdflib FLAVORS+= dbase filepro mysql mysql_bundled postgresql -FLAVOR?= +FLAVOR?= .if ${FLAVOR:L:Mgdbm} CONFIGURE_ARGS+= --with-gdbm -BUILD_DEPENDS+= ${PREFIX}/lib/libgdbm.a::databases/gdbm +LIB_DEPENDS+= gdbm.2::databases/gdbm .else CONFIGURE_ARGS+= --without-gdbm .endif .if ${FLAVOR:L:Mgettext} CONFIGURE_ARGS+= --with-gettext -BUILD_DEPENDS+= ${PREFIX}/lib/libintl.a::devel/gettext +LIB_DEPENDS+= intl.1::devel/gettext .else CONFIGURE_ARGS+= --without-gettext .endif @@ -70,28 +70,28 @@ CONFIGURE_ARGS+= --disable-ftp .if ${FLAVOR:L:Mimap} CONFIGURE_ARGS+= --with-imap=${PREFIX} -BUILD_DEPENDS+= ${PREFIX}/lib/libc-client.a::mail/c-client +LIB_DEPENDS+= c-client.2::mail/c-client .else CONFIGURE_ARGS+= --without-imap .endif .if ${FLAVOR:L:Mldap} CONFIGURE_ARGS+= --with-ldap=${PREFIX} -BUILD_DEPENDS+= ${PREFIX}/lib/libldap.a::databases/openldap +LIB_DEPENDS+= ldap.2::databases/openldap .else CONFIGURE_ARGS+= --without-ldap .endif .if ${FLAVOR:L:Mmhash} CONFIGURE_ARGS+= --with-mhash -BUILD_DEPENDS+= ${PREFIX}/lib/libmhash.a::security/mhash +LIB_DEPENDS+= mhash.2::security/mhash .else CONFIGURE_ARGS+= --without-mhash .endif .if ${FLAVOR:L:Mmm} CONFIGURE_ARGS+= --with-mm -BUILD_DEPENDS+= ${PREFIX}/lib/libmm.a::devel/mm +LIB_DEPENDS+= mm.11::devel/mm .else CONFIGURE_ARGS+= --without-mm .endif @@ -105,25 +105,24 @@ CONFIGURE_ARGS+= --without-recode .if ${FLAVOR:L:Msnmp} CONFIGURE_ARGS+= --with-snmp --enable-ucd-snmp-hack --with-openssl -BUILD_DEPENDS+= ${PREFIX}/lib/libsnmp.a::net/ucd-snmp +LIB_DEPENDS+= snmp.41::net/ucd-snmp .else CONFIGURE_ARGS+= --without-snmp --without-openssl .endif .if ${FLAVOR:L:Mgd} MAKE_FLAGS+= CFLAGS='${CFLAGS} -I${LOCALBASE}/include' +LIB_DEPENDS+= gd.18::graphics/gd .if ${FLAVOR:L:Mno_x11} CONFIGURE_ARGS+= --with-gd \ - --with-jpeg-dir=${PREFIX} -BUILD_DEPENDS+= ${PREFIX}/lib/libgd.a::graphics/gd + --with-jpeg-dir=${PREFIX} \ + --with-ttf .else USE_X11= yes CONFIGURE_ARGS+= --with-gd \ --with-jpeg-dir=${PREFIX} \ --with-xpm-dir=${X11BASE} \ --with-ttf -BUILD_DEPENDS+= ${PREFIX}/lib/libgd.a::graphics/gd \ - ${PREFIX}/lib/libttf.a::print/freetype .endif .else CONFIGURE_ARGS+= --without-gd @@ -150,7 +149,7 @@ CONFIGURE_ARGS+= --disable-filepro .if ${FLAVOR:L:Mmysql} CONFIGURE_ARGS+= --with-mysql=${PREFIX} -BUILD_DEPENDS+= ${PREFIX}/lib/mysql/libmysqlclient.a::databases/mysql +LIB_DEPENDS+= mysqlclient.6::databases/mysql .if ${FLAVOR:L:Mmysql_bundled} .BEGIN: @echo "Conflicting flavor: ${FLAVOR}" @@ -164,7 +163,7 @@ CONFIGURE_ARGS+= --without-mysql .if ${FLAVOR:L:Mpostgresql} CONFIGURE_ARGS+= --with-pgsql=${PREFIX}/pgsql -BUILD_DEPENDS+= ${PREFIX}/pgsql/lib/libpq.a::databases/postgresql +LIB_DEPENDS+= pq.2::databases/postgresql .else CONFIGURE_ARGS+= --without-pgsql .endif