Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Jul 2017 11:04:28 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r445645 - in head: . devel/apr1
Message-ID:  <201707131104.v6DB4SaR025384@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Thu Jul 13 11:04:28 2017
New Revision: 445645
URL: https://svnweb.freebsd.org/changeset/ports/445645

Log:
  devel/apr1: Fix SQLite option
  
   - Fix SQLITE configure args (typo)
   - Whitespace fixes
   - Fix typo in UPDATING entry
   - Add pkg-message with warning
  
  Reported by:	Stefan Esser

Added:
  head/devel/apr1/pkg-message   (contents, props changed)
Modified:
  head/UPDATING
  head/devel/apr1/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Jul 13 10:57:18 2017	(r445644)
+++ head/UPDATING	Thu Jul 13 11:04:28 2017	(r445645)
@@ -20,7 +20,7 @@ you update your ports collection, before attempting an
   such as Apache, Subversion, etc. Normally, you can obtain the list of
   dependent software by running the following command:
 
-  # pkg info -r libressl
+  # pkg info -r apr1
 
   Then you should rebuild all ports depending on APR(-util) to avoid
   dangling shared library dependencies. Poudriere and pkg handle this

Modified: head/devel/apr1/Makefile
==============================================================================
--- head/devel/apr1/Makefile	Thu Jul 13 10:57:18 2017	(r445644)
+++ head/devel/apr1/Makefile	Thu Jul 13 11:04:28 2017	(r445645)
@@ -83,7 +83,7 @@ DEVRANDOM_VARS_OFF=	APR_CONF_ARGS+=--without-devrandom
 # 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=	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 \
@@ -91,7 +91,6 @@ LDAP_VARS=	APU_CONF_ARGS+="--with-ldap-include=${LOCAL
 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 \
@@ -103,7 +102,7 @@ SSL_VARS=	APU_CONF_ARGS+=--with-openssl=${OPENSSLBASE}
 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_ENV+=--with-sqlite3=${LOCALBASE}
+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

Added: head/devel/apr1/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/apr1/pkg-message	Thu Jul 13 11:04:28 2017	(r445645)
@@ -0,0 +1,7 @@
+/!\ ================================================================== /!\
+
+The Apache Portable Runtime project removed support for FreeTDS with
+version 1.6. Users requiring MS-SQL connectivity must migrate
+configurations to use the added ODBC driver and FreeTDS' ODBC features.
+
+/!\ ================================================================== /!\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707131104.v6DB4SaR025384>