aboutsummaryrefslogtreecommitdiff
path: root/devel/apr1
diff options
context:
space:
mode:
authorPhilip M. Gollucci <pgollucci@FreeBSD.org>2008-08-22 18:49:56 +0000
committerPhilip M. Gollucci <pgollucci@FreeBSD.org>2008-08-22 18:49:56 +0000
commitd864928a29f4b9e10d2f6ac44dc93ba328f10785 (patch)
tree1c92028b216e347fedbceef5e899bad187b1ce68 /devel/apr1
parentf7afc34e75c26b16e7dcbd271ccfa2f2b9d43b51 (diff)
downloadports-d864928a29f4b9e10d2f6ac44dc93ba328f10785.tar.gz
ports-d864928a29f4b9e10d2f6ac44dc93ba328f10785.zip
Notes
Diffstat (limited to 'devel/apr1')
-rw-r--r--devel/apr1/Makefile49
-rw-r--r--devel/apr1/distinfo12
-rw-r--r--devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m426
3 files changed, 30 insertions, 57 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 5e477c1dbfb6..a6de0636ae07 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -15,18 +15,20 @@
# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP
PORTNAME= apr
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= ${APR_VERSION}.${APU_VERSION}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
-DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
+DISTFILES= apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
MAINTAINER= pgollucci@FreeBSD.org
-COMMENT= The Apache Group's Portability Library
+COMMENT= Apache Portability Library
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
+APR_VERSION= 1.3.3
+APU_VERSION= 1.3.4
+
USE_ICONV= yes
USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env
USE_PERL5_BUILD= yes
@@ -34,12 +36,13 @@ USE_GMAKE= yes
USE_PYTHON_BUILD= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}
+
+NO_WRKSUBDIR= yes
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
-APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
+APR_UTIL_CONF_ARGS= --with-apr=../apr-${APR_VERSION} \
--with-expat=${LOCALBASE} \
--with-iconv=${LOCALBASE}
@@ -87,6 +90,10 @@ PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
.endif
.endif
+.if defined(WITH_LDAP)
+APR_UTIL_WITH_LDAP= yes
+.endif
+
.if defined(APR_UTIL_WITH_LDAP)
PLIST_SUB+= LDAP=""
USE_OPENLDAP= yes
@@ -138,29 +145,21 @@ pre-extract:
post-patch:
${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
- ${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4
+ ${WRKDIR}/apr-${APR_VERSION}/build/apr_hints.m4
${FIND} ${WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-pre-configure:
-.for d in apr apr-util
-.for f in config.guess config.sub
- ${CP} -f ${TEMPLATES}/${f} ${WRKDIR}/${d}-${PORTVERSION}/build/${f}
- ${CHMOD} a+rx ${WRKDIR}/${d}-${PORTVERSION}/build/${f}
-.endfor
-.endfor
-
run-autotools::
- cd ${WRKDIR}/apr-${PORTVERSION} ; \
+ cd ${WRKDIR}/apr-${APR_VERSION} ; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
- cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+ cd ${WRKDIR}/apr-util-${APU_VERSION} ; \
${RM} -fr xml/expat
- cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
+ cd ${WRKDIR}/apr-util-${APU_VERSION} ; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
- --with-apr=../apr-${PORTVERSION}
- cd ${WRKDIR}/apr-${PORTVERSION}; \
+ --with-apr=../apr-${APR_VERSION}
+ cd ${WRKDIR}/apr-${APR_VERSION}; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
- cd ${WRKDIR}/apr-util-${PORTVERSION}; \
+ cd ${WRKDIR}/apr-util-${APU_VERSION}; \
${SETENV} ${CONFIGURE_ENV} ${SH} \
./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}
@@ -168,12 +167,12 @@ do-configure:
${DO_NADA}
do-build:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
- cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
+ cd ${WRKDIR}/apr-${APR_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
+ cd ${WRKDIR}/apr-util-${APU_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE}
do-install:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
- cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
+ cd ${WRKDIR}/apr-${APR_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
+ cd ${WRKDIR}/apr-util-${APU_VERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
debug_autoconf:
@echo "LIBTOOL: ${LIBTOOL_VERSION}"
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index 34a5a663a98a..52713d463fd4 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-1.3.2.tar.gz) = de95101173669bed731bede628a8cf69
-SHA256 (apr-1.3.2.tar.gz) = 1208e2caa48c5ac5d543de8642bde064731b45b490d104c59fc816aa88acafda
-SIZE (apr-1.3.2.tar.gz) = 1158861
-MD5 (apr-util-1.3.2.tar.gz) = ec615024cf2bbf30f67007ed8dcaf744
-SHA256 (apr-util-1.3.2.tar.gz) = 0c95069e5b4962d56ec4112f2aa85701b93a7374b76adcca348ca19c0db560f1
-SIZE (apr-util-1.3.2.tar.gz) = 778182
+MD5 (apr-1.3.3.tar.gz) = b254a9abecaedb05efde71daa7517480
+SHA256 (apr-1.3.3.tar.gz) = 390af2f94c38d9fa03cd6caac3549058bb3e2c4d9f7408b7b829ad75bd5cc273
+SIZE (apr-1.3.3.tar.gz) = 1160542
+MD5 (apr-util-1.3.4.tar.gz) = a10e2ca150ff07f484c724c36142211f
+SHA256 (apr-util-1.3.4.tar.gz) = 3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e
+SIZE (apr-util-1.3.4.tar.gz) = 778902
diff --git a/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4 b/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4
deleted file mode 100644
index d577cbbb58e0..000000000000
--- a/devel/apr1/files/patch-apr-util-1.3.2__build__apu-conf.m4
+++ /dev/null
@@ -1,26 +0,0 @@
---- apr-util-1.3.2/build/apu-conf.m4 2008/06/16 21:34:50 668323
-+++ apr-util-1.3.2/build/apu-conf.m4 2008/07/08 22:31:59 675009
-@@ -357,6 +357,12 @@
- ])
-
- if test "$apu_has_ldap_openldap" = "1"; then
-+ save_cppflags="$CPPFLAGS"
-+ save_ldflags="$LDFLAGS"
-+ save_libs="$LIBS"
-+
-+ CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
-+ LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
- AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
- APR_TRY_COMPILE_NO_WARNING([
- #ifdef HAVE_LBER_H
-@@ -374,6 +380,10 @@
- if test "$ac_cv_ldap_set_rebind_proc_style" = "three"; then
- AC_DEFINE(LDAP_SET_REBIND_PROC_THREE, 1, [Define if ldap_set_rebind_proc takes three arguments])
- fi
-+
-+ CPPFLAGS="$save_cppflags"
-+ LDFLAGS="$save_ldflags"
-+ LIBS="$save_libs"
- fi
-
- AC_SUBST(ldap_h)