FreeBSD Bugzilla – Attachment 133934 Details for
Bug 178497
[maintainer update] databases/datamodeler version update from 3.1.0.700 to 3.3.0.747
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 14.67 KB, created by
Jose G. Juanino
on 2013-05-10 22:50:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Jose G. Juanino
Created:
2013-05-10 22:50:00 UTC
Size:
14.67 KB
patch
obsolete
>diff -uNr datamodeler.orig/Makefile datamodeler/Makefile >--- datamodeler.orig/Makefile 2012-11-17 06:55:06.000000000 +0100 >+++ datamodeler/Makefile 2013-05-10 23:24:39.000000000 +0200 >@@ -1,12 +1,8 @@ >-# New ports collection makefile for: datamodeler >-# Date created: 22 October 2011 >-# Whom: jjuanino@gmail.com >-# >-# $FreeBSD: ports/databases/datamodeler/Makefile,v 1.2 2012/11/17 05:55:06 svnexp Exp $ >-# >+# Created by: jjuanino@gmail.com >+# $FreeBSD$ > > PORTNAME= datamodeler >-PORTVERSION= 3.1.0.700 >+PORTVERSION= 3.3.0.747 > DISTVERSIONSUFFIX=-1 > CATEGORIES= databases java > MASTER_SITES= #http://www.oracle.com/technetwork/developer-tools/datamodeler/downloads/index.html >@@ -31,10 +27,12 @@ > > DATADIR= ${JAVASHAREDIR}/${PORTNAME} > WRKSRC= ${WRKDIR}/opt/${PORTNAME} >+SUB_FILES= ${PORTNAME}.script.sh >+SUB_LIST= JAVA_HOME=${JAVA_HOME} > > .include <bsd.port.pre.mk> > >-.if !defined(NOPORTDOCS) >+.if ${PORT_OPTIONS:MDOCS} > PORTDOCS= readme.html > .endif > >@@ -43,29 +41,16 @@ > .endif > > .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) >-DISTFILE_INSTRUCTIONS = \n >-DISTFILE_INSTRUCTIONS += Due to Oracle license restrictions, you must fetch the source \n >-DISTFILE_INSTRUCTIONS += distribution manually. Please access \n >-DISTFILE_INSTRUCTIONS += http://www.oracle.com/technetwork/developer-tools/datamodeler/downloads/index.html \n >-DISTFILE_INSTRUCTIONS += with a web browser and follow the link for the \n >-DISTFILE_INSTRUCTIONS += \"${DISTFILES}\". \n >-DISTFILE_INSTRUCTIONS += You will be required to register and log in, \n >-DISTFILE_INSTRUCTIONS += but you can create an account on that page. \n >-DISTFILE_INSTRUCTIONS += After registration and accepting the Oracle License, \n >-DISTFILE_INSTRUCTIONS += download the distribution file, \n ${DISTFILES}, \n >-DISTFILE_INSTRUCTIONS += into ${DISTDIR}/${DIST_SUBDIR}/ \n >-DISTFILE_INSTRUCTIONS += and then restart this installation\n\n >-.endif >- >-pre-fetch: >-.if defined(DISTFILE_INSTRUCTIONS) >- @${PRINTF} "${DISTFILE_INSTRUCTIONS}" >- @exit 1 >+IGNORE= due to Oracle license restrictions, you must fetch the source \ >+distribution manually. Please access \ >+http://www.oracle.com/technetwork/developer-tools/datamodeler/downloads/index.html \ >+with a web browser and follow the link for the ${DISTFILES}. You will be \ >+required to register and log in, but you can create an account on that \ >+page. After registration and accepting the Oracle License, download the \ >+distribution file, ${DISTFILES}, into ${DISTDIR}/${DIST_SUBDIR}/ and then \ >+restart this installation. > .endif > >-SUB_FILES= ${PORTNAME}.script.sh >-SUB_LIST= JAVA_HOME=${JAVA_HOME} >- > do-install: > @${ECHO_MSG} -n ">> Installing scripts..." > @${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.script.sh ${PREFIX}/bin/${PORTNAME} >@@ -88,9 +73,9 @@ > @${ECHO_MSG} " [ DONE ]" > .endfor > >-.if !defined(NOPORTDOCS) >+.if ${PORT_OPTIONS:MDOCS} > @${MKDIR} ${DOCSDIR} >- @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}/readme.html ${DOCSDIR} >+ @cd ${WRKSRC} && ${INSTALL_DATA} readme.html ${DOCSDIR} > .endif > > .include <bsd.port.post.mk> >diff -uNr datamodeler.orig/distinfo datamodeler/distinfo >--- datamodeler.orig/distinfo 2012-03-19 02:03:40.000000000 +0100 >+++ datamodeler/distinfo 2013-05-10 23:12:48.000000000 +0200 >@@ -1,2 +1,2 @@ >-SHA256 (oracle/datamodeler-3.1.0.700-1.noarch.rpm) = a4ad4b80ea6b14d060c5a6d9764fd3c4ba2f7fef51f5d72cbbb716513b76be9b >-SIZE (oracle/datamodeler-3.1.0.700-1.noarch.rpm) = 101001500 >+SHA256 (oracle/datamodeler-3.3.0.747-1.noarch.rpm) = 827cbe3101799e74d17d660b691358041e7e2376917d7a7ff1e3f021bfe01caa >+SIZE (oracle/datamodeler-3.3.0.747-1.noarch.rpm) = 112556363 >diff -uNr datamodeler.orig/pkg-plist datamodeler/pkg-plist >--- datamodeler.orig/pkg-plist 2012-11-17 06:55:06.000000000 +0100 >+++ datamodeler/pkg-plist 2013-05-10 23:29:32.000000000 +0200 >@@ -10,11 +10,34 @@ > %%DATADIR%%/datamodeler/bin/splash.png > %%DATADIR%%/datamodeler/bin/version.properties > %%DATADIR%%/datamodeler/doc/datamodeler_help.jar >+%%DATADIR%%/datamodeler/doc/welcome/de/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/de/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/de/welcome_tran_source.js >+%%DATADIR%%/datamodeler/doc/welcome/en/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/en/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/en/welcome_tran_source.js >+%%DATADIR%%/datamodeler/doc/welcome/es/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/es/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/es/welcome_tran_source.js > %%DATADIR%%/datamodeler/doc/welcome/footer_style.css >+%%DATADIR%%/datamodeler/doc/welcome/fr/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/fr/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/fr/welcome_tran_source.js >+%%DATADIR%%/datamodeler/doc/welcome/it/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/it/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/it/welcome_tran_source.js >+%%DATADIR%%/datamodeler/doc/welcome/ja/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/ja/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/ja/welcome_tran_source.js >+%%DATADIR%%/datamodeler/doc/welcome/ko/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/ko/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/ko/welcome_tran_source.js > %%DATADIR%%/datamodeler/doc/welcome/main.css >+%%DATADIR%%/datamodeler/doc/welcome/pt_BR/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/pt_BR/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/pt_BR/welcome_tran_source.js > %%DATADIR%%/datamodeler/doc/welcome/startPage_script.js > %%DATADIR%%/datamodeler/doc/welcome/subPage_script.js >-%%DATADIR%%/datamodeler/doc/welcome/welcome.html > %%DATADIR%%/datamodeler/doc/welcome/welcomeImages/TPaths.png > %%DATADIR%%/datamodeler/doc/welcome/welcomeImages/closedbook.png > %%DATADIR%%/datamodeler/doc/welcome/welcomeImages/codesampleicon.png >@@ -48,31 +71,43 @@ > %%DATADIR%%/datamodeler/doc/welcome/welcomeImages/welcome_r2_c3_f3.png > %%DATADIR%%/datamodeler/doc/welcome/welcomeImages/welcome_r2_c3_f4.png > %%DATADIR%%/datamodeler/doc/welcome/welcomeImages/welcome_r2_c3_f5.png >+%%DATADIR%%/datamodeler/doc/welcome/zh_CN/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/zh_CN/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/zh_CN/welcome_tran_source.js >+%%DATADIR%%/datamodeler/doc/welcome/zh_TW/welcome.html >+%%DATADIR%%/datamodeler/doc/welcome/zh_TW/welcome.js >+%%DATADIR%%/datamodeler/doc/welcome/zh_TW/welcome_tran_source.js > %%DATADIR%%/datamodeler/extensions/oracle.datamodeler.jar >-%%DATADIR%%/datamodeler/icon.png > %%DATADIR%%/datamodeler/lib/ActiveQueryBuilder.jar >+%%DATADIR%%/datamodeler/lib/RSyntaxTextArea.License.txt > %%DATADIR%%/datamodeler/lib/avalon-framework-4.2.0.jar > %%DATADIR%%/datamodeler/lib/awxml.jar > %%DATADIR%%/datamodeler/lib/batik-all-1.7.jar > %%DATADIR%%/datamodeler/lib/commons-io-1.3.1.jar > %%DATADIR%%/datamodeler/lib/commons-logging-1.0.4.jar >+%%DATADIR%%/datamodeler/lib/dom4j-1.6.1.jar > %%DATADIR%%/datamodeler/lib/fop.jar >+%%DATADIR%%/datamodeler/lib/itextpdf-5.1.2.jar > %%DATADIR%%/datamodeler/lib/jlfgr.jar > %%DATADIR%%/datamodeler/lib/js.jar > %%DATADIR%%/datamodeler/lib/log4j.jar > %%DATADIR%%/datamodeler/lib/olap_api.jar >-%%DATADIR%%/datamodeler/lib/poi.jar >+%%DATADIR%%/datamodeler/lib/poi-3.7-20101029.jar >+%%DATADIR%%/datamodeler/lib/poi-ooxml-3.7-20101029.jar >+%%DATADIR%%/datamodeler/lib/poi-ooxml-schemas-3.7-20101029.jar >+%%DATADIR%%/datamodeler/lib/rsyntaxtextarea.jar > %%DATADIR%%/datamodeler/lib/serializer-2.7.0.jar > %%DATADIR%%/datamodeler/lib/xalan-2.7.0.jar > %%DATADIR%%/datamodeler/lib/xml-apis-ext.jar > %%DATADIR%%/datamodeler/lib/xml-apis.jar >+%%DATADIR%%/datamodeler/lib/xmlbeans-2.3.0.jar > %%DATADIR%%/datamodeler/lib/xmlgraphics-commons-1.3.1.jar >-%%DATADIR%%/datamodeler/readme.html > %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM2.0patch_DM2.1.sql > %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM2.0patch_DM3.0.sql > %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM2.0patch_DM3.0_DML.sql > %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM2_DM2patch.sql > %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM3.0_DM3.1.sql >+%%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM3.1_DM3.3.sql > %%DATADIR%%/datamodeler/reports/Pkg_Osdm_Utils.sql > %%DATADIR%%/datamodeler/reports/Pkg_Osdm_Utils_body.sql > %%DATADIR%%/datamodeler/reports/Reporting Schema diagrams/Data Types model.pdf >@@ -119,6 +154,12 @@ > %%DATADIR%%/datamodeler/reports/xslt/10/MeasurementsDetails_html.xslt > %%DATADIR%%/datamodeler/reports/xslt/10/MeasurementsDetails_pdf.xslt > %%DATADIR%%/datamodeler/reports/xslt/10/MeasurementsDetails_rtf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/10/ObjectsComparison_html.xslt >+%%DATADIR%%/datamodeler/reports/xslt/10/ObjectsComparison_pdf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/10/ObjectsComparison_rtf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/10/SearchResults_html.xslt >+%%DATADIR%%/datamodeler/reports/xslt/10/SearchResults_pdf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/10/SearchResults_rtf.xslt > %%DATADIR%%/datamodeler/reports/xslt/10/SingleCollectionTypeDetails_html.xslt > %%DATADIR%%/datamodeler/reports/xslt/10/SingleCollectionTypeDetails_pdf.xslt > %%DATADIR%%/datamodeler/reports/xslt/10/SingleCollectionTypeDetails_rtf.xslt >@@ -161,6 +202,12 @@ > %%DATADIR%%/datamodeler/reports/xslt/20/MeasurementsDetails_html.xslt > %%DATADIR%%/datamodeler/reports/xslt/20/MeasurementsDetails_pdf.xslt > %%DATADIR%%/datamodeler/reports/xslt/20/MeasurementsDetails_rtf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/20/ObjectsComparison_html.xslt >+%%DATADIR%%/datamodeler/reports/xslt/20/ObjectsComparison_pdf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/20/ObjectsComparison_rtf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/20/SearchResults_html.xslt >+%%DATADIR%%/datamodeler/reports/xslt/20/SearchResults_pdf.xslt >+%%DATADIR%%/datamodeler/reports/xslt/20/SearchResults_rtf.xslt > %%DATADIR%%/datamodeler/reports/xslt/20/SingleCollectionTypeDetails_html.xslt > %%DATADIR%%/datamodeler/reports/xslt/20/SingleCollectionTypeDetails_pdf.xslt > %%DATADIR%%/datamodeler/reports/xslt/20/SingleCollectionTypeDetails_rtf.xslt >@@ -176,6 +223,8 @@ > %%DATADIR%%/datamodeler/reports/xslt/20/SingleTableDetails_html.xslt > %%DATADIR%%/datamodeler/reports/xslt/20/SingleTableDetails_pdf.xslt > %%DATADIR%%/datamodeler/reports/xslt/20/SingleTableDetails_rtf.xslt >+%%DATADIR%%/datamodeler/samples/Dimensional_model/Global11_demo.pdf >+%%DATADIR%%/datamodeler/samples/Dimensional_model/global11_demo.zip > %%DATADIR%%/datamodeler/templates/ABBREVS_SAMPLE.csv > %%DATADIR%%/datamodeler/templates/plurals.csv > %%DATADIR%%/datamodeler/types/defaultRDBMSSites.xml >@@ -231,6 +280,7 @@ > %%DATADIR%%/datamodeler/xmlmetadata/ClusterOracle.xml > %%DATADIR%%/datamodeler/xmlmetadata/ClusterOraclev10g.xml > %%DATADIR%%/datamodeler/xmlmetadata/ClusterOraclev9i.xml >+%%DATADIR%%/datamodeler/xmlmetadata/Column.DependentColumnDescriptor.xml > %%DATADIR%%/datamodeler/xmlmetadata/Column.xml > %%DATADIR%%/datamodeler/xmlmetadata/ColumnIdentityDB2.xml > %%DATADIR%%/datamodeler/xmlmetadata/ColumnIdentityDB2v80.xml >@@ -240,6 +290,7 @@ > %%DATADIR%%/datamodeler/xmlmetadata/ColumnProxyOracle.xml > %%DATADIR%%/datamodeler/xmlmetadata/ColumnProxyOraclev10g.xml > %%DATADIR%%/datamodeler/xmlmetadata/ColumnProxyOraclev11g.xml >+%%DATADIR%%/datamodeler/xmlmetadata/ColumnProxyOraclev12c.xml > %%DATADIR%%/datamodeler/xmlmetadata/ColumnProxyOraclev9i.xml > %%DATADIR%%/datamodeler/xmlmetadata/ColumnProxySqlServer.xml > %%DATADIR%%/datamodeler/xmlmetadata/ColumnProxySqlServerv2k.xml >@@ -296,6 +347,7 @@ > %%DATADIR%%/datamodeler/xmlmetadata/DefaultSqlServer.xml > %%DATADIR%%/datamodeler/xmlmetadata/DefaultSqlServerv2k.xml > %%DATADIR%%/datamodeler/xmlmetadata/DefaultSqlServerv2k5.xml >+%%DATADIR%%/datamodeler/xmlmetadata/Design.DesignStorageDesc.xml > %%DATADIR%%/datamodeler/xmlmetadata/Design.xml > %%DATADIR%%/datamodeler/xmlmetadata/DesignObject.xml > %%DATADIR%%/datamodeler/xmlmetadata/DesignPart.xml >@@ -424,6 +476,8 @@ > %%DATADIR%%/datamodeler/xmlmetadata/LoginSqlServer.xml > %%DATADIR%%/datamodeler/xmlmetadata/LoginSqlServerv2k.xml > %%DATADIR%%/datamodeler/xmlmetadata/LoginSqlServerv2k5.xml >+%%DATADIR%%/datamodeler/xmlmetadata/MaskTemplate.xml >+%%DATADIR%%/datamodeler/xmlmetadata/MaskTemplateFileWrapper.xml > %%DATADIR%%/datamodeler/xmlmetadata/Measure.AggregateFunction.xml > %%DATADIR%%/datamodeler/xmlmetadata/Measure.xml > %%DATADIR%%/datamodeler/xmlmetadata/MeasureFolder.xml >@@ -534,6 +588,8 @@ > %%DATADIR%%/datamodeler/xmlmetadata/SegmentOraclev10g.xml > %%DATADIR%%/datamodeler/xmlmetadata/SegmentOraclev9i.xml > %%DATADIR%%/datamodeler/xmlmetadata/SelectionCriteria.xml >+%%DATADIR%%/datamodeler/xmlmetadata/SensitiveType.xml >+%%DATADIR%%/datamodeler/xmlmetadata/SensitiveTypeFileWrapper.xml > %%DATADIR%%/datamodeler/xmlmetadata/SequenceDB2.xml > %%DATADIR%%/datamodeler/xmlmetadata/SequenceOracle.xml > %%DATADIR%%/datamodeler/xmlmetadata/SequenceOraclev10g.xml >@@ -584,6 +640,9 @@ > %%DATADIR%%/datamodeler/xmlmetadata/SynonymOraclev10g.xml > %%DATADIR%%/datamodeler/xmlmetadata/SynonymOraclev9i.xml > %%DATADIR%%/datamodeler/xmlmetadata/SynonymSqlServer.xml >+%%DATADIR%%/datamodeler/xmlmetadata/TSDPPolicy.xml >+%%DATADIR%%/datamodeler/xmlmetadata/TSDPPolicyFileWrapper.xml >+%%DATADIR%%/datamodeler/xmlmetadata/TSDPSubPolicy.xml > %%DATADIR%%/datamodeler/xmlmetadata/TVConnector.xml > %%DATADIR%%/datamodeler/xmlmetadata/TVDiagramView.xml > %%DATADIR%%/datamodeler/xmlmetadata/Table.ColumnGroup.xml >@@ -632,6 +691,7 @@ > %%DATADIR%%/datamodeler/xmlmetadata/TemporaryTablespaceOracle.xml > %%DATADIR%%/datamodeler/xmlmetadata/TemporaryTablespaceOraclev10g.xml > %%DATADIR%%/datamodeler/xmlmetadata/TemporaryTablespaceOraclev9i.xml >+%%DATADIR%%/datamodeler/xmlmetadata/TopView.xml > %%DATADIR%%/datamodeler/xmlmetadata/Transformation.xml > %%DATADIR%%/datamodeler/xmlmetadata/TransformationFlow.xml > %%DATADIR%%/datamodeler/xmlmetadata/TransformationPackage.xml >@@ -879,6 +939,8 @@ > @dirrm %%DATADIR%%/datamodeler/xmlmetadata > @dirrm %%DATADIR%%/datamodeler/types > @dirrm %%DATADIR%%/datamodeler/templates >+@dirrm %%DATADIR%%/datamodeler/samples/Dimensional_model >+@dirrm %%DATADIR%%/datamodeler/samples > @dirrm %%DATADIR%%/datamodeler/reports/xslt/20 > @dirrm %%DATADIR%%/datamodeler/reports/xslt/10 > @dirrm %%DATADIR%%/datamodeler/reports/xslt >@@ -887,7 +949,17 @@ > @dirrm %%DATADIR%%/datamodeler/log > @dirrm %%DATADIR%%/datamodeler/lib > @dirrm %%DATADIR%%/datamodeler/extensions >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/zh_TW >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/zh_CN > @dirrm %%DATADIR%%/datamodeler/doc/welcome/welcomeImages >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/pt_BR >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/ko >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/ja >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/it >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/fr >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/es >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/en >+@dirrm %%DATADIR%%/datamodeler/doc/welcome/de > @dirrm %%DATADIR%%/datamodeler/doc/welcome > @dirrm %%DATADIR%%/datamodeler/doc > @dirrm %%DATADIR%%/datamodeler/bin
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 178497
: 133934