diff --git a/dx-null.patch b/dx-null.patch
new file mode 100644
index 0000000..5d3022a
--- /dev/null
+++ b/dx-null.patch
@@ -0,0 +1,14 @@
+diff -up dx-4.4.4/src/exec/libdx/xwindow.c.null dx-4.4.4/src/exec/libdx/xwindow.c
+--- dx-4.4.4/src/exec/libdx/xwindow.c.null	2000-06-12 07:45:40.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/xwindow.c	2009-11-08 15:10:13.000000000 +0100
+@@ -29,7 +29,9 @@ Error
+ DXRegisterWindowHandlerWithCheckProc(Error (*proc) (int, Pointer),
+ 		int (*check)(int, Pointer), Display *d, Pointer arg)
+ {
+-    int fd = ConnectionNumber(d);
++    int fd;
++    if (d) fd = ConnectionNumber(d);
++    else return ERROR;
+ 
+     if (! DXRegisterInputHandlerWithCheckProc(proc, check, fd, arg))
+ 	return ERROR;
diff --git a/dx-rpm.patch b/dx-rpm.patch
index 9286482..202db77 100644
--- a/dx-rpm.patch
+++ b/dx-rpm.patch
@@ -1,6 +1,6 @@
 diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in
 --- dx-4.4.4/bin/dx.in.r	2004-05-31 18:12:05.000000000 +0200
-+++ dx-4.4.4/bin/dx.in	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/bin/dx.in	2009-11-06 11:47:32.190944177 +0100
 @@ -60,14 +60,7 @@ exit 1
  #
  longhelp() {
@@ -107,7 +107,7 @@ diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in
      cmd2="cp $CfgName ${EncodedBase}.cfg"
 diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am
 --- dx-4.4.4/bin/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.4/bin/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/bin/Makefile.am	2009-11-06 11:47:32.192943219 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -118,7 +118,7 @@ diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am
  EXTRA_SCRIPTS = mdf2c dx
 diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in
 --- dx-4.4.4/bin/mdf2c.in.r	1999-12-14 05:13:04.000000000 +0100
-+++ dx-4.4.4/bin/mdf2c.in	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/bin/mdf2c.in	2009-11-06 11:47:32.194943239 +0100
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # Configure is looking for the following line
@@ -129,7 +129,7 @@ diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in
  
 diff -up dx-4.4.4/bin/url_handler.sh.r dx-4.4.4/bin/url_handler.sh
 --- dx-4.4.4/bin/url_handler.sh.r	2002-04-11 01:32:54.000000000 +0200
-+++ dx-4.4.4/bin/url_handler.sh	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/bin/url_handler.sh	2009-11-06 11:47:32.195942515 +0100
 @@ -39,8 +39,8 @@ case $method in
  		if [ $use_xbrowser = n ]; then
  			lynx "$url" 
@@ -143,8 +143,16 @@ diff -up dx-4.4.4/bin/url_handler.sh.r dx-4.4.4/bin/url_handler.sh
  esac
 diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac
 --- dx-4.4.4/configure.ac.r	2006-08-21 23:56:08.000000000 +0200
-+++ dx-4.4.4/configure.ac	2008-09-24 19:14:35.000000000 +0200
-@@ -677,7 +677,7 @@ if test "$ARCH" = "intelnt" ; then
++++ dx-4.4.4/configure.ac	2009-11-06 12:00:44.912941875 +0100
+@@ -218,6 +218,7 @@ AC_DEFINE_UNQUOTED(BSH, "$bsh_path", [Pa
+ dnl End of command line options configuration
+ 
+ dnl Start DX configuration
++AC_PROG_CXX
+ AC_LANG([C++])
+ AC_CHECK_HEADERS(stdlib.h)
+ AC_LANG([C])
+@@ -677,7 +678,7 @@ if test "$ARCH" = "intelnt" ; then
      fi
  dnl -- check for unix
  else
@@ -153,7 +161,7 @@ diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac
      AC_MSG_CHECKING(if HDF package is complete)
      if test $passed -gt 0
      then
-@@ -686,7 +686,7 @@ else
+@@ -686,7 +687,7 @@ else
  	AC_MSG_RESULT(no -- some components failed test)
          have_hdf='no (failed tests)'
      else
@@ -162,27 +170,48 @@ diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac
  	LIBS="$LIB_HDF $LIBS"
  	FMT_LIBS="$FMT_LIBS libdf.a"
  	AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries])
-@@ -766,8 +766,8 @@ then
+@@ -766,7 +767,7 @@ then
      AS_MESSAGE([checking for NETCDF support ......])
      failed=0;
      passed=0;
 -    AC_CHECK_HEADER(netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
--    AC_CHECK_LIB(netcdf,nc_copy_att,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-+    AC_CHECK_HEADER(netcdf-3/netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
-+    AC_CHECK_LIB(netcdf,nc_copy_att,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -L$libdir/netcdf-3 ])
++    AC_CHECK_HEADER(netcdf/netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+     AC_CHECK_LIB(netcdf,nc_copy_att,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
      AC_MSG_CHECKING(if NETCDF package is complete)
      if test $passed -gt 0
+@@ -801,6 +802,9 @@ then
+ 
+     failed=0;
+     passed=0;
++    CFLAGS="$CFLAGS -I/usr/include/ImageMagick"
++    CXXFLAGS="$CXXFLAGS -I/usr/include/ImageMagick"
++    CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick"
+     AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ if test "$ARCH" = "intelnt" ; then
+     AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+@@ -835,8 +839,8 @@ dnl routine. This allows us to simplify 
+ dnl format configuration libraries.
+ 
+  if test "$HAVE_MC" = "yes" ; then
+-    LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`"
+-    AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
++    LIB_MAGICK="`MagickCore-config --ldflags` `MagickCore-config --libs`"
++    AC_CHECK_LIB(MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
+     AC_MSG_CHECKING(if ImageMagick package is complete)
+     if test $passed -gt 0
      then
-@@ -776,7 +776,7 @@ then
- 	AC_MSG_RESULT(no -- some components failed test)
-         have_netcdf='no (failed tests)'
+@@ -846,8 +850,8 @@ dnl format configuration libraries.
+         have_magick='no (failed tests)'
      else
--	LIB_NETCDF='-lnetcdf'
-+	LIB_NETCDF="-lnetcdf -L$libdir/netcdf-3"
- 	LIBS="$LIB_NETCDF $LIBS"
- 	FMT_LIBS="$FMT_LIBS libnetcdf.a"
- 	AC_DEFINE(HAVE_LIBNETCDF, 1, [Define to 1 if you have the NetCDF libraries])
-@@ -1011,7 +1011,7 @@ DX_CHECK_HEADERS( \
+ dnl	CFLAGS="`Magick-config --cflags` $CFLAGS"
+-	CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS"
+-	LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`"
++	CPPFLAGS="`MagickCore-config --cppflags` $CPPFLAGS"
++	LIB_MAGICK="$LIBS `MagickCore-config --ldflags` `MagickCore-config --libs`"
+ dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
+ 	AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS)
+ 	FMT_LIBS="$FMT_LIBS libMagick.a"
+@@ -1011,7 +1015,7 @@ DX_CHECK_HEADERS( \
    Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \
    Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \
    gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \
@@ -193,7 +222,7 @@ diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac
    sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \
 diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am
 --- dx-4.4.4/doc/Makefile.am.r	1999-04-05 13:57:03.000000000 +0200
-+++ dx-4.4.4/doc/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/doc/Makefile.am	2009-11-06 11:47:32.203697175 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -204,7 +233,7 @@ diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am
  	README README_SMP README_alphax README_aviion README_hp700 \
 diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am
 --- dx-4.4.4/fonts/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.4/fonts/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/fonts/Makefile.am	2009-11-06 11:47:32.204697430 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -215,7 +244,7 @@ diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am
  	README area.dx cyril_d.dx \
 diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am
 --- dx-4.4.4/help/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
-+++ dx-4.4.4/help/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/help/Makefile.am	2009-11-06 11:47:32.206696961 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -243,7 +272,7 @@ diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am
  	'
 diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am
 --- dx-4.4.4/html/images/Makefile.am.r	2002-04-01 10:51:13.000000000 +0200
-+++ dx-4.4.4/html/images/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/html/images/Makefile.am	2009-11-06 11:47:32.214944415 +0100
 @@ -1,5 +1,5 @@
  
 -imagesdir = $(prefix)/dx/html/images
@@ -253,7 +282,7 @@ diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am
  	3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif		\
 diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am
 --- dx-4.4.4/html/Makefile.am.r	2003-07-12 02:11:39.000000000 +0200
-+++ dx-4.4.4/html/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/html/Makefile.am	2009-11-06 11:47:32.216944434 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -264,7 +293,7 @@ diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am
  
 diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am
 --- dx-4.4.4/html/pages/Makefile.am.r	2002-06-20 06:38:03.000000000 +0200
-+++ dx-4.4.4/html/pages/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/html/pages/Makefile.am	2009-11-06 11:47:32.217945666 +0100
 @@ -1,4 +1,4 @@
 -pagesdir = $(prefix)/dx/html/pages
 +pagesdir = $(datadir)/dx/html/pages
@@ -273,7 +302,7 @@ diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am
  	insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
 diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am
 --- dx-4.4.4/include/dx/Makefile.am.r	1999-05-26 01:35:16.000000000 +0200
-+++ dx-4.4.4/include/dx/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/include/dx/Makefile.am	2009-11-06 11:47:32.222944494 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -284,7 +313,7 @@ diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am
  	UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
 diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am
 --- dx-4.4.4/include/Makefile.am.r	2006-04-09 05:44:49.000000000 +0200
-+++ dx-4.4.4/include/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/include/Makefile.am	2009-11-06 11:47:32.224942558 +0100
 @@ -1,4 +1,4 @@
 -dxincdir = $(prefix)/dx/include
 +dxincdir = $(prefix)/include
@@ -293,7 +322,7 @@ diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am
  nodist_dxinc_HEADERS = dxconfig.h
 diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am
 --- dx-4.4.4/lib/Makefile.am.r	2003-08-22 01:22:13.000000000 +0200
-+++ dx-4.4.4/lib/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/lib/Makefile.am	2009-11-06 11:47:32.225944279 +0100
 @@ -1,4 +1,4 @@
 -libsdir = $(prefix)/dx/lib
 +libsdir = $(datadir)/dx/lib
@@ -302,7 +331,7 @@ diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am
  	dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c
 diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am
 --- dx-4.4.4/man/Makefile.am.r	1999-04-03 18:31:28.000000000 +0200
-+++ dx-4.4.4/man/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/man/Makefile.am	2009-11-06 11:47:32.227944298 +0100
 @@ -1,4 +1,4 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -311,7 +340,7 @@ diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am
  
 diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am
 --- dx-4.4.4/man/manl/Makefile.am.r	2002-05-20 06:47:06.000000000 +0200
-+++ dx-4.4.4/man/manl/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/man/manl/Makefile.am	2009-11-06 11:47:32.228944553 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -322,7 +351,7 @@ diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am
  EXTRA_DIST = $(man_MANS)
 diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am
 --- dx-4.4.4/src/exec/dxexec/Makefile.am.r	2006-01-11 17:24:39.000000000 +0100
-+++ dx-4.4.4/src/exec/dxexec/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/exec/dxexec/Makefile.am	2009-11-06 11:47:32.229944807 +0100
 @@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la
  libDXEXEC_la_SOURCES = main.c
  libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
@@ -334,7 +363,7 @@ diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefil
  dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
 diff -up dx-4.4.4/src/exec/dxmods/local.mk.in.r dx-4.4.4/src/exec/dxmods/local.mk.in
 --- dx-4.4.4/src/exec/dxmods/local.mk.in.r	2003-07-12 02:12:06.000000000 +0200
-+++ dx-4.4.4/src/exec/dxmods/local.mk.in	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/local.mk.in	2009-11-06 11:47:32.231945316 +0100
 @@ -14,23 +14,23 @@ user.c:  dx.mdf
  
  dxcm.mdf:  ${srcdir}/dxmdf.src
@@ -370,12 +399,12 @@ diff -up dx-4.4.4/src/exec/dxmods/local.mk.in.r dx-4.4.4/src/exec/dxmods/local.m
  	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
 diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefile.am
 --- dx-4.4.4/src/exec/dxmods/Makefile.am.r	2003-08-19 00:51:10.000000000 +0200
-+++ dx-4.4.4/src/exec/dxmods/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/Makefile.am	2009-11-06 11:47:32.233940447 +0100
 @@ -1,8 +1,9 @@
  ## Process this file with automake to produce Makefile.in
  
  INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@
-+INCLUDES+=-I/usr/include/netcdf-3
++INCLUDES+= -I/usr/include/netcdf
  
 -dxmdfdir = $(prefix)/dx/lib
 +dxmdfdir = $(datadir)/dx/lib
@@ -393,7 +422,7 @@ diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefil
  HEADERS1 = \
 diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am
 --- dx-4.4.4/src/exec/libdx/Makefile.am.r	2006-03-27 20:56:53.000000000 +0200
-+++ dx-4.4.4/src/exec/libdx/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/Makefile.am	2009-11-06 11:47:32.234939235 +0100
 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
  #INCLUDES = -I../../../include  -D@ARCH@
  INCLUDES = -I${top_srcdir}/include  -D@ARCH@
@@ -405,7 +434,7 @@ diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.
  #dxlib_LIBRARIES = libDXlite.a 
 diff -up dx-4.4.4/src/exec/libdx/memory.c.r dx-4.4.4/src/exec/libdx/memory.c
 --- dx-4.4.4/src/exec/libdx/memory.c.r	2006-08-21 18:42:42.000000000 +0200
-+++ dx-4.4.4/src/exec/libdx/memory.c	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/memory.c	2009-11-06 11:47:32.235941444 +0100
 @@ -66,7 +66,6 @@
  
  #if linux
@@ -416,7 +445,7 @@ diff -up dx-4.4.4/src/exec/libdx/memory.c.r dx-4.4.4/src/exec/libdx/memory.c
  
 diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am
 --- dx-4.4.4/src/exec/Makefile.am.r	2003-09-17 00:40:40.000000000 +0200
-+++ dx-4.4.4/src/exec/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/exec/Makefile.am	2009-11-06 11:47:32.236940232 +0100
 @@ -1,6 +1,6 @@
  SUBDIRS = libdx dxmods hwrender dpexec dxexec
  
@@ -427,7 +456,7 @@ diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am
  MINOR_VERSION=@MINOR_VERSION@
 diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am
 --- dx-4.4.4/src/misc/Makefile.am.r	2003-07-12 02:12:13.000000000 +0200
-+++ dx-4.4.4/src/misc/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/misc/Makefile.am	2009-11-06 11:47:32.236940232 +0100
 @@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR
  
  dxbindir = $(prefix)/bin
@@ -446,7 +475,7 @@ diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am
  	fi
 diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am
 --- dx-4.4.4/src/uipp/dxl/Makefile.am.r	2003-07-12 02:12:16.000000000 +0200
-+++ dx-4.4.4/src/uipp/dxl/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/dxl/Makefile.am	2009-11-06 11:47:32.236940232 +0100
 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
  
  INCLUDES = -I${top_srcdir}/include  -D@ARCH@
@@ -458,7 +487,7 @@ diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am
  	dxlP.h \
 diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am
 --- dx-4.4.4/src/uipp/dxui/Makefile.am.r	2003-07-12 02:12:17.000000000 +0200
-+++ dx-4.4.4/src/uipp/dxui/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/dxui/Makefile.am	2009-11-06 11:47:32.237940486 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@
@@ -470,7 +499,7 @@ diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am
  
 diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am
 --- dx-4.4.4/src/uipp/java/Makefile.am.r	2006-03-27 20:06:09.000000000 +0200
-+++ dx-4.4.4/src/uipp/java/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/java/Makefile.am	2009-11-06 11:47:32.238939763 +0100
 @@ -27,12 +27,12 @@
  ## libtool and the -shrext flag to make this much more 
  ## portable.
@@ -489,7 +518,7 @@ diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am
  SUBDIRS = server dx layout
 diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/java/server/macros/Makefile.am
 --- dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r	1999-07-09 21:25:13.000000000 +0200
-+++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am	2009-11-06 11:47:32.238939763 +0100
 @@ -1,6 +1,6 @@
  ##  Process this file with automake to produce Makefile.in
  
@@ -500,7 +529,7 @@ diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/ja
  
 diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/server/Makefile.am
 --- dx-4.4.4/src/uipp/java/server/Makefile.am.r	2001-05-21 16:47:39.000000000 +0200
-+++ dx-4.4.4/src/uipp/java/server/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/java/server/Makefile.am	2009-11-06 11:47:32.238939763 +0100
 @@ -1,6 +1,6 @@
 -srvbindir = $(prefix)/dx/java/server/bin
 -srvoutputdir = $(prefix)/dx/java/output
@@ -513,7 +542,7 @@ diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/serv
  srvrundir = $(srvbindir)/../class
 diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am
 --- dx-4.4.4/src/uipp/mb/Makefile.am.r	2003-08-20 16:21:33.000000000 +0200
-+++ dx-4.4.4/src/uipp/mb/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Makefile.am	2009-11-06 11:47:32.239939528 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@
@@ -525,7 +554,7 @@ diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am
  
 diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am
 --- dx-4.4.4/src/uipp/prompter/Makefile.am.r	2003-11-04 05:20:14.000000000 +0100
-+++ dx-4.4.4/src/uipp/prompter/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/Makefile.am	2009-11-06 11:47:32.239939528 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES =  -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@
@@ -537,7 +566,7 @@ diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Mak
  
 diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am
 --- dx-4.4.4/src/uipp/startup/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
-+++ dx-4.4.4/src/uipp/startup/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Makefile.am	2009-11-06 11:47:32.240940272 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES =  -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
@@ -549,7 +578,7 @@ diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makef
  
 diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am
 --- dx-4.4.4/src/uipp/tutor/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
-+++ dx-4.4.4/src/uipp/tutor/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Makefile.am	2009-11-06 11:47:32.240940272 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
@@ -561,7 +590,7 @@ diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.
  
 diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am
 --- dx-4.4.4/src/uipp/ui/Makefile.am.r	2001-04-12 16:29:02.000000000 +0200
-+++ dx-4.4.4/src/uipp/ui/Makefile.am	2008-09-24 19:14:35.000000000 +0200
++++ dx-4.4.4/src/uipp/ui/Makefile.am	2009-11-06 11:47:32.240940272 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
diff --git a/dx.spec b/dx.spec
index 632ee36..765d546 100644
--- a/dx.spec
+++ b/dx.spec
@@ -1,16 +1,19 @@
 Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
-Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
+Source0: http://opendx.informatics.jax.org/source/dx-%{version}.tar.gz
 Source1: %{name}.desktop
 Patch0: %{name}-rpm.patch
 Patch1: %{name}-open.patch
 Patch2: %{name}-gcc43.patch
 # fixes http://www.opendx.org/bugs/view.php?id=236
 Patch3: %{name}-errno.patch
+# fix NULL pointer dereference when running dxexec over ssh
+# without X forwarding
+Patch4: %{name}-null.patch
 License: IBM
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
@@ -60,6 +63,7 @@ Editor, or in the scripting language, you will need this package.
 %patch1 -p1 -b .open
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .errno
+%patch4 -p1 -b .null
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -124,6 +128,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Thu Nov 05 2009 Dominik Mierzejewski <rpm@greysector.net> 4.4.4-9
+- fix building with current libtool/autoconf
+- updated source URL
+- fix build afainst new netcdf headers location
+- fix build against new ImageMagick
+- fix NULL pointer dereference when running dxexec over ssh
+  without X forwarding
+
 * Mon Jan 26 2009 Dominik Mierzejewski <rpm@greysector.net> 4.4.4-8
 - fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)