36 files changed, 18 insertions, 18 deletions

diff --git a/databases/db/Makefile b/databases/db/Makefile
index 1ee8ca435c18..f4536405ad7b 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Manipulate db(3)'s btree(3) and hash(3) databases - NetBSD port
 
 MAN1=		db.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/db
 
 MAKE_ENV=	BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}
 
diff --git a/databases/db/pkg-plist b/databases/db/pkg-plist
deleted file mode 100644
index f3a7f079a736..000000000000
--- a/databases/db/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/db
diff --git a/databases/dbmetrix/Makefile b/databases/dbmetrix/Makefile
index f84c624e5310..4cdd9b0b42c8 100644
--- a/databases/dbmetrix/Makefile
+++ b/databases/dbmetrix/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
+PLIST_FILES=	bin/dbmetrix
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/dbmetrix/pkg-plist b/databases/dbmetrix/pkg-plist
deleted file mode 100644
index cc6ef4fb8b94..000000000000
--- a/databases/dbmetrix/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/dbmetrix
diff --git a/databases/fireprofile/Makefile b/databases/fireprofile/Makefile
index e4f011fb2625..b89356f8ed82 100644
--- a/databases/fireprofile/Makefile
+++ b/databases/fireprofile/Makefile
@@ -20,5 +20,6 @@ COMMENT=	Library to help profiling where programs are using MySQL
 BUILD_DEPENDS=	${LOCALBASE}/include/mysql/mysql.h:${PORTSDIR}/databases/mysql323-server
 
 MAN3=		libfireprofile.3
+PLIST_FILES=	lib/libfireprofile.so
 
 .include <bsd.port.mk>
diff --git a/databases/fireprofile/pkg-plist b/databases/fireprofile/pkg-plist
deleted file mode 100644
index 5bc920e745ba..000000000000
--- a/databases/fireprofile/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/libfireprofile.so
diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile
index 6b6762fbf812..822432a00c11 100644
--- a/databases/gmysql/Makefile
+++ b/databases/gmysql/Makefile
@@ -22,5 +22,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mysql=${PREFIX}
 
 MAN1=		gmysql.1
+PLIST_FILES=	bin/gmysql
 
 .include <bsd.port.mk>
diff --git a/databases/gmysql/pkg-plist b/databases/gmysql/pkg-plist
deleted file mode 100644
index 52a0fd80ab47..000000000000
--- a/databases/gmysql/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gmysql
diff --git a/databases/gqlplus/Makefile b/databases/gqlplus/Makefile
index e97327c9af08..5779602bb0ac 100644
--- a/databases/gqlplus/Makefile
+++ b/databases/gqlplus/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	SQL*PLUS with commandline editing, history, and name completion
 
 MAKEFILE=	makefile
+PLIST_FILES=	bin/gqlplus
 USE_GMAKE=	yes
 
 do-install:
diff --git a/databases/gqlplus/pkg-plist b/databases/gqlplus/pkg-plist
deleted file mode 100644
index 812b97b468cd..000000000000
--- a/databases/gqlplus/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/gqlplus
diff --git a/databases/jdbc-oracle816/Makefile b/databases/jdbc-oracle816/Makefile
index d5f454f7e067..c6b7b3c202a5 100644
--- a/databases/jdbc-oracle816/Makefile
+++ b/databases/jdbc-oracle816/Makefile
@@ -26,6 +26,7 @@ NO_CDROM=	'Must be downloaded direct from Oracle via www interface'
 NO_PACKAGE=	'Must be downloaded direct from Oracle via www interface'
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	share/java/classes/classes111_01.zip
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/jdbc-oracle816/pkg-plist b/databases/jdbc-oracle816/pkg-plist
deleted file mode 100644
index 7341b9e37cbf..000000000000
--- a/databases/jdbc-oracle816/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-share/java/classes/classes111_01.zip
diff --git a/databases/jdbc-oracle8i/Makefile b/databases/jdbc-oracle8i/Makefile
index d5f454f7e067..c6b7b3c202a5 100644
--- a/databases/jdbc-oracle8i/Makefile
+++ b/databases/jdbc-oracle8i/Makefile
@@ -26,6 +26,7 @@ NO_CDROM=	'Must be downloaded direct from Oracle via www interface'
 NO_PACKAGE=	'Must be downloaded direct from Oracle via www interface'
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	share/java/classes/classes111_01.zip
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/jdbc-oracle8i/pkg-plist b/databases/jdbc-oracle8i/pkg-plist
deleted file mode 100644
index 7341b9e37cbf..000000000000
--- a/databases/jdbc-oracle8i/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-share/java/classes/classes111_01.zip
diff --git a/databases/jdbc-oracle9i/Makefile b/databases/jdbc-oracle9i/Makefile
index d5f454f7e067..c6b7b3c202a5 100644
--- a/databases/jdbc-oracle9i/Makefile
+++ b/databases/jdbc-oracle9i/Makefile
@@ -26,6 +26,7 @@ NO_CDROM=	'Must be downloaded direct from Oracle via www interface'
 NO_PACKAGE=	'Must be downloaded direct from Oracle via www interface'
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+PLIST_FILES=	share/java/classes/classes111_01.zip
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/jdbc-oracle9i/pkg-plist b/databases/jdbc-oracle9i/pkg-plist
deleted file mode 100644
index 7341b9e37cbf..000000000000
--- a/databases/jdbc-oracle9i/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-share/java/classes/classes111_01.zip
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index aff3c80e8ba5..86132145a8e5 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -15,6 +15,7 @@ COMMENT=	High-performance distributed memory object cache system
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
 
+PLIST_FILES=	bin/memcached
 USE_AUTOMAKE=YES
 WANT_AUTOCONF_VER=253
 GNU_CONFIGURE=	YES
diff --git a/databases/memcached/pkg-plist b/databases/memcached/pkg-plist
deleted file mode 100644
index 06386d4f54e0..000000000000
--- a/databases/memcached/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/memcached
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 10747a501a99..3dfa42eff448 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	mysqlnavigator-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	MySQL database server administration package for KDE
 
+PLIST_FILES=	bin/mysqlnavigator
 USE_MYSQL=	yes
 
 USE_KDELIBS_VER=3
diff --git a/databases/mysql-navigator/pkg-plist b/databases/mysql-navigator/pkg-plist
deleted file mode 100644
index 340a91b0244e..000000000000
--- a/databases/mysql-navigator/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mysqlnavigator
diff --git a/databases/mysql2pgsql/Makefile b/databases/mysql2pgsql/Makefile
index 9e7415b90857..d7e20bddd508 100644
--- a/databases/mysql2pgsql/Makefile
+++ b/databases/mysql2pgsql/Makefile
@@ -20,6 +20,7 @@ COMMENT=	Convert a MySQL dump to a PostgreSQL dump
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 
 PATCH_WRKSRC=	${WRKDIR}
+PLIST_FILES=	bin/mysql2pgsql
 USE_PERL5=	yes
 NO_BUILD=	yes
 
diff --git a/databases/mysql2pgsql/pkg-plist b/databases/mysql2pgsql/pkg-plist
deleted file mode 100644
index 5e511a6feff8..000000000000
--- a/databases/mysql2pgsql/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mysql2pgsql
diff --git a/databases/mysql_last_value/Makefile b/databases/mysql_last_value/Makefile
index 773ca6ab99c6..35bfd2589cd9 100644
--- a/databases/mysql_last_value/Makefile
+++ b/databases/mysql_last_value/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Replaces NULL value of current column with value from top row
 
 LIB_DEPENDS=	mysqlclient.14:${PORTSDIR}/databases/mysql41-client
 
+PLIST_FILES=	bin/mysql_last_value
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/databases/mysql_last_value/pkg-plist b/databases/mysql_last_value/pkg-plist
deleted file mode 100644
index 176bdefefcf3..000000000000
--- a/databases/mysql_last_value/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mysql_last_value
diff --git a/databases/py-MySQL/Makefile b/databases/py-MySQL/Makefile
index 2bfda75a8c13..a23bd51813a6 100644
--- a/databases/py-MySQL/Makefile
+++ b/databases/py-MySQL/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Access a MySQL database through Python
 
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/MySQLmodule.so
 USE_PYTHON=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/databases/py-MySQL/pkg-plist b/databases/py-MySQL/pkg-plist
deleted file mode 100644
index c450839a60c7..000000000000
--- a/databases/py-MySQL/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/MySQLmodule.so
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index 16d2e0410b43..85f9e5062863 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -54,6 +54,7 @@ USE_REINPLACE=	yes
 WRKSRC=		${PYTHON_WRKSRC}/Modules
 MD5_FILE=	${PORTSDIR}/lang/python/distinfo
 MAKE_ENV=	BSDDB_VERSION=${DBVERSION}
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_bsddb.so
 
 post-extract:
 	@${CP} ${FILESDIR}/setup.py ${WRKSRC}
diff --git a/databases/py-bsddb/pkg-plist b/databases/py-bsddb/pkg-plist
deleted file mode 100644
index 224d2d523e45..000000000000
--- a/databases/py-bsddb/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/_bsddb.so
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 29cf254e8550..2ec16f13bed8 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Python bindings to the GNU dbm library
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/gdbm.so
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
diff --git a/databases/py-gdbm/pkg-plist b/databases/py-gdbm/pkg-plist
deleted file mode 100644
index a7729476b6ac..000000000000
--- a/databases/py-gdbm/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/gdbm.so
diff --git a/databases/py25-bsddb/Makefile b/databases/py25-bsddb/Makefile
index 16d2e0410b43..85f9e5062863 100644
--- a/databases/py25-bsddb/Makefile
+++ b/databases/py25-bsddb/Makefile
@@ -54,6 +54,7 @@ USE_REINPLACE=	yes
 WRKSRC=		${PYTHON_WRKSRC}/Modules
 MD5_FILE=	${PORTSDIR}/lang/python/distinfo
 MAKE_ENV=	BSDDB_VERSION=${DBVERSION}
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_bsddb.so
 
 post-extract:
 	@${CP} ${FILESDIR}/setup.py ${WRKSRC}
diff --git a/databases/py25-bsddb/pkg-plist b/databases/py25-bsddb/pkg-plist
deleted file mode 100644
index 224d2d523e45..000000000000
--- a/databases/py25-bsddb/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/_bsddb.so
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index b4cee77a27c0..d85af3683db3 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -18,6 +18,7 @@ COMMENT=	A Ruby extension to GDBM library
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
+PLIST_FILES=	%%RUBY_ARCHLIBDIR%%/gdbm.so
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/databases/ruby-gdbm/pkg-plist b/databases/ruby-gdbm/pkg-plist
deleted file mode 100644
index a13ffc21860a..000000000000
--- a/databases/ruby-gdbm/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%RUBY_ARCHLIBDIR%%/gdbm.so
diff --git a/databases/ruby-sqlrelay/Makefile b/databases/ruby-sqlrelay/Makefile
index 8b565d638090..a5750c0c282a 100644
--- a/databases/ruby-sqlrelay/Makefile
+++ b/databases/ruby-sqlrelay/Makefile
@@ -19,6 +19,7 @@ COMMENT=	A Ruby module to access to SQL Relay
 EXTRACT_DEPENDS=	${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch
 LIB_DEPENDS=	sqlrclient.0:${SQLRELAY_PORTDIR}
 
+PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/sqlrelay.so
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 RUBY_EXTCONF_SUBDIRS=	src/api/ruby
diff --git a/databases/ruby-sqlrelay/pkg-plist b/databases/ruby-sqlrelay/pkg-plist
deleted file mode 100644
index 6a10a823973e..000000000000
--- a/databases/ruby-sqlrelay/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/sqlrelay.so