summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/jdbm2/Makefile1
-rw-r--r--databases/luasql-mysql/Makefile1
-rw-r--r--databases/mariadb-client/Makefile2
-rw-r--r--databases/mariadb-scripts/Makefile1
-rw-r--r--databases/mariadb-server/Makefile2
-rw-r--r--databases/mariadb100-server/Makefile1
-rw-r--r--databases/pear-DoctrineDBAL/Makefile1
-rw-r--r--databases/proftpd-mod_sql_mysql/Makefile1
-rw-r--r--databases/proftpd-mod_sql_odbc/Makefile1
-rw-r--r--databases/proftpd-mod_sql_sqlite/Makefile1
-rw-r--r--databases/proftpd-mod_sql_tds/Makefile1
-rw-r--r--databases/py-MySQLdb/Makefile1
-rw-r--r--databases/py-pyPgSQL/Makefile3
-rw-r--r--databases/py-sqlalchemy-devel/Makefile3
-rw-r--r--databases/py-sqlalchemy/Makefile3
-rw-r--r--databases/py-sqlalchemy06/Makefile3
-rw-r--r--databases/ruby-bdb/Makefile1
-rw-r--r--databases/rubygem-activerecord/Makefile1
-rw-r--r--databases/squirrel-sql/Makefile2
19 files changed, 1 insertions, 29 deletions
diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile
index bc37c828b19a..fd9510f5b5c8 100644
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@@ -19,7 +19,6 @@ JAVA_VERSION= 1.6+
NO_BUILD= yes
PROJECTHOST= jdbm2
-LATEST_LINK= jdbm2
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile
index 7601c8f48c60..02155f6348b1 100644
--- a/databases/luasql-mysql/Makefile
+++ b/databases/luasql-mysql/Makefile
@@ -53,7 +53,6 @@ MAKE_ARGS+= DRIVER_LIBS="-L ${LOCALBASE}/lib -lsqlite3" \
IGNORE= unknown or unsupported luasql driver
.endif
-LATEST_LINK= ${PORTNAME}-${LUASQL_DRIVER}
PLIST_SUB+= LUASQL_DRIVER=${LUASQL_DRIVER}
do-install:
diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile
index b248f685f618..8eb84de84f0e 100644
--- a/databases/mariadb-client/Makefile
+++ b/databases/mariadb-client/Makefile
@@ -4,8 +4,6 @@ PORTNAME= mariadb
PORTREVISION= 7
PKGNAMESUFFIX= 53-client
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
COMMENT= Database client - drop-in replacement for MySQL
MASTERDIR= ${.CURDIR}/../mariadb-server
diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile
index f13f806569fa..effc8eec3a6b 100644
--- a/databases/mariadb-scripts/Makefile
+++ b/databases/mariadb-scripts/Makefile
@@ -7,7 +7,6 @@ COMMENT= Scripts for mariadb - drop-in replacement for MySQL
LICENSE= GPLv2
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= perl5
MASTERDIR= ${.CURDIR}/../mariadb-server
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 87ff39e2a3cc..288cc93aa1f1 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -20,8 +20,6 @@ COMMENT= Database server - drop-in replacement for MySQL
LICENSE= GPLv2
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
CONFLICTS?= mariadb5[4-9]-server-* \
mariadb1[0-9][0-9]-server-* \
mysql*-server-* \
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 7e7bc6909dff..445d9cd96e2e 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -21,7 +21,6 @@ LICENSE= GPLv2
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
SLAVEDIRS= databases/mariadb100-client
USES= bison:build cmake execinfo gmake shebangfix cpe
USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin
diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile
index 7246a48d70d0..678e040c1bf0 100644
--- a/databases/pear-DoctrineDBAL/Makefile
+++ b/databases/pear-DoctrineDBAL/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/deve
${PEARDIR}/Doctrine/Common/Version.php:${PORTSDIR}/databases/pear-DoctrineCommon \
${PEARDIR}/Symfony/Component/Console/Application.php:${PORTSDIR}/devel/pear-Symfony_Component_Console
-OPTIONSFILE?= ${PORT_DBDIR}/pear-${PORTNAME}/options
OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE
OPTIONS_DEFAULT=MYSQL
diff --git a/databases/proftpd-mod_sql_mysql/Makefile b/databases/proftpd-mod_sql_mysql/Makefile
index 5703130a577f..bb2f521ae0d1 100644
--- a/databases/proftpd-mod_sql_mysql/Makefile
+++ b/databases/proftpd-mod_sql_mysql/Makefile
@@ -12,7 +12,6 @@ LICENSE= GPLv2
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
USE_MYSQL= yes
diff --git a/databases/proftpd-mod_sql_odbc/Makefile b/databases/proftpd-mod_sql_odbc/Makefile
index aba7dde47139..c56916c9bb11 100644
--- a/databases/proftpd-mod_sql_odbc/Makefile
+++ b/databases/proftpd-mod_sql_odbc/Makefile
@@ -14,7 +14,6 @@ LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
CONFIGURE_ARGS= LIBS=-liodbc \
diff --git a/databases/proftpd-mod_sql_sqlite/Makefile b/databases/proftpd-mod_sql_sqlite/Makefile
index 1c351f5ac5b5..94d50d485d2c 100644
--- a/databases/proftpd-mod_sql_sqlite/Makefile
+++ b/databases/proftpd-mod_sql_sqlite/Makefile
@@ -13,7 +13,6 @@ LICENSE= GPLv2
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
USE_SQLITE= yes
diff --git a/databases/proftpd-mod_sql_tds/Makefile b/databases/proftpd-mod_sql_tds/Makefile
index edafb84ccb8e..a9c1c4d1aac9 100644
--- a/databases/proftpd-mod_sql_tds/Makefile
+++ b/databases/proftpd-mod_sql_tds/Makefile
@@ -14,7 +14,6 @@ LICENSE= GPLv2
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 484909795925..ffe2f47b4059 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -23,7 +23,6 @@ PORTDOCS= *
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
WRKSRC= ${WRKDIR}/${PORTNAME}1-${PORTNAME}-${PORTVERSION}
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
OPTIONS_DEFINE= DOCS MYSQLCLIENT_R
OPTIONS_DEFAULT= MYSQLCLIENT_R
MYSQLCLIENT_R_DESC= Use libmysqlclient_r (thread safe)
diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile
index 76df2a55142c..c040aa4057d5 100644
--- a/databases/py-pyPgSQL/Makefile
+++ b/databases/py-pyPgSQL/Makefile
@@ -25,9 +25,6 @@ OPTIONS_DEFINE= BYTEA_CONN EXAMPLES DOCS
OPTIONS_DEFAULT= BYTEA_CONN
BYTEA_CONN_DESC= Apply Bytea connection patch
-# bypass infrastructure bug
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MBYTEA_CONN}
diff --git a/databases/py-sqlalchemy-devel/Makefile b/databases/py-sqlalchemy-devel/Makefile
index 44ac7be2d694..bbae74f2c7ab 100644
--- a/databases/py-sqlalchemy-devel/Makefile
+++ b/databases/py-sqlalchemy-devel/Makefile
@@ -32,9 +32,6 @@ OPTIONS_DEFAULT= SQLITE
SYBASE_DESC= Sybase backend
TESTS_DESC= Include nose for unit tests
-# bypass infrastructure bug
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-
MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql
PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2
SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 8d1758631e04..0625198afcbe 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -32,9 +32,6 @@ MSSQL_DESC= MS SQL Server backend
TESTS_DESC= Include nose for unit tests
SYBASE_DESC= Sybase backend
-# bypass infrastructure bug
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-
.include <bsd.port.options.mk>
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index d8d6260a6899..00960afa2ad5 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -18,9 +18,6 @@ LICENSE= MIT
USES= python
USE_PYTHON= distutils autoplist
-# bypass infrastructure bug
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-
OPTIONS_DEFINE= CEXTENSIONS DOCS EXAMPLES NOSE
OPTIONS_MULTI= BACKEND
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 8e8861f2d3b4..fa372a4bb186 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -20,7 +20,6 @@ LICENSE= RUBY
USE_BDB= yes
OPTIONS_DEFINE= DOCS EXAMPLES
-OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile
index 5454360d40a0..ba05e059b06b 100644
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@@ -26,7 +26,6 @@ OPTIONS_DEFINE= MYSQL PGSQL SQLITE3
MYSQL_DESC= Use native MySQL bindings
PGSQL_DESC= Use native PostgreSQL bindings
SQLITE3_DESC= Use native SQLite3 bindings
-OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options
GEM_ENV+= LANG=en_US.UTF-8
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index dda341a64a10..278e512f8f8e 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
SUB_FILES= squirrel-sql
-DATADIR= ${PREFIX}/share/java/${UNIQUENAME}
+DATADIR= ${PREFIX}/share/java/${PKGBASE}
DESKTOP_ENTRIES="Squirrel-SQL Client" \
"${COMMENT}" \