4 files changed, 53 insertions, 29 deletions

diff --git a/databases/powerarchitect/Makefile b/databases/powerarchitect/Makefile
index f34b1aa48bbe..179ba404512c 100644
--- a/databases/powerarchitect/Makefile
+++ b/databases/powerarchitect/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	powerarchitect
-PORTVERSION=	0.9.12
+PORTVERSION=	1.0.6
 CATEGORIES=	databases java
-MASTER_SITES=	http://power-architect.googlecode.com/files/ \
-    		http://freshmeat.net/redir/powerarchitect/67980/url_tgz/
-DISTNAME=	Architect-generic-jdbc-${PORTVERSION}
+MASTER_SITES=	GOOGLE_CODE
+DISTNAME=	SQL-Power-Architect-generic-jdbc-${PORTVERSION}
 
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Data modeling and profiling tool
 
-OPTIONS=	ORACLE_JDBC "Enable JDBC connection to Oracle databases" off \
-		MYSQL_JDBC "Enable JDBC connection to MySQL databases" off \
-		PGSQL_JDBC "Enable JDBC connection to PostgreSQL databases" off
+LICENSE=	GPLv3
+
+OPTIONS_DEFINE=	ORACLE_JDBC MYSQL_JDBC PGSQL_JDBC
 
 USE_JAVA=	yes
 
@@ -25,19 +24,20 @@ JAVA_VERSION=	1.5+
 
 NO_BUILD=	yes
 
+PROJECTHOST=	power-architect
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/architect-${PORTVERSION}
 SUB_FILES=	${PORTNAME}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ORACLE_JDBC)
-RUN_DEPENDS+=	${JAVALIBDIR}/ojdbc14.jar:${PORTSDIR}/databases/jdbc-oracle9i
+.if ${PORT_OPTIONS:MORACLE_JDBC}
+RUN_DEPENDS+=	${JAVALIBDIR}/ojdbc-10.2.0.5.jar:${PORTSDIR}/databases/jdbc-oracle10g
 .endif
-.if defined(WITH_MYSQL_JDBC)
+.if ${PORT_OPTIONS:MMYSQL_JDBC}
 RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
 .endif
-.if defined(WITH_PGSQL_JDBC)
+.if ${PORT_OPTIONS:MPGSQL_JDBC}
 RUN_DEPENDS+=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
 .endif
 
@@ -49,9 +49,9 @@ do-install:
 	    ${COPYTREE_SHARE} lib ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_MAN} ${WRKSRC}/README.generic ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/powerarchitect/distinfo b/databases/powerarchitect/distinfo
index 06a6d89b077d..abb9ca414c2c 100644
--- a/databases/powerarchitect/distinfo
+++ b/databases/powerarchitect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Architect-generic-jdbc-0.9.12.tar.gz) = 514eb63701f491231081eb6b6cc2749c90342b83521aa42c75a686c1985f6cd3
-SIZE (Architect-generic-jdbc-0.9.12.tar.gz) = 18059361
+SHA256 (SQL-Power-Architect-generic-jdbc-1.0.6.tar.gz) = 26f03b6b5dc88007e9d6740bfc50a30a3248cee5c5da4a52bf272a88ea72e831
+SIZE (SQL-Power-Architect-generic-jdbc-1.0.6.tar.gz) = 23492992
diff --git a/databases/powerarchitect/files/powerarchitect.in b/databases/powerarchitect/files/powerarchitect.in
index cb2ce0accc47..2f3fbd24fc26 100644
--- a/databases/powerarchitect/files/powerarchitect.in
+++ b/databases/powerarchitect/files/powerarchitect.in
@@ -1,3 +1,5 @@
 #!/bin/sh
+#
+# $FreeBSD$
 
-exec java -jar %%DATADIR%%/architect.jar
+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/architect.jar
diff --git a/databases/powerarchitect/pkg-plist b/databases/powerarchitect/pkg-plist
index 6be91be7c3e3..097c68e1e46f 100644
--- a/databases/powerarchitect/pkg-plist
+++ b/databases/powerarchitect/pkg-plist
@@ -3,33 +3,55 @@ bin/powerarchitect
 %%DATADIR%%/architect.jar
 %%DATADIR%%/jdbc/sqlserver_2005.jar
 %%DATADIR%%/lib/activation.jar
-%%DATADIR%%/lib/architecthelp.jar
+%%DATADIR%%/lib/annotations.jar
+%%DATADIR%%/lib/apache-mime4j-0.6.jar
 %%DATADIR%%/lib/commons-beanutils-bean-collections.jar
 %%DATADIR%%/lib/commons-beanutils-core.jar
 %%DATADIR%%/lib/commons-beanutils.jar
-%%DATADIR%%/lib/commons-collections-3.1.jar
-%%DATADIR%%/lib/commons-dbcp-1.2.1.jar
+%%DATADIR%%/lib/commons-codec-20041127.091804.jar
+%%DATADIR%%/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/lib/commons-dbcp-1.2.2.jar
 %%DATADIR%%/lib/commons-digester.jar
+%%DATADIR%%/lib/commons-httpclient-3.1.jar
+%%DATADIR%%/lib/commons-io-1.4.jar
+%%DATADIR%%/lib/commons-lang-2.4.jar
 %%DATADIR%%/lib/commons-logging.jar
-%%DATADIR%%/lib/commons-pool-1.3.jar
+%%DATADIR%%/lib/commons-pool-1.5.1.jar
 %%DATADIR%%/lib/commons-vfs-1.0.jar
-%%DATADIR%%/lib/darwinsys.jar
 %%DATADIR%%/lib/edtftpj-1.5.4.jar
 %%DATADIR%%/lib/eigenbase-properties.jar
-%%DATADIR%%/lib/forms-1.1.0.jar
+%%DATADIR%%/lib/forms-1.3.0.jar
+%%DATADIR%%/lib/google-collect-1.0.jar
+%%DATADIR%%/lib/httpclient-4.0.jar
+%%DATADIR%%/lib/httpcore-4.0.1.jar
+%%DATADIR%%/lib/httpmime-4.0.jar
 %%DATADIR%%/lib/iText-2.0.8.jar
 %%DATADIR%%/lib/jakarta-regexp-1.2.jar
 %%DATADIR%%/lib/jcommon-1.0.0.jar
 %%DATADIR%%/lib/jfreechart-1.0.1.jar
-%%DATADIR%%/lib/jhall.jar
-%%DATADIR%%/lib/kettle-engine-3.0.jar
-%%DATADIR%%/lib/log4j.jar
-%%DATADIR%%/lib/mail.jar
-%%DATADIR%%/lib/mondrian.jar
+%%DATADIR%%/lib/jmdns-2.1.jar
+%%DATADIR%%/lib/jsr305.jar
+%%DATADIR%%/lib/junit-3.8.2.jar
+%%DATADIR%%/lib/kettle-core-3.2.2.jar
+%%DATADIR%%/lib/kettle-db-3.2.2.jar
+%%DATADIR%%/lib/kettle-engine-3.2.2.jar
+%%DATADIR%%/lib/log4j-1.2.15.jar
+%%DATADIR%%/lib/mail-1.4.1.jar
+%%DATADIR%%/lib/miglayout-3.7-swing.jar
+%%DATADIR%%/lib/olap4j-0.9.7.302.jar
+%%DATADIR%%/lib/opencsv-1.8.jar
+%%DATADIR%%/lib/piccolo.jar
+%%DATADIR%%/lib/piccolox.jar
+%%DATADIR%%/lib/rsyntaxtextarea.jar
+%%DATADIR%%/lib/servlet-api-2.5.jar
 %%DATADIR%%/lib/spring-core.jar
+%%DATADIR%%/lib/spring-security-core-2.0.5.RELEASE.jar
 %%DATADIR%%/lib/sqlpower_library.jar
+%%DATADIR%%/lib/velocity-1.6.2.jar
+%%DATADIR%%/lib/velocity-tools-generic-1.4.jar
+%%DATADIR%%/lib/xercesImpl-2.9.1.jar
 %%PORTDOCS%%%%DOCSDIR%%/README.generic
-@dirrm %%DATADIR%%/jdbc
 @dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/jdbc
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%