Date: Mon, 30 Mar 2009 17:27:20 +0700 (NOVST) From: Alexey Dokuchaev <danfe@regency.nsu.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/133198: [bsd.database.mk] markup, consistency, typo fixes Message-ID: <200903301027.n2UARKwi058529@regency.nsu.ru> Resent-Message-ID: <200903301030.n2UAU16T000285@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133198
>Category: ports
>Synopsis: [bsd.database.mk] markup, consistency, typo fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 30 10:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alexey Dokuchaev
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
>Description:
bsd.database.mk in its current worm lacks proper formatting of the
knobs, has dots (periods) are the end of some IGNORE statements, and
there are room for textual improvements. I've fixed some typos, EOL
spaces, and expanded contractions (doesn't -> does not) along the way.
Please consider, thanks.
>How-To-Repeat:
>Fix:
Index: bsd.database.mk
===================================================================
RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/Mk/bsd.database.mk,v
retrieving revision 1.34
diff -u -r1.34 bsd.database.mk
--- bsd.database.mk 4 Mar 2009 15:54:29 -0000 1.34
+++ bsd.database.mk 30 Mar 2009 08:20:38 -0000
@@ -10,24 +10,26 @@
Database_Include_MAINTAINER= ports@FreeBSD.org
# This file contains some routines to interact with different databases, such
-# as mysql, postgresql and berkley DB. For including this file define macro
-# USE_[DATABASE], for example USE_MYSQL. Defining macro like USE_[DATABASE]_VER
-# or WANT_[DATABSE]_VER will include this file too.
+# as MySQL, PostgreSQL, and Berkley DB. To include this file, define macro
+# USE_[DATABASE], for example USE_MYSQL. Defining macro like
+# USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well.
#
##
-# USE_MYSQL - Add MySQL (client/server/embedded) dependency. (default: client)
+# USE_MYSQL - Add MySQL (client/server/embedded) dependency (default:
+# client).
# If no version is given (by the maintainer via the port or
# by the user via defined variable), try to find the
# currently installed version. Fall back to default if
-# necessary (MySQL5.0 = 50).
+# necessary (MySQL-5.0 = 50).
# DEFAULT_MYSQL_VER
-# - MySQL default version. Can be overriden within a port.
+# - MySQL default version. Can be overridden within a port.
# Default: 50.
# WANT_MYSQL_VER
-# - Maintainer can set an arbitrary version of MySQL by using it.
+# - Maintainer can set an arbitrary version of MySQL to always
+# build this port with (overrides WITH_MYSQL_VER).
# IGNORE_WITH_MYSQL
-# - This variable can be defined if the ports doesn't support
-# one or more version of MySQL.
+# - This variable can be defined if the ports does not support
+# one or more versions of MySQL.
# WITH_MYSQL_VER
# - User defined variable to set MySQL version.
# MYSQL_VER
@@ -39,13 +41,13 @@
# currently installed version. Fall back to default if
# necessary (PostgreSQL-8.2 = 82).
# DEFAULT_PGSQL_VER
-# - PostgreSQL default version. Can be overridden within a port.
-# Default: 82.
+# - PostgreSQL default version. Can be overridden within a
+# port. Default: 82.
# WANT_PGSQL_VER
-# - Maintainer can set an arbitrary version of PostgreSQL by
-# using it.
+# - Maintainer can set an arbitrary version of PostgreSQL to
+# always build this port with (overrides WITH_PGSQL_VER).
# IGNORE_WITH_PGSQL
-# - This variable can be defined if the ports doesn't support
+# - This variable can be defined if the ports does not support
# one or more versions of PostgreSQL.
# WITH_PGSQL_VER
# - User defined variable to set PostgreSQL version.
@@ -58,41 +60,48 @@
# currently installed version. Fall back to default if
# necessary (db41+).
# INVALID_BDB_VER
-# - This variable can be defined when the port doesn't
+# - This variable can be defined when the port does not
# support one or more versions of Berkeley DB.
-# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always
+# WANT_BDB_VER
+# - Maintainer can set a version of Berkeley DB to always
# build this port with (overrides WITH_BDB_VER).
-# WITH_BDB_VER - User defined global variable to set Berkeley DB version
+# WITH_BDB_VER
+# - User defined global variable to set Berkeley DB version.
# <UNIQUENAME>_WITH_BDB_VER
-# - User defined port specific variable to set
-# Berkeley DB version
+# - User defined port specific variable to set Berkeley DB
+# version.
# WITH_BDB_HIGHEST
-# - Use the highest installed version of Berkeley DB
-# BDB_LIB_NAME - This variable is automatically set to the name of the
-# Berkeley DB library (default: db41)
+# - Use the highest installed version of Berkeley DB.
+# BDB_LIB_NAME
+# - This variable is automatically set to the name of the
+# Berkeley DB library (default: db41).
# BDB_LIB_CXX_NAME
# - This variable is automatically set to the name of the
-# Berkeley DB c++ library (default: db41_cxx)
+# Berkeley DB C++ library (default: db41_cxx).
# BDB_INCLUDE_DIR
# - This variable is automatically set to the location of
-# the Berkeley DB include directory.
-# (default: ${LOCALBASE}/include/db41)
-# BDB_LIB_DIR - This variable is automatically set to the location of
+# the Berkeley DB include directory (default:
+# ${LOCALBASE}/include/db41).
+# BDB_LIB_DIR
+# - This variable is automatically set to the location of
# the Berkeley DB library directory.
-# BDB_VER - Detected Berkeley DB version.
+# BDB_VER
+# - Detected Berkeley DB version.
##
-# USE_SQLITE - Add dependency on sqlite library. Valid values are:
-# 3 and 2. If version is not specified directly then
-# sqlite3 is used (if USE_SQLITE= yes).
-# SQLITE_VER - Detected sqlite version.
+# USE_SQLITE - Add dependency on SQLite library. Valid values are:
+# 3 and 2. If version is not specified directly then
+# SQLite-3 is used (if USE_SQLITE= yes).
+# SQLITE_VER
+# - Detected SQLite version.
##
-# USE_FIREBIRD - Add dependency on Firebird library. Valid values are:
-# 2 and 1. If no version is given by the maintainer (if
+# USE_FIREBIRD - Add dependency on Firebird library. Valid values are:
+# 2 and 1. If no version is given by the maintainer (if
# USE_FIREBIRD= yes) and the user did not define
# WITH_FIREBIRD_VER variable, fall back to default "2".
# WITH_FIREBIRD_VER
# - User defined variable to set Firebird version.
-# FIREBIRD_VER - Detected Firebird version.
+# FIREBIRD_VER
+# - Detected Firebird version.
.if defined(USE_MYSQL)
DEFAULT_MYSQL_VER?= 50
@@ -111,7 +120,7 @@
.if defined(WANT_MYSQL_VER)
.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER}
-IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client.
+IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client
.endif
MYSQL_VER= ${WANT_MYSQL_VER}
.elif defined(WITH_MYSQL_VER)
@@ -126,7 +135,7 @@
.if defined(_MYSQL_VER)
.if ${_MYSQL_VER} != ${MYSQL_VER}
-IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
+IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
.endif
.endif
@@ -139,7 +148,7 @@
.if defined(IGNORE_WITH_MYSQL)
. for VER in ${IGNORE_WITH_MYSQL}
. if (${MYSQL_VER} == "${VER}")
-IGNORE= cannot install: doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${IGNORE_WITH_MYSQL})
+IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (does not support MySQL ${IGNORE_WITH_MYSQL})
. endif
. endfor
.endif # IGNORE_WITH_MYSQL
@@ -172,7 +181,7 @@
.if defined(WANT_PGSQL_VER)
.if defined(WITH_PGSQL_VER) && ${WITH_PGSQL_VER} != ${WANT_PGSQL_VER}
-IGNORE= cannot install: the port wants postgresql${WANT_PGSQL_VER}-client and you try to install postgresql${WITH_PGSQL_VER}-client.
+IGNORE= cannot install: the port wants postgresql${WANT_PGSQL_VER}-client and you try to install postgresql${WITH_PGSQL_VER}-client
.endif
PGSQL_VER= ${WANT_PGSQL_VER}
.elif defined(WITH_PGSQL_VER)
@@ -198,7 +207,7 @@
.if defined(IGNORE_WITH_PGSQL)
. for VER in ${IGNORE_WITH_PGSQL}
. if (${PGSQL_VER} == "${VER}")
-IGNORE= cannot install: does not work with postgresql${PGSQL_VER}-client PostgresSQL (${IGNORE_WITH_PGSQL} not supported)
+IGNORE= cannot install: does not work with postgresql${PGSQL_VER}-client (PostgresSQL ${IGNORE_WITH_PGSQL} not supported)
. endif
. endfor
.endif # IGNORE_WITH_PGSQL
@@ -323,7 +332,7 @@
# USE_BDB is specified incorrectly, so mark this as IGNORE
.if ${_BDB_VER} == "no"
-IGNORE= cannot install: unknown bdb version: ${USE_BDB}
+IGNORE= cannot install: unknown Berkeley DB version: ${USE_BDB}
.else
# Now check if we can use it
. if defined(INVALID_BDB_VER)
@@ -346,7 +355,7 @@
. endfor
. endif
. if ${_BDB_IGNORE} == "yes"
-IGNORE= cannot install: does not work with bdb version: ${_BDB_VER} (${INVALID_BDB_VER} not supported)
+IGNORE= cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported)
. else
# Now add the dependancy on Berkeley DB ${_BDB_VER) version
.if defined(BDB_BUILD_DEPENDS)
@@ -410,7 +419,7 @@
.endif # USE_BDB
-# Handling sqlite dependency
+# Handling SQLite dependency
.if defined(USE_SQLITE)
.if ${USE_SQLITE:L} == "yes"
@@ -430,7 +439,7 @@
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
SQLITE_VER= ${_SQLITE_VER}
.else
-IGNORE= cannot install: unknown sqlite version: ${_SQLITE_VER}
+IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER}
.endif
.endif # defined(USE_SQLITE)
@@ -454,7 +463,7 @@
.elif ${FIREBIRD_VER} == "1"
LIB_DEPENDS+= fbclient.1:${PORTSDIR}/databases/firebird-client
.else
-IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER}
+IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER}
.endif
.endif # defined(USE_FIREBIRD)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903301027.n2UARKwi058529>