aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/apr/Makefile4
-rw-r--r--devel/apr/pkg-plist13
-rw-r--r--devel/apr0/Makefile4
-rw-r--r--devel/apr0/pkg-plist13
-rw-r--r--devel/apr1/Makefile4
-rw-r--r--devel/apr1/pkg-plist13
-rw-r--r--devel/apr2/Makefile4
-rw-r--r--devel/apr2/pkg-plist13
8 files changed, 36 insertions, 32 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 4052dc891057..e2df8dd12c4f 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -6,7 +6,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@@ -47,7 +47,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
-APR_CONF_ARGS=
+APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
--with-expat=${LOCALBASE} \
--with-iconv=${LOCALBASE}
diff --git a/devel/apr/pkg-plist b/devel/apr/pkg-plist
index a091c1c54751..f53299ea4bcb 100644
--- a/devel/apr/pkg-plist
+++ b/devel/apr/pkg-plist
@@ -1,10 +1,10 @@
bin/apr-1-config
bin/apu-1-config
-build-1/apr_rules.mk
-build-1/libtool
-build-1/make_exports.awk
-build-1/make_var_export.awk
-build-1/mkdir.sh
+%%DATADIR%%/build-1/apr_rules.mk
+%%DATADIR%%/build-1/libtool
+%%DATADIR%%/build-1/make_exports.awk
+%%DATADIR%%/build-1/make_var_export.awk
+%%DATADIR%%/build-1/mkdir.sh
include/apr-1/apr.h
include/apr-1/apr_allocator.h
include/apr-1/apr_anylock.h
@@ -109,5 +109,6 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
%%APU_EXTRAS%%@dirrm lib/apr-util-1
-@dirrm build-1
+@dirrm %%DATADIR%%/build-1
+@dirrm %%DATADIR%%
@dirrm include/apr-1
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 4052dc891057..e2df8dd12c4f 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -6,7 +6,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@@ -47,7 +47,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
-APR_CONF_ARGS=
+APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
--with-expat=${LOCALBASE} \
--with-iconv=${LOCALBASE}
diff --git a/devel/apr0/pkg-plist b/devel/apr0/pkg-plist
index a091c1c54751..f53299ea4bcb 100644
--- a/devel/apr0/pkg-plist
+++ b/devel/apr0/pkg-plist
@@ -1,10 +1,10 @@
bin/apr-1-config
bin/apu-1-config
-build-1/apr_rules.mk
-build-1/libtool
-build-1/make_exports.awk
-build-1/make_var_export.awk
-build-1/mkdir.sh
+%%DATADIR%%/build-1/apr_rules.mk
+%%DATADIR%%/build-1/libtool
+%%DATADIR%%/build-1/make_exports.awk
+%%DATADIR%%/build-1/make_var_export.awk
+%%DATADIR%%/build-1/mkdir.sh
include/apr-1/apr.h
include/apr-1/apr_allocator.h
include/apr-1/apr_anylock.h
@@ -109,5 +109,6 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
%%APU_EXTRAS%%@dirrm lib/apr-util-1
-@dirrm build-1
+@dirrm %%DATADIR%%/build-1
+@dirrm %%DATADIR%%
@dirrm include/apr-1
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 4052dc891057..e2df8dd12c4f 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -6,7 +6,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@@ -47,7 +47,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
-APR_CONF_ARGS=
+APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
--with-expat=${LOCALBASE} \
--with-iconv=${LOCALBASE}
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index a091c1c54751..f53299ea4bcb 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -1,10 +1,10 @@
bin/apr-1-config
bin/apu-1-config
-build-1/apr_rules.mk
-build-1/libtool
-build-1/make_exports.awk
-build-1/make_var_export.awk
-build-1/mkdir.sh
+%%DATADIR%%/build-1/apr_rules.mk
+%%DATADIR%%/build-1/libtool
+%%DATADIR%%/build-1/make_exports.awk
+%%DATADIR%%/build-1/make_var_export.awk
+%%DATADIR%%/build-1/mkdir.sh
include/apr-1/apr.h
include/apr-1/apr_allocator.h
include/apr-1/apr_anylock.h
@@ -109,5 +109,6 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
%%APU_EXTRAS%%@dirrm lib/apr-util-1
-@dirrm build-1
+@dirrm %%DATADIR%%/build-1
+@dirrm %%DATADIR%%
@dirrm include/apr-1
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 4052dc891057..e2df8dd12c4f 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@@ -47,7 +47,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION}
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
-APR_CONF_ARGS=
+APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
--with-expat=${LOCALBASE} \
--with-iconv=${LOCALBASE}
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
index a091c1c54751..f53299ea4bcb 100644
--- a/devel/apr2/pkg-plist
+++ b/devel/apr2/pkg-plist
@@ -1,10 +1,10 @@
bin/apr-1-config
bin/apu-1-config
-build-1/apr_rules.mk
-build-1/libtool
-build-1/make_exports.awk
-build-1/make_var_export.awk
-build-1/mkdir.sh
+%%DATADIR%%/build-1/apr_rules.mk
+%%DATADIR%%/build-1/libtool
+%%DATADIR%%/build-1/make_exports.awk
+%%DATADIR%%/build-1/make_var_export.awk
+%%DATADIR%%/build-1/mkdir.sh
include/apr-1/apr.h
include/apr-1/apr_allocator.h
include/apr-1/apr_anylock.h
@@ -109,5 +109,6 @@ lib/libaprutil-1.so.%%SHLIB_MAJOR%%
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
%%APU_EXTRAS%%@dirrm lib/apr-util-1
-@dirrm build-1
+@dirrm %%DATADIR%%/build-1
+@dirrm %%DATADIR%%
@dirrm include/apr-1