- Update to bsd.java.mk 2.0

- Add 'databases' category
- Use ${JAVAJARDIR} and %%JAVAJARDIR%%
- CP -> INSTALL_DATA
- Honor hier(7): install docs in DOCSDIR and samples in EXAMPLESDIR
- Honor NOPORTDOCS
- Minor cosmetic improvements
- Bump PORTREVISION

2 files changed, 30 insertions, 58 deletions

diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile
index 46a9d8832b11..e8df41ad7b01 100644
--- a/java/jdbcpool/Makefile
+++ b/java/jdbcpool/Makefile
@@ -7,23 +7,32 @@
 
 PORTNAME=	jdbcpool
 PORTVERSION=	0.99
-CATEGORIES=	java
+PORTREVISION=	1
+CATEGORIES=	java databases
 MASTER_SITES=	http://www.bitmechanic.com/projects/jdbcpool/dist/
 
-MAINTAINER=	java@freebsd.org
+MAINTAINER=	java@FreeBSD.org
 COMMENT=	JDBC connection pool
 
-USE_JAVA=	1.2+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 NO_BUILD=	yes
-TARGET_DIR=	${PREFIX}/share/java/${PORTNAME}
-JAR_DEST=	${PREFIX}/share/java/classes
-PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
+
+PORTDOCS=	CHANGES LICENSE README
+.if !defined(NOPORTDOCS)
+PORTDOCS+=	javadoc
+.endif
+
+post-extract:
+	@${FIND} ${WRKSRC} -name CVS -type dir | ${XARGS} ${RM} -rf
 
 do-install:
-	${MKDIR} ${TARGET_DIR} ${JAR_DEST}
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${JAR_DEST}/${PORTNAME}.jar
-	cd ${WRKSRC}; \
-		${RM} -rf `${FIND} examples javadoc -name CVS -type dir`; \
-		${CP} -R examples javadoc CHANGES LICENSE README ${TARGET_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	cd ${WRKSRC}/examples \
+	  && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
+	cd ${WRKSRC} \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 
 .include <bsd.port.mk>
diff --git a/java/jdbcpool/pkg-plist b/java/jdbcpool/pkg-plist
index f8952550b629..b06d612c2ccc 100644
--- a/java/jdbcpool/pkg-plist
+++ b/java/jdbcpool/pkg-plist
@@ -1,47 +1,10 @@
-share/java/classes/jdbcpool.jar
-%%T%%/CHANGES
-%%T%%/LICENSE
-%%T%%/README
-%%T%%/examples/PoolTest.class
-%%T%%/examples/PoolTest.java
-%%T%%/examples/gsp/JDBCApplication.class
-%%T%%/examples/gsp/JDBCApplication.java
-%%T%%/examples/gsp/README
-%%T%%/examples/gsp/monitor_pool.gsp
-%%T%%/examples/gsp/query.gsp
-%%T%%/javadoc/allclasses-frame.html
-%%T%%/javadoc/com/bitmechanic/sql/ConnectionPool.html
-%%T%%/javadoc/com/bitmechanic/sql/ConnectionPoolManager.html
-%%T%%/javadoc/com/bitmechanic/sql/PooledCallableStatement.html
-%%T%%/javadoc/com/bitmechanic/sql/PooledConnection.html
-%%T%%/javadoc/com/bitmechanic/sql/PooledPreparedStatement.html
-%%T%%/javadoc/com/bitmechanic/sql/PooledStatement.html
-%%T%%/javadoc/com/bitmechanic/sql/SQLUtil.html
-%%T%%/javadoc/com/bitmechanic/sql/package-frame.html
-%%T%%/javadoc/com/bitmechanic/sql/package-summary.html
-%%T%%/javadoc/com/bitmechanic/sql/package-tree.html
-%%T%%/javadoc/com/bitmechanic/util/JavaAlarm.html
-%%T%%/javadoc/com/bitmechanic/util/Queue.html
-%%T%%/javadoc/com/bitmechanic/util/TimeoutException.html
-%%T%%/javadoc/com/bitmechanic/util/package-frame.html
-%%T%%/javadoc/com/bitmechanic/util/package-summary.html
-%%T%%/javadoc/com/bitmechanic/util/package-tree.html
-%%T%%/javadoc/deprecated-list.html
-%%T%%/javadoc/help-doc.html
-%%T%%/javadoc/index-all.html
-%%T%%/javadoc/index.html
-%%T%%/javadoc/overview-frame.html
-%%T%%/javadoc/overview-summary.html
-%%T%%/javadoc/overview-tree.html
-%%T%%/javadoc/package-list
-%%T%%/javadoc/packages.html
-%%T%%/javadoc/serialized-form.html
-%%T%%/javadoc/stylesheet.css
-@dirrm %%T%%/examples/gsp
-@dirrm %%T%%/examples
-@dirrm %%T%%/javadoc/com/bitmechanic/sql
-@dirrm %%T%%/javadoc/com/bitmechanic/util
-@dirrm %%T%%/javadoc/com/bitmechanic
-@dirrm %%T%%/javadoc/com
-@dirrm %%T%%/javadoc
-@dirrm %%T%%
+%%JAVAJARDIR%%/jdbcpool.jar
+%%EXAMPLESDIR%%/PoolTest.class
+%%EXAMPLESDIR%%/PoolTest.java
+%%EXAMPLESDIR%%/gsp/JDBCApplication.class
+%%EXAMPLESDIR%%/gsp/JDBCApplication.java
+%%EXAMPLESDIR%%/gsp/README
+%%EXAMPLESDIR%%/gsp/monitor_pool.gsp
+%%EXAMPLESDIR%%/gsp/query.gsp
+@dirrm %%EXAMPLESDIR%%/gsp
+@dirrm %%EXAMPLESDIR%%