- Upgrade to 4.4.0;

- Add support of science/cdf;

- Add support of JavaDX;

- Options seems uncompatible with USE_JAVA, remove it.

5 files changed, 113 insertions, 22 deletions

diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 993fbed171f4..a2d35f24df79 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	opendx
-PORTVERSION=	4.3.2
-PORTREVISION=	5
+PORTVERSION=	4.4.0
 CATEGORIES=	graphics math
 MASTER_SITES=	http://opendx.npaci.edu/source/
 DISTNAME=	dx-${PORTVERSION}
@@ -16,49 +15,86 @@ DISTNAME=	dx-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick \
-		tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick	\
+		tiff.4:${PORTSDIR}/graphics/tiff		\
+		cdf.0:${PORTSDIR}/science/cdf
 
-OPTIONS=	HDF "Build hdf-support (only hdf OR netcdf is supported)" on \
-		NETCDF "Build netcdf-support" off
-
-USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_GL=		yes
 USE_MOTIF=	yes
 USE_XLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--without-javadx
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV=	ARCH="${OPSYS:L}" \
 		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 NO_MTREE=	yes
 PLIST_SUB=	ARCH=${OPSYS:L}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-PLIST_SUB+=	UNAMEP=${ARCH} ARCHDIR=""
-.else
-PLIST_SUB+=	UNAMEP=${OPSYS:L} ARCHDIR="@comment "
+.if !defined(WITHOUT_HDF) && defined(WITH_NETCDF)
+BROKEN=	HDF and NETCDF are conflicting
 .endif
 
-.if defined(WITH_HDF)
+.if !defined(WITHOUT_HDF)
 LIB_DEPENDS+=	mfhdf.2:${PORTSDIR}/science/hdf
+.else
+CONFIGURE_ARGS+=	--without-hdf
 .endif
 
 .if defined(WITH_NETCDF)
 LIB_DEPENDS+=	netcdf.1:${PORTSDIR}/math/netcdf
+.else
+CONFIGURE_ARGS+=	--without-netcdf
+.endif
+
+.if !defined(WITHOUT_JAVA)
+USE_JAVA=	1.3+
+BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer
+RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer
+CONFIGURE_ARGS+=	--with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar	\
+			--with-java40jar-path=${JAVALIBDIR}/java40.jar
+PLIST_SUB+=	JAVA=""
+DIR2PRUNE=	dx/java/user dx/java/server/nets
+.else
+CONFIGURE_ARGS+=	--without-javadx
+PLIST_SUB+=	JAVA="@comment "
 .endif
 
-post-patch:
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 502126
+PLIST_SUB+=	UNAMEP=${ARCH} ARCHDIR=""
+.else
+PLIST_SUB+=	UNAMEP=${OPSYS:L} ARCHDIR="@comment "
+.endif
+
+pre-configure:
 	@${RM} -f ${WRKSRC}/include/stamp-h.in
 .for dir in doc help html man
 	@${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \
 		${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
 .endfor
+	${REINPLACE_CMD} -e "s;-lpthread;${PTHREAD_LIBS};g"	\
+		-e "s;/usr/X11R6;${X11BASE};g"			\
+		${WRKSRC}/configure
+
+post-install:
+	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
+.if !defined(WITHOUT_JAVA)
+	@${RM} ${PREFIX}/dx/java/server/bin/startserver.bat
+	@${TOUCH} ${DIR2PRUNE:S|^|${PREFIX}/|:S|$|/.keepme|}
+	@${ECHO} "---------------------------------------------------------"	\
+		>> ${PKGMESSAGE}
+	@${ECHO} "Before starting ${PREFIX}/dx/java/server/bin/startserver"	\
+		>> ${PKGMESSAGE}
+	@${ECHO} "you must install the port graphics/opendx-samples."		\
+		>> ${PKGMESSAGE}
+.endif
+	@${ECHO} "---------------------------------------------------------"	\
+		>> ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/opendx/distinfo b/graphics/opendx/distinfo
index 371236632ef4..000d90f4c838 100644
--- a/graphics/opendx/distinfo
+++ b/graphics/opendx/distinfo
@@ -1,3 +1,3 @@
-MD5 (dx-4.3.2.tar.gz) = 201afdd86a5ddcfda0dc60fc7b6d3fea
-SHA256 (dx-4.3.2.tar.gz) = e128562b952687e988b93e36a59af2aa5aaf6d491a88d583fce89d3979e96515
-SIZE (dx-4.3.2.tar.gz) = 9904514
+MD5 (dx-4.4.0.tar.gz) = b72b312c1e7aeeb56bc85e996307d7f5
+SHA256 (dx-4.4.0.tar.gz) = 8496e3ae5ee8f6968c7e3b1f9091819c312a897dce8ddd23426bd71772266373
+SIZE (dx-4.4.0.tar.gz) = 10067855
diff --git a/graphics/opendx/files/patch-bin_url_handler.sh b/graphics/opendx/files/patch-bin_url_handler.sh
new file mode 100644
index 000000000000..3495ad720da9
--- /dev/null
+++ b/graphics/opendx/files/patch-bin_url_handler.sh
@@ -0,0 +1,13 @@
+--- ./bin/url_handler.sh.orig	Thu Apr 11 01:32:54 2002
++++ ./bin/url_handler.sh	Sat Jan 28 15:27:41 2006
+@@ -39,8 +39,8 @@
+ 		if [ $use_xbrowser = n ]; then
+ 			lynx "$url" 
+ 		else
+-			netscape -remote "openURL($url)" 2> /dev/null || \
+-			(netscape "$url" &)
++			$BROWSER -remote "openURL($url)" 2> /dev/null || \
++			($BROWSER "$url" &)
+                 fi
+ 		;;
+ esac
diff --git a/graphics/opendx/files/pkg-message.in b/graphics/opendx/files/pkg-message.in
new file mode 100644
index 000000000000..a60be631967e
--- /dev/null
+++ b/graphics/opendx/files/pkg-message.in
@@ -0,0 +1,10 @@
+---------------------------------------------------------
+
+If you cannot connect to dxexec, try this:
+
+# Start the user interface by typing "dx -uionly &"
+# Start the executive by typing "dx -execonly &"
+# Use the connect menu in the user interface to "Connect
+to server", click the Options button, and select connect
+to already running server.
+
diff --git a/graphics/opendx/pkg-plist b/graphics/opendx/pkg-plist
index 6c521b4d4e47..8f12666a9b9f 100644
--- a/graphics/opendx/pkg-plist
+++ b/graphics/opendx/pkg-plist
@@ -2234,6 +2234,20 @@ dx/include/dx/xform.h
 dx/include/dxconfig.h
 dx/include/dxl.h
 dx/include/dxstereo.h
+%%JAVA%%dx/java/htmlpages/dx.jar
+%%JAVA%%dx/java/output/README.output
+%%JAVA%%dx/java/server/bin/dxserver.paths
+%%JAVA%%dx/java/server/bin/startserver
+%%JAVA%%dx/java/server/bin/stopserver
+%%JAVA%%dx/java/server/class/dxserver.paths
+%%JAVA%%dx/java/server/class/server.jar
+%%JAVA%%dx/java/server/dxmacros/dxmac.net
+%%JAVA%%dx/java/server/dxmacros/gifmac.net
+%%JAVA%%dx/java/server/dxmacros/vrmlmac.net
+%%JAVA%%dx/java/server/dxmacros/weboptionsmac.net
+%%JAVA%%dx/java/server/lib_%%ARCH%%/libAnyDX.so
+%%JAVA%%dx/java/server/nets/.keepme
+%%JAVA%%dx/java/user/.keepme
 dx/lib/colors.txt
 dx/lib/dx.mdf
 dx/lib/dxexec.def
@@ -2246,9 +2260,17 @@ dx/lib/mdf2c.awk
 dx/lib/messages
 dx/lib/outboard.c
 dx/lib_%%ARCH%%/libDX.a
+dx/lib_%%ARCH%%/libDX.so
+dx/lib_%%ARCH%%/libDX.so.4
 dx/lib_%%ARCH%%/libDXL.a
+dx/lib_%%ARCH%%/libDXL.so
+dx/lib_%%ARCH%%/libDXL.so.4
 dx/lib_%%ARCH%%/libDXcallm.a
+dx/lib_%%ARCH%%/libDXcallm.so
+dx/lib_%%ARCH%%/libDXcallm.so.4
 dx/lib_%%ARCH%%/libDXlite.a
+dx/lib_%%ARCH%%/libDXlite.so
+dx/lib_%%ARCH%%/libDXlite.so.4
 dx/lib_%%UNAMEP%%/arch.mak
 dx/man/catl/dx.l
 dx/man/manl/dx.l
@@ -2304,6 +2326,16 @@ dx/ui/viewer.net
 %%ARCHDIR%%@dirrm dx/lib_%%UNAMEP%%
 @dirrm dx/lib_%%ARCH%%
 @dirrm dx/lib
+%%JAVA%%@dirrm dx/java/user
+%%JAVA%%@dirrm dx/java/server/nets
+%%JAVA%%@dirrm dx/java/server/lib_%%ARCH%%
+%%JAVA%%@dirrm dx/java/server/dxmacros
+%%JAVA%%@dirrm dx/java/server/class
+%%JAVA%%@dirrm dx/java/server/bin
+%%JAVA%%@dirrm dx/java/server
+%%JAVA%%@dirrm dx/java/output
+%%JAVA%%@dirrm dx/java/htmlpages
+%%JAVA%%@dirrm dx/java
 @dirrm dx/include/dx
 @dirrm dx/include
 @dirrm dx/html/pages