aboutsummaryrefslogtreecommitdiff
path: root/devel/apr1
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2017-07-13 11:04:28 +0000
committerBernard Spil <brnrd@FreeBSD.org>2017-07-13 11:04:28 +0000
commit046e097ca0eab076a086aa7f8c9c1090cf1d9679 (patch)
tree8f7ec0662a64fe43c1c426be0b698e7aaf594ec4 /devel/apr1
parentdd8110c89cdc5ba8950ba8f6060b89cef1c5132b (diff)
downloadports-046e097ca0eab076a086aa7f8c9c1090cf1d9679.tar.gz
ports-046e097ca0eab076a086aa7f8c9c1090cf1d9679.zip
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
Notes
Notes: svn path=/head/; revision=445645
Diffstat (limited to 'devel/apr1')
-rw-r--r--devel/apr1/Makefile5
-rw-r--r--devel/apr1/pkg-message7
2 files changed, 9 insertions, 3 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 73ff46735742..0faab1ed2a32 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -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=${LOCALBASE}/include \
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
diff --git a/devel/apr1/pkg-message b/devel/apr1/pkg-message
new file mode 100644
index 000000000000..88852a246a54
--- /dev/null
+++ b/devel/apr1/pkg-message
@@ -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.
+
+/!\ ================================================================== /!\