From 4bfcc34161358d51d868f816c923eb93f927a412 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 21:50:52 +0000
Subject: Merge packages from the buildlink2 branch back into the main trunk
 that have been converted to USE_BUILDLINK2.

---
 www/ap-ssl/Makefile | 19 +++++++++++++------
 www/ap-ssl/distinfo |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'www/ap-ssl')

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index c450b9623b6..72c58bd7a06 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2002/08/01 01:03:17 mycroft Exp $
+# $NetBSD: Makefile,v 1.59 2002/08/25 21:51:52 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.10-1.3.26
 PKGNAME=		ap-ssl-2.8.10
@@ -14,13 +14,19 @@ COMMENT=		SSL/TLS protocols module for Apache
 
 CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
 
-DEPENDS+=		apache-1.3.26nb4:../../www/apache
+BUILDLINK_DEPENDS.apache=	apache-1.3.26nb4
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+APACHE_MODULE=		YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${_USE_RPATH} == "yes"
 MAKE_ENV+=		SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib"
+.endif
 
 PKG_SYSCONFSUBDIR?=	httpd
 
@@ -93,7 +99,8 @@ post-install:
 	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.PRM *.prm	\
 		${EGDIR}/ssl.prm
 
-.include "../../security/openssl/buildlink.mk"
-.include "../../www/apache/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../www/apache/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo
index d74201615a6..fc6dc7e21cf 100644
--- a/www/ap-ssl/distinfo
+++ b/www/ap-ssl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/06/24 16:26:50 taca Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 21:51:52 jlam Exp $
 
 SHA1 (mod_ssl-2.8.10-1.3.26.tar.gz) = 6af4bbd91f2323c95f8d3ca1c461edc17fc1d13e
 Size (mod_ssl-2.8.10-1.3.26.tar.gz) = 753241 bytes
-- 
cgit v1.2.3