From 8f60a38025c534e69985d394dd8c50d501fbe51d Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 5 Jan 2006 21:21:54 +0000
Subject: Use SUBST framework, patch files directly.

---
 www/ap-ssl/Makefile         | 29 +++++++++++++----------------
 www/ap-ssl/distinfo         |  4 ++--
 www/ap-ssl/patches/patch-ab |  6 +++---
 3 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'www/ap-ssl')

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 498edb9eac3..0b29777746c 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2005/12/29 06:22:21 jlam Exp $
+# $NetBSD: Makefile,v 1.96 2006/01/05 21:21:54 joerg Exp $
 
 DISTNAME=		mod_ssl-2.8.25-1.3.34
 PKGNAME=		ap-ssl-2.8.25
@@ -49,21 +49,18 @@ CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/apache/buildlink3.mk"
 
-post-extract:
-	cd ${WRKSRC}/pkg.contrib; ${MV} -f loadcacert.cgi loadcacert.cgi.in
-	cd ${WRKSRC}/pkg.sslsup; ${MV} -f mkcert.sh mkcert.sh.in
-
-post-build:
-	@${SED}	-e "s|^#!/.*|#!${PERL5}|g"				\
-		${WRKSRC}/pkg.contrib/loadcacert.cgi.in 		\
-		> ${WRKSRC}/pkg.contrib/loadcacert.cgi
-	@${SED} ${FILES_SUBST_SED}					\
-		${WRKSRC}/pkg.sslsup/mkcert.sh.in			\
-		> ${WRKSRC}/pkg.sslsup/mkcert.sh
+SUBST_CLASSES+=		paths perl
+SUBST_FILES.paths=	README.mkcert pkg.sslsup/mkcert.sh
+SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.perl=	pkg.contrib/loadcacert.cgi
+SUBST_SED.perl=		-e 's,^\#!/.*,\#!${PERL5},g'
+SUBST_STAGE.perl=	post-patch
 
-pre-install:
-	@${SED} ${FILES_SUBST_SED}					\
-		${FILESDIR}/README.mkcert > ${WRKDIR}/README.mkcert
+post-extract:
+	${CP} ${FILESDIR}/README.mkcert ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
@@ -84,7 +81,7 @@ post-install:
 	cd ${WRKSRC}/pkg.contrib; ${INSTALL_SCRIPT} *.sh *.cgi		\
 		${PREFIX}/share/mod_ssl
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_ssl
-	${INSTALL_DATA} ${WRKDIR}/README.mkcert ${PREFIX}/share/doc/mod_ssl
+	${INSTALL_DATA} ${WRKSRC}/README.mkcert ${PREFIX}/share/doc/mod_ssl
 
 	cd ${WRKSRC}/pkg.sslcfg; ${RM} -f server.*
 	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRL *.crl	\
diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo
index 8b1f0893739..91a2dc05068 100644
--- a/www/ap-ssl/distinfo
+++ b/www/ap-ssl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2005/10/19 20:33:44 bouyer Exp $
+$NetBSD: distinfo,v 1.31 2006/01/05 21:21:55 joerg Exp $
 
 SHA1 (mod_ssl-2.8.25-1.3.34.tar.gz) = 150f726539d74c0d2af02e482be78bbcdb811395
 RMD160 (mod_ssl-2.8.25-1.3.34.tar.gz) = 90a3913d30c7f4d194907463125c90101005837a
 Size (mod_ssl-2.8.25-1.3.34.tar.gz) = 820352 bytes
 SHA1 (patch-aa) = f2db042ff2e15ebfc9387b254467be78747cf947
-SHA1 (patch-ab) = 936bc956761559c51263cf7645d135abe40069cd
+SHA1 (patch-ab) = d6e4f5ef249506b9b4f003f84d78e2eb075dcd34
diff --git a/www/ap-ssl/patches/patch-ab b/www/ap-ssl/patches/patch-ab
index c4e20c36b04..397e941baef 100644
--- a/www/ap-ssl/patches/patch-ab
+++ b/www/ap-ssl/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2002/12/03 14:31:33 grant Exp $
+$NetBSD: patch-ab,v 1.5 2006/01/05 21:21:55 joerg Exp $
 
---- pkg.sslsup/mkcert.sh.in.orig	Sun Apr 16 19:21:24 2000
-+++ pkg.sslsup/mkcert.sh.in
+--- pkg.sslsup/mkcert.sh.orig	Sun Apr 16 19:21:24 2000
++++ pkg.sslsup/mkcert.sh
 @@ -1,39 +1,57 @@
 -#!/bin/sh
 +#!@SH@
-- 
cgit v1.2.3