From owner-svn-ports-all@FreeBSD.ORG Mon Jul 16 17:41:53 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3907106578C; Mon, 16 Jul 2012 17:41:53 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9D02F8FC08; Mon, 16 Jul 2012 17:41:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GHfrD3065490; Mon, 16 Jul 2012 17:41:53 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GHfr3I065484; Mon, 16 Jul 2012 17:41:53 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201207161741.q6GHfr3I065484@svn.freebsd.org> From: Jason Helfman Date: Mon, 16 Jul 2012 17:41:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r300962 - in head: Mk databases/powerarchitect databases/powerarchitect/files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 17:41:53 -0000 Author: jgh Date: Mon Jul 16 17:41:53 2012 New Revision: 300962 URL: http://svn.freebsd.org/changeset/ports/300962 Log: - update to 1.0.6, update MASTER_SITES [1] - move to optionsNG [2] - add in shared descriptions for {MYSQL,ORACLE,PGSQL}_JDBC [2] - add LICENSE [2] - modify startup-script for java sanity [2] PR: ports/166244 Submitted by: maintainer jjuanino@gmail.com [1], jgh@ [2] Modified: head/Mk/bsd.options.desc.mk head/databases/powerarchitect/Makefile head/databases/powerarchitect/distinfo head/databases/powerarchitect/files/powerarchitect.in head/databases/powerarchitect/pkg-plist Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Mon Jul 16 17:38:33 2012 (r300961) +++ head/Mk/bsd.options.desc.mk Mon Jul 16 17:41:53 2012 (r300962) @@ -166,6 +166,7 @@ MTP_DESC?= MTP device support MULTIBYTE_DESC?= multibyte character support MUSEPACK_DESC?= Support MPC audio format MYSQL_DESC?= MySQL backend +MYSQL_JDBC_DESC?= JDBC connection to MySQL databases NAS_DESC?= Network Audio System support NETCDF_DESC?= NetCDF support NETPBM_DESC?= netpbm support @@ -183,6 +184,7 @@ OPENMP_DESC?= parallel processing suppo OPENSSL_DESC?= SSL/TLS support via OpenSSL OPTIMIZED_CFLAGS_DESC?= compilation optimizations ORACLE_DESC?= Oracle support +ORACLE_JDBC_DESC?= JDBC connection to Oracle databases OSD_DESC?= On-Screen-Display support OSS_DESC?= Open Sound System support PAM_DESC?= PAM support @@ -190,6 +192,7 @@ PCRE_DESC?= Use Perl Compatible Regular PDF_DESC?= PDF support PERL_DESC?= Perl scripting language support PGSQL_DESC?= PostgreSQL backend +PGSQL_JDBC_DESC?= JDBC connection to PostgreSQL databases PHP_DESC?= PHP binding/support PIXBUF_DESC?= gdk-pixbuf support PNG_DESC?= PNG support Modified: head/databases/powerarchitect/Makefile ============================================================================== --- head/databases/powerarchitect/Makefile Mon Jul 16 17:38:33 2012 (r300961) +++ head/databases/powerarchitect/Makefile Mon Jul 16 17:41:53 2012 (r300962) @@ -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 +.include -.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 +.include Modified: head/databases/powerarchitect/distinfo ============================================================================== --- head/databases/powerarchitect/distinfo Mon Jul 16 17:38:33 2012 (r300961) +++ head/databases/powerarchitect/distinfo Mon Jul 16 17:41:53 2012 (r300962) @@ -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 Modified: head/databases/powerarchitect/files/powerarchitect.in ============================================================================== --- head/databases/powerarchitect/files/powerarchitect.in Mon Jul 16 17:38:33 2012 (r300961) +++ head/databases/powerarchitect/files/powerarchitect.in Mon Jul 16 17:41:53 2012 (r300962) @@ -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 Modified: head/databases/powerarchitect/pkg-plist ============================================================================== --- head/databases/powerarchitect/pkg-plist Mon Jul 16 17:38:33 2012 (r300961) +++ head/databases/powerarchitect/pkg-plist Mon Jul 16 17:41:53 2012 (r300962) @@ -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%%