diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index b44d6b247f4a..36e44fa40ad2 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -1,175 +1,177 @@ # Created by: Garrett Rooney PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ apr-util-${APU_VERSION}.tar.gz MAINTAINER= apache@FreeBSD.org COMMENT= Apache Portability Library LICENSE= APACHE20 +BUILD_DEPENDS+= automake>=1.16.1:devel/automake LIB_DEPENDS= libexpat.so:textproc/expat2 USES= iconv pathfix libtool cpe USE_LDCONFIG= yes GNU_CONFIGURE= yes APR_VERSION= 1.7.0 APU_VERSION= 1.6.1 CPE_VENDOR= apache CPE_PRODUCT= apr-util CPE_VERSION= ${APU_VERSION} OPTIONS_SUB= yes OPTIONS_GROUP= APU OPTIONS_DEFINE= IPV6 OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SSL NSS OPTIONS_DEFAULT= BDB GDBM SSL APU_DESC= Database support CRYPTO_DESC= Cryptography provider NDBM_DESC= NDBM support NSS_DESC= NSS crypto driver SSL_DESC= OpenSSL crypto driver # APR-Util Options BDB_USES= bdb:5+ GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm LDAP_USE= OPENLDAP=yes MYSQL_USES= mysql NSS_LIB_DEPENDS= libnss3.so:security/nss ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC PGSQL_USES= pgsql SQLITE_USES= sqlite SSL_USES= ssl APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION} WRKSRC= ${APR_WRKDIR} PATCH_WRKSRC= ${WRKDIR} PATHFIX_WRKSRC= ${WRKDIR} SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/} SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/} PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" \ SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \ --enable-threads \ --enable-posix-shm \ --with-devrandom APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} ########## APR Options IPV6_VARS= APR_CONF_ARGS+=--enable-ipv6 IPV6_VARS_OFF= APR_CONF_ARGS+=--disable-ipv6 ######### APR-Util Options # make sure 1st include is "${APR_WRKDIR}/include" # to avoid failures if previous apr_version.h is present APU_CPPFLAGS= -I${APR_WRKDIR}/include BDB_VARS= APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} BDB_VARS_OFF= APU_CONF_ARGS+=--without-berkeley-db GDBM_VARS= APU_CONF_ARGS+=--with-gdbm=${LOCALBASE} LDAP_VARS= APU_CONF_ARGS+="--with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap" MYSQL_VARS= APU_CONF_ARGS+=--with-mysql=${LOCALBASE} \ APU_CPPFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H" \ LIBS+=-L${LOCALBASE}/lib/mysql NDBM_VARS= APU_CONF_ARGS+=--with-ndbm=/usr NSS_VARS= APU_CONF_ARGS+=--with-nss=${LOCALBASE} \ APU_CPPFLAGS+=-I${LOCALBASE}/include/nss \ LDFLAGS+=-L${LOCALBASE}/lib/nss ODBC_VARS= APU_CONF_ARGS+=--with-odbc=${LOCALBASE} SSL_VARS= APU_CONF_ARGS+=--with-openssl=${OPENSSLBASE} \ APU_CPPFLAGS+=-I${OPENSSLINC} \ LDFLAGS+=-L${OPENSSLLIB} SSL_VARS_OFF= APU_CONF_ARGS+=--without-openssl PGSQL_VARS= APU_CONF_ARGS+=--with-pgsql=${LOCALBASE} \ APU_CONF_ENV+=ac_cv_path_PGSQL_CONFIG="" SQLITE_VARS= APU_CONF_ARGS+=--with-sqlite3=${LOCALBASE} SQLITE_VARS_OFF= APU_CONF_ARGS+=--without-sqlite3 .for db in GDBM NDBM LDAP ODBC MYSQL NSS PGSQL ${db}_VARS_OFF= APU_CONF_ARGS+=--without-${db:tl} .endfor APR_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" # include apu specific CPPFLAGS 1st! APU_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${APU_CPPFLAGS} ${CPPFLAGS}" .include .if ${ARCH} == powerpc || ${ARCH} == powerpcspe CONFIGURE_ENV+= ap_cv_atomic_builtins=no .endif .if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS} APU_CONF_ARGS+= --with-crypto .else APU_CONF_ARGS+= --without-crypto .endif .include post-extract: # cleanup files not used on this platform @${FIND} ${WRKDIR} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete post-patch: @${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \ ${APR_WRKDIR}/configure do-configure: @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" (cd ${APR_WRKDIR} && \ ${SETENV} ${APR_CONF_ENV} ./configure ${APR_CONF_ARGS} ${CONFIGURE_ARGS}) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" (cd ${APU_WRKDIR} && \ + autoreconf -f -i && \ ${SETENV} ${APU_CONF_ENV} ./configure ${APU_CONF_ARGS} ${CONFIGURE_ARGS}) do-build: @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" (cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS}) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" (cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS}) pre-install: # always create the modules directory @${MKDIR} ${STAGEDIR}${PREFIX}/lib/apr-util-1 ${ECHO} "keep me" > ${STAGEDIR}${PREFIX}/lib/apr-util-1/.keep.me do-install: @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" (cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MAKE_ARGS}) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" (cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MAKE_ARGS}) -${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} do-test: @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" -(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" -(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test) #regression-test: test rpfl: configure # maintainer only: strip PID from logs (better compare) ${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APR_WRKDIR}/config.log ${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APU_WRKDIR}/config.log .include diff --git a/devel/apr1/files/patch-bdb18 b/devel/apr1/files/patch-bdb18 new file mode 100644 index 000000000000..302dfca4d6ac --- /dev/null +++ b/devel/apr1/files/patch-bdb18 @@ -0,0 +1,107 @@ +diff --git apr-util-1.6.1/build/dbm.m4 apr-util-1.6.1/build/dbm.m4 +index 57bd131f..5cbee4b3 100644 +--- apr-util-1.6.1/build/dbm.m4 ++++ apr-util-1.6.1/build/dbm.m4 +@@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [ + changequote([,]) + unset $cache_id + AC_CHECK_HEADER([$bdb_header], [ +- if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then ++ if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6" -o "$1" = "18"; then + # We generate a separate cache variable for each prefix and libname + # we search under. That way, we avoid caching information that + # changes if the user runs `configure' with a different set of +@@ -432,7 +432,15 @@ AC_DEFUN([APU_CHECK_DB], [ + AC_MSG_ERROR(Berkeley db$db_major not found) + fi + ;; +- db[[456]]) ++ db18[[0-9]]) ++ db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'` ++ db_minor=`echo "$requested" | sed -e 's/db//' -e 's/..//'` ++ APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor") ++ if test "$apu_db_version" != "$db_major"; then ++ AC_MSG_ERROR(Berkeley db$db_major not found) ++ fi ++ ;; ++ db[[456]] | db18) + db_major=`echo "$requested" | sed -e 's/db//'` + # Start version search at version x.9 + db_minor=9 +@@ -455,17 +463,21 @@ AC_DEFUN([APU_CHECK_DB], [ + ]) + + dnl +-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1. ++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 18.X to 1. + dnl + AC_DEFUN([APU_CHECK_DB_ALL], [ + all_places=$1 + +- # Start version search at version 6.9 +- db_version=69 ++ # Start version search at version 18.9 ++ db_version=189 + while [[ $db_version -ge 40 ]] + do + db_major=`echo $db_version | sed -e 's/.$//'` +- db_minor=`echo $db_version | sed -e 's/.//'` ++ if test "$db_version" -ge "100" ; then ++ db_minor=`echo $db_version | sed -e 's/..//'` ++ else ++ db_minor=`echo $db_version | sed -e 's/.//'` ++ fi + APU_CHECK_DBXY("$all_places", "$db_major", "$db_minor") + if test "$apu_have_db" = "1"; then + break +@@ -511,7 +523,7 @@ AC_DEFUN([APU_CHECK_DBM], [ + apu_db_version=0 + + # Maximum supported version announced in help string. +- # Although we search for all versions up to 6.9, ++ # Although we search for all versions up to 18.9, + # we should only include existing versions in our + # help string. + dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" +@@ -531,7 +543,7 @@ AC_DEFUN([APU_CHECK_DBM], [ + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done +- db_max_version=60 ++ db_max_version=62 + db_min_version=60 + db_version="$db_min_version" + while [[ $db_version -le $db_max_version ]] +@@ -539,9 +551,17 @@ AC_DEFUN([APU_CHECK_DBM], [ + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done ++ db_max_version=181 ++ db_min_version=180 ++ db_version="$db_min_version" ++ while [[ $db_version -le $db_max_version ]] ++ do ++ dbm_list="$dbm_list, db$db_version" ++ db_version=`expr $db_version + 1` ++ done + + AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. +- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])], ++ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X,db18x} for some X=0,...,9])], + [ + if test "$withval" = "yes"; then + AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. +@@ -684,11 +704,11 @@ AC_DEFUN([APU_CHECK_DBM], [ + eval "apu_use_$requested=1" + apu_default_dbm=$requested + ;; +- db185 | db[[123456]]) ++ db185 | db[[123456]] | db18) + apu_use_db=1 + apu_default_dbm=$requested + ;; +- db[[456]][[0-9]]) ++ db[[456]][[0-9]] | db18[[0-9]]) + apu_use_db=1 + apu_default_dbm=`echo $requested | sed -e 's/.$//'` + ;;