summaryrefslogtreecommitdiff
path: root/www/apache6/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache6/Makefile')
-rw-r--r--www/apache6/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 22d4ec13618..40687be9ab9 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2002/08/01 00:58:33 mycroft Exp $
+# $NetBSD: Makefile,v 1.56 2002/08/25 21:51:58 jlam Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -30,7 +30,7 @@ COMMENT= Apache HTTP (Web) server with IPv6 support
CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz}
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
CONFIGURE_ARGS+= --enable-module=most \
@@ -110,10 +110,10 @@ MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
.if (${OPSYS} == "SunOS")
LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib
-CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_DIR}/include/db2"
+CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
CONFIGURE_ENV+= LIBS="-ldbm -ldb2"
BUILDLINK_DEPENDS.db= db>=2.7.7
-.include "../../databases/db/buildlink.mk"
+.include "../../databases/db/buildlink2.mk"
.endif
BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
@@ -166,6 +166,7 @@ post-install:
${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
-.include "../../textproc/expat/buildlink.mk"
+.include "../../textproc/expat/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"