. Simplify the packing list by using the new PORTDOCS macro.

PR:		59182
Submitted by:	Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)

4 files changed, 6 insertions, 174 deletions

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 32fd55f8ac75..069bb29dc3be 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -42,12 +42,8 @@ EXTRADOCS=	README CHANGES
 JARFILE=	${DISTNAME}-bin.jar
 JDCLASSPATH=	${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}
 
-.include <bsd.port.pre.mk>
-
-.if ${USE_JAVA:C/[.+]//g} >= 14
-PLIST_SUB+=	JAVA14=""
-.else
-PLIST_SUB+=	JAVA14="@comment "
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
 .endif
 
 do-build:
@@ -81,4 +77,4 @@ do-install-apidocs:
 	@${ECHO_CMD} " [ DONE ]"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/mysql-connector-java/pkg-plist b/databases/mysql-connector-java/pkg-plist
index 613e02e0212c..cea1fb834b67 100644
--- a/databases/mysql-connector-java/pkg-plist
+++ b/databases/mysql-connector-java/pkg-plist
@@ -1,83 +1,3 @@
 share/java/classes/jdbc2_0-stdext.jar
 share/java/classes/jta-spec1_0_1.jar
 share/java/classes/mysql-connector-java.jar
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-frame.html
-%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-noframe.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/AssertionFailedException.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Blob.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Buffer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/CharsetMapping.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Clob.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.UltraDevWorkAround.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/DatabaseMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Debug.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Driver.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeProcessor.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeTokenizer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Field.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MiniAdmin.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlDefs.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlIO.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.NamedPipeSocket.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileInputStream.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileOutputStream.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NonRegisteringDriver.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotImplemented.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotUpdatable.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/OutputStreamWatcher.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PacketTooBigException.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.BatchParams.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.EndPoint.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSet.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSetMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.OperationNotSupportedException.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataStatic.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SQLError.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Security.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SingleByteCharsetConverter.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StandardSocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Statement.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StringUtils.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/TimeUtil.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/UpdatableResultSet.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.RandStructcture.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableOutputStream.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableWriter.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WriterWatcher.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-tree.html
-%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/constant-values.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/deprecated-list.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/help-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-all.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/Driver.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/package-list
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/packages.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/serialized-form.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/stylesheet.css
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm/mysql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql/jdbc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/databases/mysql-connector-java50/Makefile b/databases/mysql-connector-java50/Makefile
index 32fd55f8ac75..069bb29dc3be 100644
--- a/databases/mysql-connector-java50/Makefile
+++ b/databases/mysql-connector-java50/Makefile
@@ -42,12 +42,8 @@ EXTRADOCS=	README CHANGES
 JARFILE=	${DISTNAME}-bin.jar
 JDCLASSPATH=	${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}
 
-.include <bsd.port.pre.mk>
-
-.if ${USE_JAVA:C/[.+]//g} >= 14
-PLIST_SUB+=	JAVA14=""
-.else
-PLIST_SUB+=	JAVA14="@comment "
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
 .endif
 
 do-build:
@@ -81,4 +77,4 @@ do-install-apidocs:
 	@${ECHO_CMD} " [ DONE ]"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/mysql-connector-java50/pkg-plist b/databases/mysql-connector-java50/pkg-plist
index 613e02e0212c..cea1fb834b67 100644
--- a/databases/mysql-connector-java50/pkg-plist
+++ b/databases/mysql-connector-java50/pkg-plist
@@ -1,83 +1,3 @@
 share/java/classes/jdbc2_0-stdext.jar
 share/java/classes/jta-spec1_0_1.jar
 share/java/classes/mysql-connector-java.jar
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-frame.html
-%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-noframe.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/AssertionFailedException.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Blob.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Buffer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/CharsetMapping.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Clob.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.UltraDevWorkAround.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Connection.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/DatabaseMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Debug.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Driver.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeProcessor.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/EscapeTokenizer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Field.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MiniAdmin.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlDefs.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/MysqlIO.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.NamedPipeSocket.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileInputStream.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.RandomAccessFileOutputStream.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NamedPipeSocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NonRegisteringDriver.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotImplemented.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/NotUpdatable.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/OutputStreamWatcher.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PacketTooBigException.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.BatchParams.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.EndPoint.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/PreparedStatement.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSet.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/ResultSetMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.OperationNotSupportedException.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataDynamic.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/RowDataStatic.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SQLError.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Security.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SingleByteCharsetConverter.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/SocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StandardSocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Statement.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/StringUtils.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/TimeUtil.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/UpdatableResultSet.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.RandStructcture.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/Util.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableOutputStream.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WatchableWriter.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/WriterWatcher.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/com/mysql/jdbc/package-tree.html
-%%JAVA14%%%%PORTDOCS%%%%DOCSDIR%%/javadoc/constant-values.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/deprecated-list.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/help-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-all.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/Driver.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/org/gjt/mm/mysql/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/package-list
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/packages.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/serialized-form.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/stylesheet.css
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm/mysql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt/mm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org/gjt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/org
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql/jdbc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com/mysql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/com
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%