diff options
| author | jmmv <jmmv> | 2003-06-06 10:49:59 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2003-06-06 10:49:59 +0000 |
| commit | a0ff7abbba8357c7af793821ebc7b37f4ebc0de2 (patch) | |
| tree | 1a0456e6e6fc88c4e646b60d0ffbe362ba08dbbf /devel | |
| parent | 935db786ac7ddddb3ecd02e074028d2ce83b0c28 (diff) | |
| download | pkgsrc-a0ff7abbba8357c7af793821ebc7b37f4ebc0de2.tar.gz | |
Avoid hardcoding /usr/pkg in the configuration layouts (using the value from
the ${PREFIX} variable).
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apr/Makefile | 9 | ||||
| -rw-r--r-- | devel/apr/distinfo | 6 | ||||
| -rw-r--r-- | devel/apr/patches/patch-ap | 4 | ||||
| -rw-r--r-- | devel/apr/patches/patch-aq | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 570adf5832f..4a3ce4fd1a3 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/05/30 06:51:29 epg Exp $ +# $NetBSD: Makefile,v 1.4 2003/06/06 10:49:59 jmmv Exp $ PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} CATEGORIES= devel @@ -17,6 +17,13 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/apr/libtool WRKSRC= ${WRKDIR}/${DISTNAME}/srclib BUILD_DIRS= ${WRKSRC}/apr ${WRKSRC}/apr-util +pre-configure: +.for f in apr/config.layout apr-util/config.layout + ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/$f > ${WRKSRC}/$f.new + ${MV} ${WRKSRC}/$f.new ${WRKSRC}/$f +.endfor +.undef f + do-configure: @cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \ --prefix=${PREFIX} \ diff --git a/devel/apr/distinfo b/devel/apr/distinfo index cbde0420e04..bd3321b417c 100644 --- a/devel/apr/distinfo +++ b/devel/apr/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2003/05/30 10:14:21 epg Exp $ +$NetBSD: distinfo,v 1.4 2003/06/06 10:49:59 jmmv Exp $ SHA1 (httpd-2.0.46.tar.gz) = c739c4c296054697e264f7d1ac19f9f1e2d47553 Size (httpd-2.0.46.tar.gz) = 6031023 bytes @@ -6,5 +6,5 @@ SHA1 (patch-aa) = 17e79d6c54c855c4210f68e5facca1002d2512fa SHA1 (patch-ab) = bb9a9f0fbf5d48748f2a0826509a19b915d2bc72 SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056 SHA1 (patch-ao) = 25d44b0028772535da908895444d2bfe56f44120 -SHA1 (patch-ap) = 41c36538dcd6d84f3e26ee02e9f1953e715d2c80 -SHA1 (patch-aq) = 94e2650291d6b5d832cb446bf41e31629f2be723 +SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756 +SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3 diff --git a/devel/apr/patches/patch-ap b/devel/apr/patches/patch-ap index 5fefe643de8..fe0d7ee9eb7 100644 --- a/devel/apr/patches/patch-ap +++ b/devel/apr/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ +$NetBSD: patch-ap,v 1.2 2003/06/06 10:50:00 jmmv Exp $ --- apr-util/config.layout.orig Thu Apr 3 17:15:08 2003 +++ apr-util/config.layout Thu Apr 3 17:14:15 2003 @@ -9,7 +9,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +# NetBSD (pkgsrc) layout +<Layout NetBSD> -+ prefix: /usr/pkg ++ prefix: @PREFIX@ + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin diff --git a/devel/apr/patches/patch-aq b/devel/apr/patches/patch-aq index 857bebb666e..4fcedf3f764 100644 --- a/devel/apr/patches/patch-aq +++ b/devel/apr/patches/patch-aq @@ -1,4 +1,4 @@ -$NetBSD: patch-aq,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ +$NetBSD: patch-aq,v 1.2 2003/06/06 10:50:00 jmmv Exp $ --- apr/config.layout.orig Thu Apr 3 17:14:54 2003 +++ apr/config.layout Thu Apr 3 17:14:01 2003 @@ -9,7 +9,7 @@ $NetBSD: patch-aq,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +# NetBSD (pkgsrc) layout +<Layout NetBSD> -+ prefix: /usr/pkg ++ prefix: @PREFIX@ + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin |