Attachment 193320 Details for Bug 228194 – Patch to update databases/datamodeler port from 17.4.0.355.2121 to 18.1.0.082.1035 version

[patch] Patch to update databases/datamodeler port from 17.4.0.355.2121 to 18.1.0.082.1035 version

0001-databases-datamodeler-update-to-18.1.0.082.1035.patch (text/plain), 5.78 KB, created by Jose G. Juanino on 2018-05-12 11:56:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose G. Juanino

Created: 2018-05-12 11:56:07 UTC

Size: 5.78 KB

patch

obsolete

>From 8cbb102d2702a852ceefb97d4b035995e297bf3a Mon Sep 17 00:00:00 2001
>From: "Jose G. Juanino" <jjuanino@gmail.com>
>Date: Sat, 12 May 2018 13:23:50 +0200
>Subject: [PATCH] databases/datamodeler: update to 18.1.0.082.1035
>
>* Add LICENSE options
>* Add INSTALLS_ICONS
>* Unmute install commands, as suggested by portlint
>
>Release notes:
>
>http://www.oracle.com/technetwork/developer-tools/datamodeler/downloads/dm-relnotes-181-4423853.html
>---
> databases/datamodeler/Makefile  | 30 ++++++++++++++++++------------
> databases/datamodeler/distinfo  |  6 +++---
> databases/datamodeler/pkg-plist |  8 ++++++--
> 3 files changed, 27 insertions(+), 17 deletions(-)
>
>diff --git a/databases/datamodeler/Makefile b/databases/datamodeler/Makefile
>index 1d0bdfe39670..d3281e0759bc 100644
>--- a/databases/datamodeler/Makefile
>+++ b/databases/datamodeler/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	datamodeler
>-PORTVERSION=	17.4.0.355.2121
>+PORTVERSION=	18.1.0.082.1035
> DISTVERSIONSUFFIX=-1
> CATEGORIES=	databases java
> MASTER_SITES=	#http://www.oracle.com/technetwork/developer-tools/datamodeler/downloads/index.html
>@@ -16,7 +16,13 @@ COMMENT=	Database modeling tool
> EXTRACT_DEPENDS=rpm2cpio.pl:archivers/rpm2cpio
> RUN_DEPENDS=	bash:shells/bash
> 
>+#http://www.oracle.com/technetwork/licenses/sqldev-license-152021.html
>+LICENSE_NAME=	OTN
>+LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror
>+
> USE_JAVA=	yes
>+INSTALLS_ICONS=	yes
>+
> JAVA_VERSION=	1.8+
> 
> NO_BUILD=	yes
>@@ -52,30 +58,30 @@ restart this installation.
> .endif
> 
> do-install:
>-	@${ECHO_MSG} -n ">> Installing scripts..."
>-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.script.sh ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
>-	@${ECHO_MSG} " [ DONE ]"
>+	${ECHO_MSG} -n ">> Installing scripts..."
>+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.script.sh ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
>+	${ECHO_MSG} " [ DONE ]"
> 
> .for d in configuration datamodeler dropins dvt equinox external ide \
>     jdbc jdev jlib module modules netbeans rdbms sleepycat \
>     sqldeveloper svnkit
>-	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
>-	@cd ${WRKSRC} && ${FIND} ${d} -type d \
>+	${ECHO_MSG} -n ">> Installing data directory '${d}'..."
>+	cd ${WRKSRC} && ${FIND} ${d} -type d \
> 		-exec ${MKDIR} ${STAGEDIR}/${DATADIR}/\{} \;
>-	@cd ${WRKSRC} && ${FIND} ${d} -type f \
>+	cd ${WRKSRC} && ${FIND} ${d} -type f \
> 		-not -name "*.orig" \
> 		-not -name "*.exe" \
> 		-not -name "*.bak" \
> 		-not -name "*.dll" \
> 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}/${DATADIR}/\{} \;
>-	@${ECHO_MSG} " [ DONE ]"
>+	${ECHO_MSG} " [ DONE ]"
> .endfor
> 
>-	@${ECHO_MSG} -n ">> Installing icon and desktop file ..."
>-	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/applications/ \
>+	${ECHO_MSG} -n ">> Installing icon and desktop file ..."
>+	${MKDIR} ${STAGEDIR}/${PREFIX}/share/applications/ \
> 	    ${STAGEDIR}/${PREFIX}/share/icons/hicolor/128x128/apps/
>-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}/${PREFIX}/share/applications/
>-	@${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${PREFIX}/share/icons/hicolor/128x128/apps/datamodeler.png
>+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}/${PREFIX}/share/applications/
>+	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${PREFIX}/share/icons/hicolor/128x128/apps/datamodeler.png
> 
> 	@${ECHO_MSG} " [ DONE ]"
> 
>diff --git a/databases/datamodeler/distinfo b/databases/datamodeler/distinfo
>index 682c726b4281..1f7d65d9ada5 100644
>--- a/databases/datamodeler/distinfo
>+++ b/databases/datamodeler/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1514743140
>-SHA256 (oracle/datamodeler-17.4.0.355.2121-1.noarch.rpm) = a67d640f70780235a512e18253c2427ea2244d1c88feac103e433f658e17dac7
>-SIZE (oracle/datamodeler-17.4.0.355.2121-1.noarch.rpm) = 192608088
>+TIMESTAMP = 1526077954
>+SHA256 (oracle/datamodeler-18.1.0.082.1035-1.noarch.rpm) = 18d59aa7235992798056ad0c7b3c78c76e82ca0d0f4d14b1a5c956545a70bda4
>+SIZE (oracle/datamodeler-18.1.0.082.1035-1.noarch.rpm) = 193962744
>diff --git a/databases/datamodeler/pkg-plist b/databases/datamodeler/pkg-plist
>index 299c4df6b260..16dccbc5941b 100644
>--- a/databases/datamodeler/pkg-plist
>+++ b/databases/datamodeler/pkg-plist
>@@ -790,6 +790,8 @@ share/icons/hicolor/128x128/apps/datamodeler.png
> %%DATADIR%%/external/oracle.adf-share-base.jar
> %%DATADIR%%/external/oracle.adf-share-ca.jar
> %%DATADIR%%/external/oracle.db-ca.jar
>+%%DATADIR%%/external/oracle.dbtools.http.jar
>+%%DATADIR%%/external/oracle.dbtools.net.jar
> %%DATADIR%%/external/oracle.dvt-jclient-reports.jar
> %%DATADIR%%/external/oracle.dvt-jclient.jar
> %%DATADIR%%/external/oracle.dvt-utils.jar
>@@ -864,6 +866,7 @@ share/icons/hicolor/128x128/apps/datamodeler.png
> %%DATADIR%%/external/oracle.jewt-olaf2.jar
> %%DATADIR%%/external/oracle.orahelp-helpshare.jar
> %%DATADIR%%/external/oracle.orahelp-ohj.jar
>+%%DATADIR%%/external/oracle.sqldeveloper.utils-nodeps.jar
> %%DATADIR%%/external/oracle.xmlef.jar
> %%DATADIR%%/ide/bin/SplashFontBranding.png
> %%DATADIR%%/ide/bin/edt.properties
>@@ -1688,6 +1691,9 @@ share/icons/hicolor/128x128/apps/datamodeler.png
> %%DATADIR%%/sqldeveloper/lib/commons-collections4.jar
> %%DATADIR%%/sqldeveloper/lib/commons-logging.jar
> %%DATADIR%%/sqldeveloper/lib/curvesapi.jar
>+%%DATADIR%%/sqldeveloper/lib/dbtools-common.jar
>+%%DATADIR%%/sqldeveloper/lib/dbtools-http.jar
>+%%DATADIR%%/sqldeveloper/lib/dbtools-net.jar
> %%DATADIR%%/sqldeveloper/lib/emapi.jar
> %%DATADIR%%/sqldeveloper/lib/hk2-api.jar
> %%DATADIR%%/sqldeveloper/lib/hk2-locator.jar
>@@ -1714,8 +1720,6 @@ share/icons/hicolor/128x128/apps/datamodeler.png
> %%DATADIR%%/sqldeveloper/lib/log4j-api.jar
> %%DATADIR%%/sqldeveloper/lib/log4j-core.jar
> %%DATADIR%%/sqldeveloper/lib/low-level-api.jar
>-%%DATADIR%%/sqldeveloper/lib/oracle.dbtools-common.jar
>-%%DATADIR%%/sqldeveloper/lib/oracle.dbtools.http.jar
> %%DATADIR%%/sqldeveloper/lib/oracle.sqldeveloper.jfx-nodeps.jar
> %%DATADIR%%/sqldeveloper/lib/oraclepki.jar
> %%DATADIR%%/sqldeveloper/lib/osdt_cert.jar
>-- 
>2.16.3
>

Actions: View | Diff

Attachments on bug 228194: 193320