- update to 4.0.0.13.80

- add stage support

PR:		186568
Submitted by:	Jose Garcia Juanino <jjuanino@gmail.com> (maintainer)

databases/sqldeveloper/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqldeveloper
-PORTVERSION=	3.2.20.09.87
+PORTVERSION=	4.0.0.13.80
 DISTVERSIONSUFFIX=-no-jre
 CATEGORIES=	databases java
 MASTER_SITES=	#http://www.oracle.com/technology/software/products/sql/index.html
@@ -16,24 +16,18 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 USE_ZIP=	yes
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 
 NO_BUILD=	yes
 
 RESTRICTED=	Packaging prohibited by Oracle license
-NO_CDROM=	Packaging prohibited by Oracle license
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} PORTNAME=${PORTNAME}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	readme.html
-.endif
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	Due to Oracle license restrictions, you must fetch the source \
@@ -48,40 +42,31 @@ restart this installation
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing scripts..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	@${ECHO_MSG} " [ DONE ]"
 
-.for d in dataminer jdbc jviews sleepycat timingframework \
+.for d in configuration dataminer dropins dvt equinox \
-    ide jdev modules sqldeveloper javavm jlib rdbms sqlj
+    external ide javavm jdbc jdev jlib jviews modules \
+    netbeans rdbms sleepycat sqldeveloper sqlj svnkit
 	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	@cd ${WRKSRC} && ${FIND} ${d} -type d \
-		-not -path "jdev/extensions/oracle.jdeveloper.subversion/licenses" \
+		-exec ${MKDIR} ${STAGEDIR}/${DATADIR}/\{} \;
-		-exec ${MKDIR} ${DATADIR}/\{} \;
+	cd ${WRKSRC} && ${FIND} ${d} -type f \
-	@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} \{} ${STAGEDIR}/${DATADIR}/\{} \;
-		-exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
-.for f in jdev.label view-source-paths.lis
+	${INSTALL_DATA} ${WRKSRC}/view-source-paths.lis ${STAGEDIR}/${DATADIR}/view-source-paths.lis
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/${f}
-.endfor
-
 	@${ECHO_MSG} -n ">> Installing icon ..."
-	@${INSTALL_DATA} ${WRKSRC}/icon.png ${DATADIR}/icon.png
+	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${DATADIR}/icon.png
 	@${ECHO_MSG} " [ DONE ]"
 
-.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} readme.html ${STAGEDIR}/${DOCSDIR})
-	@cd ${WRKSRC} && ${INSTALL_DATA} readme.html ${DOCSDIR}
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

databases/sqldeveloper/distinfo

@@ -1,2 +1,2 @@
-SHA256 (oracle/sqldeveloper-3.2.20.09.87-no-jre.zip) = 787b703a3fa2d7969ae486b9f2f23bdafd31242b2af74257943cf826c535c8d4
+SHA256 (oracle/sqldeveloper-4.0.0.13.80-no-jre.zip) = d8b78977ec119c94af20ff1d83f872ad6bd4ae374fa2b70bd8695f7d7ab971e2
-SIZE (oracle/sqldeveloper-3.2.20.09.87-no-jre.zip) = 182052759
+SIZE (oracle/sqldeveloper-4.0.0.13.80-no-jre.zip) = 235271162

databases/sqldeveloper/files/sqldeveloper.sh.in

@@ -4,4 +4,4 @@
 #
 
 cd %%DATADIR%%/%%PORTNAME%%/bin
-JAVA_VERSION="%%JAVA_VERSION%%" JAVA_HOME="%%JAVA_HOME%%" exec %%LOCALBASE%%/bin/bash %%PORTNAME%% $*
+JAVA_HOME="%%JAVA_HOME%%" exec %%LOCALBASE%%/bin/bash %%PORTNAME%% $*

databases/sqldeveloper/pkg-message

@@ -6,17 +6,17 @@ Note for Oracle users:
     $ORACLE_HOME/network/admin/ directory a valid tnsnames.ora services file.
     Alternatively, you can set TNS_ADMIN to point out directly to that
     tnsnames.ora file.
-    
+
     After that choose "TNS" as "Connection Type" when you are going to add a
     new connection database.
 
 
 Note for MySQL users:
-    
+
     If you have enabled mysql support, it is needed to point out to SQL
     Developer where the MySQL JDBC classes are. Go to Tools -> Preferences
     menu, select Database -> Third Party JDBC Drivers and add the proper jar.
     Do not install 5.1 version of mysql jdbc connector; see
-    http://docs.oracle.com/cd/E35137_01/doc.32/e35119/install.htm#CIHDHHHJ
+    http://docs.oracle.com/cd/E39885_01/doc.40/e38928/install.htm#RPTIG129
 
 ************************************************************************