cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devel/apr1: Fix runtime issues of dependent port

Browse Source 
- iconv is in base in all supported FreeBSD versions
 - Fix build with MariaDB 10.2 [2]
 - Bump portrevision in dependencies

PR:		226705 [1], 226026 [2]
With hat:	apache
Approved by:	joneum (apache)
This commit is contained in:
Bernard Spil 2018-03-21 19:50:35 +00:00
parent df79c6de9f
commit 636881f4c2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=465232
35 changed files with 164 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/apib/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= apib
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= benchmarks www
MAINTAINER= danfe@FreeBSD.org

2
devel/anjuta/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= anjuta
PORTVERSION= 3.18.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

13
devel/apr1/Makefile
View File

@ -29,7 +29,7 @@ CPE_VERSION= ${APU_VERSION}
OPTIONS_SUB= yes
OPTIONS_GROUP= APU
OPTIONS_DEFINE= IPV6 DEVRANDOM
OPTIONS_DEFINE= IPV6
OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE
OPTIONS_RADIO= CRYPTO
OPTIONS_RADIO_CRYPTO= SSL NSS
@ -46,7 +46,7 @@ SSL_DESC= OpenSSL crypto driver
BDB_USES= bdb:5+
GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
LDAP_USE= OPENLDAP=yes
MYSQL_USE= MYSQL=yes
MYSQL_USES= mysql
NSS_LIB_DEPENDS= libnss3.so:security/nss
ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
PGSQL_USES= pgsql
@ -67,17 +67,15 @@ PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" \
APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \
--enable-threads \
--enable-posix-shm
--enable-posix-shm \
--with-devrandom
APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
--with-expat=${LOCALBASE} \
--with-iconv=${ICONV_PREFIX}
--with-expat=${LOCALBASE}
########## APR Options
IPV6_VARS= APR_CONF_ARGS+=--enable-ipv6
IPV6_VARS_OFF= APR_CONF_ARGS+=--disable-ipv6
DEVRANDOM_VARS= APR_CONF_ARGS+=--with-devrandom
DEVRANDOM_VARS_OFF= APR_CONF_ARGS+=--without-devrandom
######### APR-Util Options
# make sure 1st include is "${APR_WRKDIR}/include"
@ -116,7 +114,6 @@ APU_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${AP
.include <bsd.port.options.mk>
# crypto (apache24)
.if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS}
APU_CONF_ARGS+= --with-crypto
.else

126
devel/apr1/files/patch-PR61517 Normal file
View File

@ -0,0 +1,126 @@
diff -ur a/build/dbd.m4 b/build/dbd.m4
--- apr-util-1.6.1/build/dbd.m4.orig 2017-05-03 19:18:52.000000000 -0400
+++ apr-util-1.6.1/build/dbd.m4 2017-09-13 16:58:07.369546391 -0400
@@ -163,10 +163,15 @@
old_cppflags="$CPPFLAGS"
old_ldflags="$LDFLAGS"
+ my_library="mysqlclient"
+
AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
[
if test "$withval" = "yes"; then
AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
+ if test "x$MYSQL_CONFIG" = "x"; then
+ AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config])
+ fi
if test "x$MYSQL_CONFIG" != 'x'; then
mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
@@ -174,32 +179,40 @@
APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
APR_ADDTO(LIBS, [$mysql_LIBS])
+
+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
+ my_library="mariadb"
+ fi
fi
- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
- [apu_have_mysql=0; break],
- [#include <my_global.h>])
- if test "$apu_have_mysql" = "0"; then
- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
- [apu_have_mysql=0; break],
- [#include <mysql/my_global.h>])
+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
+ if test "$apr_have_mysql" = "0"; then
+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
fi
- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
+ if test "$apr_have_mysql" = "1"; then
+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
+ fi
+ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then
+ APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
fi
elif test "$withval" = "no"; then
:
else
AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
+ if test "x$MYSQL_CONFIG" = "x"; then
+ AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config],,[$withval/bin])
+ fi
if test "x$MYSQL_CONFIG" != 'x'; then
- mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
- mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
- mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
+ mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
+ mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
+ mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
+ my_library="mariadb"
+ fi
else
- mysql_CPPFLAGS="-I$withval/include"
- mysql_LDFLAGS="-L$withval/lib "
+ mysql_CPPFLAGS="-I$withval/include"
+ mysql_LDFLAGS="-L$withval/lib "
fi
APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
@@ -207,18 +220,15 @@
APR_ADDTO(LIBS, [$mysql_LIBS])
AC_MSG_NOTICE(checking for mysql in $withval)
- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
- [apu_have_mysql=0; break],
- [#include <my_global.h>])
-
- if test "$apu_have_mysql" != "1"; then
- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
- [apu_have_mysql=0; break],
- [#include <mysql/my_global.h>])
+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
+ if test "$apr_have_mysql" = "0"; then
+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
+ fi
+ if test "$apr_have_mysql" = "1"; then
+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
fi
- if test "$apu_have_mysql" != "0"; then
+ if test "$apu_have_mysql" = "1"; then
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
fi
fi
@@ -229,7 +239,7 @@
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
dnl we know the library is there.
if test "$apu_have_mysql" = "1"; then
- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS])
+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS])
fi
AC_SUBST(LDADD_dbd_mysql)
diff -ur a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c
--- apr-util-1.6.1/dbd/apr_dbd_mysql.c.orig 2017-05-03 19:18:52.000000000 -0400
+++ apr-util-1.6.1/dbd/apr_dbd_mysql.c 2017-09-13 19:15:20.894368809 -0400
@@ -1262,7 +1262,9 @@
static void dbd_mysql_init(apr_pool_t *pool)
{
+#if MYSQL_VERSION_ID < 100000
my_init();
+#endif
mysql_thread_init();
/* FIXME: this is a guess; find out what it really does */

2
devel/kdesvn-kde4/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= kdesvn
DISTVERSION= 1.7.0
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= devel kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/

2
devel/log4cxx/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= log4cxx
PORTVERSION= 0.10.0
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= devel
MASTER_SITES= APACHE/logging/${PORTNAME}/${PORTVERSION}
DISTNAME= apache-${PORTNAME}-${PORTVERSION}

2
devel/p5-subversion/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMEPREFIX= p5-
PORTREVISION= 0
PORTREVISION= 1
MAINTAINER= lev@FreeBSD.org
COMMENT= Perl bindings for Version control system

1
devel/py-subversion/Makefile
View File

@ -2,6 +2,7 @@
# $FreeBSD$
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PORTREVISION= 1
MAINTAINER= lev@FreeBSD.org
COMMENT= Python bindings for version control system

1
devel/ruby-subversion/Makefile
View File

@ -2,6 +2,7 @@
# $FreeBSD$
PKGNAMEPREFIX= ruby-
PORTREVISION= 1
MAINTAINER= lev@FreeBSD.org
COMMENT= Ruby bindings for version control system

2
devel/subversion/Makefile
View File

@ -1,7 +1,7 @@
# Created by: rooneg@electricjellyfish.net
# $FreeBSD$
PORTREVISION= 2
PORTREVISION= 3
MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system

2
devel/subversion18/Makefile.common
View File

@ -3,7 +3,7 @@
PORTNAME?= subversion
PORTVERSION= 1.8.19
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
DIST_SUBDIR= subversion18

1
editors/libreoffice/Makefile.common
View File

@ -2,6 +2,7 @@
PORTNAME= libreoffice
PORTVERSION= 6.0.2
PORTREVISION= 1
CATEGORIES+= editors
MAINTAINER= office@FreeBSD.org

2
editors/openoffice-4/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \

2
editors/openoffice-devel/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
PORTREVISION= 0
PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \

1
graphics/mapcache/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= mapcache
DISTVERSION= 1.4.0-94
PORTREVISION= 1
DISTVERSIONSUFFIX= -g732b3fd
CATEGORIES= graphics

1
java/java-subversion/Makefile
View File

@ -3,6 +3,7 @@
PKGNAMEPREFIX= java-
CATEGORIES= java
PORTREVISION= 1
MAINTAINER= lev@FreeBSD.org
COMMENT= Java bindings for Version control system

2
lang/neko/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= neko
DISTVERSIONPREFIX= v
DISTVERSION= 2-2-0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= lang
MAINTAINER= penzin.dev@gmail.com

2
security/orthrus/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= orthrus
PORTVERSION= 0.8.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/orthrus/ \
http://16degrees.com.au/${PORTNAME}/

1
security/subversion-gnome-keyring/Makefile
View File

@ -3,6 +3,7 @@
PKGNAMESUFFIX= -gnome-keyring
CATEGORIES= security gnome
PORTREVISION= 1
MAINTAINER= lev@FreeBSD.org
COMMENT= Gnome KWyring integration for Version control system

2
security/subversion-kwallet/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMESUFFIX= -kwallet
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security kde
MAINTAINER= lev@FreeBSD.org

2
sysutils/ftwin/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= ftwin
PORTVERSION= 0.8.8
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://files.etoilebsd.net/ftwin/ \
http://download.meroware.org/ftwin/

1
sysutils/ganglia-monitor-core/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= monitor-core
PORTVERSION= 3.7.1
PORTREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}
PKGNAMEPREFIX= ganglia-

2
www/apache22/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= apache22
PORTVERSION= 2.2.34
PORTREVISION?= 2
PORTREVISION?= 3
CATEGORIES= www ipv6
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}

1
www/apache24/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= apache24
PORTVERSION= 2.4.29
PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}

2
www/flood/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= flood
PORTVERSION= 0.20041105
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= www
MASTER_SITES= http://dist.bsdlab.org/
DISTNAME= httpd-test_20041105052051

2
www/htdigest/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= htdigest
PORTVERSION= 2.4.6
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}

1
www/httest/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= httest
PORTVERSION= 2.4.23
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/htt/htt${PORTVERSION:R}/${PORTNAME}-${PORTVERSION}

1
www/mod_asn/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= mod_asn
PORTVERSION= 1.7
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= LOCAL/kuriyama \
http://mirrorbrain.org/files/releases/

1
www/mod_dav_svn/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= mod_dav_svn
DISTNAME= subversion-${PORTVERSION}
PORTREVISION= 1
CATEGORIES= www

1
www/mod_md-devel/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= mod_md
PORTVERSION= 1.1.10
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= www
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}

2
www/mod_pagespeed/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= mod_pagespeed
PORTVERSION= 1.12.34.2
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= www devel
MASTER_SITES= LOCAL/mmokhi:boringssl,chromium_base,chromium_build,googleurl,gflags_arch,gflags_src,libjpeg_turbo_src,yasm_patched,libwebp,modpb64 \

1
www/mod_security/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= mod_security
PORTVERSION= 2.9.2
PORTREVISION= 1
CATEGORIES= www security
MASTER_SITES= http://www.modsecurity.org/tarball/${PORTVERSION}/
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}

2
www/rubygem-passenger/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= passenger
PORTVERSION= 5.1.12
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-

2
www/serf/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= serf
PORTVERSION= 1.3.9
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= APACHE/serf

1
www/tomcat-native/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= tomcat-native
PORTVERSION= 1.2.16
PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
DISTNAME= ${PORTNAME}-${PORTVERSION}-src