Upgrading to 4.0.0.833.

PR:		ports/178497
Submitted by:	José García Juanino <jjuanino (at) gmail.com>

databases/datamodeler/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	datamodeler
-PORTVERSION=	3.1.0.700
+PORTVERSION=	4.0.0.833
 DISTVERSIONSUFFIX=-1
 CATEGORIES=	databases java
 MASTER_SITES=	#http://www.oracle.com/technetwork/developer-tools/datamodeler/downloads/index.html
@@ -13,12 +13,12 @@ DIST_SUBDIR=	oracle
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Database modeling tool
 
-EXTRACT_DEPENDS=rpm:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 
 NO_BUILD=	yes
 
@@ -27,11 +27,12 @@ NO_CDROM=	Packaging prohibited by Oracle license
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/opt/${PORTNAME}
+SUB_FILES=	${PORTNAME}.script.sh
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	readme.html
 .endif
 
@@ -40,58 +41,44 @@ IGNORE=		tarball will not extract
 .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
+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
 
-.if defined(DISTFILE_INSTRUCTIONS)
-.if defined(PACKAGE_BUILDING)
-IGNORE=		requires manual fetch
-.else
-pre-fetch:
-	@${PRINTF} "${DISTFILE_INSTRUCTIONS}"
-	@exit 1
-.endif
-.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}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.script.sh ${STAGEDIR}/${LOCALBASE}/bin/${PORTNAME}
 	@${ECHO_MSG} " [ DONE ]"
 
-.for d in datamodeler ide jdbc jdev jlib modules rdbms sleepycat \
-    sqldeveloper timingframework
+.for d in configuration datamodeler dropins dvt equinox external ide \
+    jdbc jdev jlib modules netbeans rdbms sleepycat \
+    sqldeveloper svnkit
 	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	@cd ${WRKSRC} && ${FIND} ${d} -type d \
-		-not -path "jdev/extensions/oracle.jdeveloper.subversion/licenses" \
-		-exec ${MKDIR} ${DATADIR}/\{} \;
+		-exec ${MKDIR} ${STAGEDIR}/${DATADIR}/\{} \;
 	@cd ${WRKSRC} && ${FIND} ${d} -type f \
 		-not -name "*.orig" \
 		-not -name "*.exe" \
 		-not -name "*.bat" \
 		-not -name "*.bak" \
 		-not -name "*.dll" \
-		-not -path "jdev/extensions/oracle.jdeveloper.subversion/licenses/*" \
-		-exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \;
+		-exec ${INSTALL_DATA} \{} ${STAGEDIR}/${DATADIR}/\{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}/readme.html ${DOCSDIR}
+	@${ECHO_MSG} -n ">> Installing icon ..."
+	@${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${DATADIR}/icon.png
+	@${ECHO_MSG} " [ DONE ]"
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/readme.html ${STAGEDIR}/${DOCSDIR}/
 .endif
 
 .include <bsd.port.post.mk>

databases/datamodeler/distinfo

@@ -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-4.0.0.833-1.noarch.rpm) = 180699f5d88f2159df58d8884ec9569e4359ce1dd25eb72a88f72cb8b5e918c8
+SIZE (oracle/datamodeler-4.0.0.833-1.noarch.rpm) = 171048140