diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-07-02 17:54:36 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-07-02 17:54:36 +0000 |
| commit | c1681b867d752d14a2d3646771a43635ef1ceda4 (patch) | |
| tree | 578a9684b5c0cdcdb8c23e6deb3b0b2392d7c256 /www | |
| parent | 1a40643cd44b0a75ce24159914e906b912666d4c (diff) | |
| download | pkgsrc-c1681b867d752d14a2d3646771a43635ef1ceda4.tar.gz | |
Avoid hardcoding /usr/pkg in patch files.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 7 | ||||
| -rw-r--r-- | www/apache2/distinfo | 4 | ||||
| -rw-r--r-- | www/apache2/patches/patch-ad | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 0832b76db08..6f27c221894 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2003/05/29 01:06:00 itojun Exp $ +# $NetBSD: Makefile,v 1.26 2003/07/02 17:58:41 jmmv Exp $ PKGNAME= apache-${APACHE_VERSION} CATEGORIES= www @@ -114,6 +114,11 @@ AP_CONF_FILE_SED+= -e "s|/var/log/httpd/foo\.log|logs/foo.log/|g" AP_CONF_FILE_SED+= -e "s|^\(User[ ]\).*|\1${APACHE_USER}|g" AP_CONF_FILE_SED+= -e "s|^\(Group[ ]\).*|\1${APACHE_GROUP}|g" +pre-configure: + ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/config.layout \ + > ${WRKSRC}/config.layout.new + ${MV} ${WRKSRC}/config.layout.new ${WRKSRC}/config.layout + post-install: ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ diff --git a/www/apache2/distinfo b/www/apache2/distinfo index b8527656e69..445540e2d97 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.20 2003/05/29 01:02:29 itojun Exp $ +$NetBSD: distinfo,v 1.21 2003/07/02 17:58:42 jmmv Exp $ SHA1 (httpd-2.0.46.tar.gz) = c739c4c296054697e264f7d1ac19f9f1e2d47553 Size (httpd-2.0.46.tar.gz) = 6031023 bytes SHA1 (patch-aa) = 2b7a2c0db5abac66966eaea2efb8609843e8abf4 -SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1 +SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215 diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad index 19e255f87cb..7968541555e 100644 --- a/www/apache2/patches/patch-ad +++ b/www/apache2/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.5 2002/08/25 21:51:56 jlam Exp $ +$NetBSD: patch-ad,v 1.6 2003/07/02 17:58:43 jmmv Exp $ --- config.layout.orig Fri May 17 23:49:30 2002 +++ config.layout Wed Jun 19 07:39:33 2002 @@ -9,7 +9,7 @@ $NetBSD: patch-ad,v 1.5 2002/08/25 21:51:56 jlam Exp $ + +# NetBSD (pkgsrc) layout +<Layout NetBSD> -+ prefix: /usr/pkg ++ prefix: @PREFIX@ + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin |