Index: head/graphics/opendx/Makefile =================================================================== --- head/graphics/opendx/Makefile (revision 423138) +++ head/graphics/opendx/Makefile (revision 423139) @@ -1,99 +1,96 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= opendx PORTVERSION= 4.4.4 PORTREVISION= 20 CATEGORIES= graphics math java MASTER_SITES= http://www.sfr-fresh.com/unix/misc/ DISTNAME= dx-${PORTVERSION} MAINTAINER= stephen@FreeBSD.org COMMENT= IBM's Open Visualization Data Explorer LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick \ libtiff.so:graphics/tiff \ - libcdf.so:science/cdf + libcdf.so:science/cdf \ + libXp.so:x11/libXp -USE_XORG= xinerama xext xpm xmu sm ice +USE_XORG= x11 xt xinerama xext xpm xmu sm ice USES= bison motif gmake libtool -USE_GCC= any -USE_GL= yes +USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_LDCONFIG= yes CONFIGURE_ENV= ARCH=freebsd CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib NO_MTREE= yes PLIST_SUB= ARCH=freebsd PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(WITH_HDF) && !defined(WITHOUT_NETCDF) IGNORE= HDF and NETCDF are conflicting .endif .if defined(WITH_HDF) LIB_DEPENDS+= libmfhdf.so:science/hdf .else CONFIGURE_ARGS+= --without-hdf .endif .if !defined(WITHOUT_NETCDF) LIB_DEPENDS+= libnetcdf.so:science/netcdf .else CONFIGURE_ARGS+= --without-netcdf .endif .if defined(WITH_JAVA) +ONLY_FOR_ARCHS= i386 USE_JAVA= yes JAVA_VERSION= 1.6+ BUILD_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer RUN_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer CONFIGURE_ARGS+= --with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \ --with-java40jar-path=${JAVALIBDIR}/java40.jar \ --with-jni-path=${JAVA_HOME}/include:${JAVA_HOME}/include/freebsd PLIST_SUB+= JAVA="" DIR2PRUNE= dx/java/user dx/java/server/nets .else CONFIGURE_ARGS+= --without-javadx PLIST_SUB+= JAVA="@comment " .endif PLIST_SUB+= UNAMEP=${ARCH} .include - -.if defined(WITH_JAVA) && ${ARCH} != "i386" -BROKEN= does not build -.endif post-patch: @${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;/usr/X11R6;${LOCALBASE};g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|startserver.bat||" \ ${WRKSRC}/src/uipp/java/server/Makefile.in @${REINPLACE_CMD} -e 's|$$(ARCH)|@ARCH@|' \ ${WRKSRC}/src/misc/Makefile.* post-install: @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} .if defined(WITH_JAVA) ${CHMOD} 0775 ${STAGEDIR}${PREFIX}/dx/java/server/nets ${TOUCH} ${DIR2PRUNE:S|^|${STAGEDIR}${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} .include Index: head/graphics/opendx/files/patch-bin_url_handler.sh =================================================================== --- head/graphics/opendx/files/patch-bin_url_handler.sh (revision 423138) +++ head/graphics/opendx/files/patch-bin_url_handler.sh (revision 423139) @@ -1,13 +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 @@ +--- bin/url_handler.sh.orig 2002-04-10 23:32:54 UTC ++++ bin/url_handler.sh +@@ -39,8 +39,8 @@ case $method in 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 Index: head/graphics/opendx/files/patch-man_Makefile.in =================================================================== --- head/graphics/opendx/files/patch-man_Makefile.in (revision 423138) +++ head/graphics/opendx/files/patch-man_Makefile.in (revision 423139) @@ -1,11 +1,11 @@ ---- man/Makefile.in-orig 2013-08-19 00:29:56.000000000 +0000 -+++ man/Makefile.in 2013-08-19 00:30:29.000000000 +0000 -@@ -202,7 +202,7 @@ +--- man/Makefile.in.orig 2016-09-28 02:20:42 UTC ++++ man/Makefile.in +@@ -202,7 +202,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ yakker = @yakker@ -SUBDIRS = manl catl +SUBDIRS = manl all: all-recursive .SUFFIXES: Index: head/graphics/opendx/files/patch-man_manl_Makefile.in =================================================================== --- head/graphics/opendx/files/patch-man_manl_Makefile.in (revision 423138) +++ head/graphics/opendx/files/patch-man_manl_Makefile.in (revision 423139) @@ -1,11 +1,11 @@ ---- man/manl/Makefile.in-orig 2013-08-19 00:32:40.000000000 +0000 -+++ man/manl/Makefile.in 2013-08-19 00:33:00.000000000 +0000 -@@ -186,7 +186,7 @@ +--- man/manl/Makefile.in.orig 2016-09-28 02:20:42 UTC ++++ man/manl/Makefile.in +@@ -186,7 +186,7 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ -mandir = $(prefix)/dx/man +mandir = $(prefix)/man mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ Index: head/graphics/opendx/files/patch-src =================================================================== --- head/graphics/opendx/files/patch-src (revision 423138) +++ head/graphics/opendx/files/patch-src (revision 423139) @@ -1,285 +1,277 @@ -diff -aru src.orig/uipp/base/Application.C src/uipp/base/Application.C ---- src.orig/uipp/base/Application.C 2005-11-09 21:56:17.000000000 +0300 -+++ src/uipp/base/Application.C 2014-05-12 09:46:06.000000000 +0400 -@@ -136,7 +136,7 @@ +--- src/exec/libdx/lock.c.orig 2003-07-12 00:12:11 UTC ++++ src/exec/libdx/lock.c +@@ -936,7 +936,7 @@ DXunlock(lock_type *l, int who) + if (_lock->knt == 0) + { + DXSetError(ERROR_INTERNAL, "Unlocking an unlocked lock?"); +- return; ++ return ERROR; + } + + /* +--- src/uipp/base/Application.C.orig 2005-11-09 18:56:17 UTC ++++ src/uipp/base/Application.C +@@ -136,7 +136,7 @@ void Application::installDefaultResource //this->setDefaultResources(baseWidget, Application::DefaultResources); } -boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) +boolean Application::initializeWindowSystem(int *argcp, char **argv) { // -@@ -235,7 +235,7 @@ +@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys return TRUE; } -void Application::parseCommand(unsigned int* argcp, char** argv, +void Application::parseCommand(int* argcp, char** argv, XrmOptionDescList optlist, int optlistsize) { char res_file[256]; -@@ -280,7 +280,7 @@ +@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned // } -boolean Application::initialize(unsigned int* argcp, char** argv) +boolean Application::initialize(int* argcp, char** argv) { // // Initialize the window system if not done already. -diff -aru src.orig/uipp/base/Application.h src/uipp/base/Application.h ---- src.orig/uipp/base/Application.h 2005-11-09 21:26:29.000000000 +0300 -+++ src/uipp/base/Application.h 2014-05-12 09:46:33.000000000 +0400 -@@ -49,7 +49,7 @@ +--- src/uipp/base/Application.h.orig 2005-11-09 18:26:29 UTC ++++ src/uipp/base/Application.h +@@ -49,7 +49,7 @@ class Application : public UIComponent, // // The main program needs to access protected member functions. // - friend int main(unsigned int argc, + friend int main(int argc, char** argv); -@@ -71,9 +71,9 @@ +@@ -71,9 +71,9 @@ class Application : public UIComponent, // // Initialize the window system. // - virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); + virtual boolean initializeWindowSystem(int *argcp, char **argv); - virtual void parseCommand(unsigned int* argcp, char** argv, + virtual void parseCommand(int* argcp, char** argv, XrmOptionDescList optlist, int optlistsize); // -@@ -145,7 +145,7 @@ +@@ -145,7 +145,7 @@ class Application : public UIComponent, // Initializes any Application specfic state. This routine should // be called by main() or subclasses only. // - virtual boolean initialize(unsigned int* argcp, char** argv); + virtual boolean initialize(int* argcp, char** argv); // // Allow others to access our event processing mechanism -diff -aru src.orig/uipp/base/IBMApplication.C src/uipp/base/IBMApplication.C ---- src.orig/uipp/base/IBMApplication.C 2004-04-03 00:32:43.000000000 +0400 -+++ src/uipp/base/IBMApplication.C 2014-05-12 09:46:49.000000000 +0400 -@@ -349,7 +349,7 @@ +--- src/uipp/base/IBMApplication.C.orig 2004-04-02 20:32:43 UTC ++++ src/uipp/base/IBMApplication.C +@@ -349,7 +349,7 @@ int status; } -boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv) +boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv) { if (!this->Application::initializeWindowSystem(argcp, argv)) -@@ -375,7 +375,7 @@ +@@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow return TRUE; } -boolean IBMApplication::initialize(unsigned int* argcp, +boolean IBMApplication::initialize(int* argcp, char** argv) { if (!this->Application::initialize(argcp,argv)) -diff -aru src.orig/uipp/base/IBMApplication.h src/uipp/base/IBMApplication.h ---- src.orig/uipp/base/IBMApplication.h 2003-09-20 09:35:22.000000000 +0400 -+++ src/uipp/base/IBMApplication.h 2014-05-12 09:47:07.000000000 +0400 -@@ -77,7 +77,7 @@ +--- src/uipp/base/IBMApplication.h.orig 2003-09-20 05:35:22 UTC ++++ src/uipp/base/IBMApplication.h +@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio // // Initialize the window system. // - virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); + virtual boolean initializeWindowSystem(int *argcp, char **argv); // // Protected member data: -@@ -88,7 +88,7 @@ +@@ -88,7 +88,7 @@ class IBMApplication : public Applicatio HelpWin *helpWindow; - boolean initialize(unsigned int* argcp, char** argv); + boolean initialize(int* argcp, char** argv); // // Load application specific action routines -diff -aru src.orig/uipp/dxui/Main.C src/uipp/dxui/Main.C ---- src.orig/uipp/dxui/Main.C 2005-12-07 20:50:53.000000000 +0300 -+++ src/uipp/dxui/Main.C 2014-05-12 09:44:51.000000000 +0400 -@@ -48,7 +48,7 @@ +--- src/uipp/dxui/Main.C.orig 2005-12-07 17:50:53 UTC ++++ src/uipp/dxui/Main.C +@@ -48,7 +48,7 @@ extern unsigned long _etext; // const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; -int main(unsigned int argc, +int main(int argc, char** argv) { #if defined(HAVE_HCLXMINIT) -diff -aru src.orig/uipp/dxuilib/DXApplication.C src/uipp/dxuilib/DXApplication.C ---- src.orig/uipp/dxuilib/DXApplication.C 2006-06-22 23:45:34.000000000 +0400 -+++ src/uipp/dxuilib/DXApplication.C 2014-05-12 09:47:15.000000000 +0400 -@@ -2248,7 +2248,7 @@ +--- src/uipp/dxuilib/DXApplication.C.orig 2006-06-22 19:45:34 UTC ++++ src/uipp/dxuilib/DXApplication.C +@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour this->setDefaultResources(baseWidget, _defaultDXResources); this->IBMApplication::installDefaultResources(baseWidget); } -boolean DXApplication::initialize(unsigned int* argcp, +boolean DXApplication::initialize(int* argcp, char** argv) { boolean wasSetBusy = FALSE; -diff -aru src.orig/uipp/dxuilib/DXApplication.h src/uipp/dxuilib/DXApplication.h ---- src.orig/uipp/dxuilib/DXApplication.h 2006-05-08 20:20:10.000000000 +0400 -+++ src/uipp/dxuilib/DXApplication.h 2014-05-12 09:47:31.000000000 +0400 -@@ -372,7 +372,7 @@ +--- src/uipp/dxuilib/DXApplication.h.orig 2006-05-08 16:20:10 UTC ++++ src/uipp/dxuilib/DXApplication.h +@@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat // Overrides the Application class version: // Initializes Xt Intrinsics with option list (switches). // - virtual boolean initialize(unsigned int* argcp, + virtual boolean initialize(int* argcp, char** argv); // -diff -aru src.orig/uipp/mb/MBApplication.C src/uipp/mb/MBApplication.C ---- src.orig/uipp/mb/MBApplication.C 2006-05-08 20:20:13.000000000 +0400 -+++ src/uipp/mb/MBApplication.C 2014-05-12 09:47:39.000000000 +0400 -@@ -117,7 +117,7 @@ +--- src/uipp/mb/MBApplication.C.orig 2006-05-08 16:20:13 UTC ++++ src/uipp/mb/MBApplication.C +@@ -117,7 +117,7 @@ InitializeSignals(void) #endif } -boolean MBApplication::initialize(unsigned int* argcp, +boolean MBApplication::initialize(int* argcp, char** argv) { ASSERT(argcp); -diff -aru src.orig/uipp/mb/MBApplication.h src/uipp/mb/MBApplication.h ---- src.orig/uipp/mb/MBApplication.h 1999-05-10 19:46:25.000000000 +0400 -+++ src/uipp/mb/MBApplication.h 2014-05-12 09:47:56.000000000 +0400 -@@ -51,7 +51,7 @@ +--- src/uipp/mb/MBApplication.h.orig 1999-05-10 15:46:25 UTC ++++ src/uipp/mb/MBApplication.h +@@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat // Overrides the Application class version: // Initializes Xt Intrinsics with option list (switches). // - virtual boolean initialize(unsigned int* argcp, + virtual boolean initialize(int* argcp, char** argv); static MBResource resource; -diff -aru src.orig/uipp/mb/Main.C src/uipp/mb/Main.C ---- src.orig/uipp/mb/Main.C 2000-05-20 21:49:40.000000000 +0400 -+++ src/uipp/mb/Main.C 2014-05-12 09:44:59.000000000 +0400 -@@ -22,7 +22,7 @@ +--- src/uipp/mb/Main.C.orig 2000-05-20 17:49:40 UTC ++++ src/uipp/mb/Main.C +@@ -22,7 +22,7 @@ extern "C" void HCLXmInit(); // const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; -int main(unsigned int argc, +int main(int argc, char** argv) { #if defined(HAVE_HCLXMINIT) -diff -aru src.orig/uipp/prompter/GARApplication.C src/uipp/prompter/GARApplication.C ---- src.orig/uipp/prompter/GARApplication.C 2006-05-08 20:20:13.000000000 +0400 -+++ src/uipp/prompter/GARApplication.C 2014-05-12 09:48:05.000000000 +0400 -@@ -198,7 +198,7 @@ +--- src/uipp/prompter/GARApplication.C.orig 2006-05-08 16:20:13 UTC ++++ src/uipp/prompter/GARApplication.C +@@ -198,7 +198,7 @@ InitializeSignals(void) } } -boolean GARApplication::initialize(unsigned int* argcp, +boolean GARApplication::initialize(int* argcp, char** argv) { ASSERT(argcp); -diff -aru src.orig/uipp/prompter/GARApplication.h src/uipp/prompter/GARApplication.h ---- src.orig/uipp/prompter/GARApplication.h 2003-09-20 09:33:21.000000000 +0400 -+++ src/uipp/prompter/GARApplication.h 2014-05-12 09:48:24.000000000 +0400 -@@ -129,7 +129,7 @@ +--- src/uipp/prompter/GARApplication.h.orig 2003-09-20 05:33:21 UTC ++++ src/uipp/prompter/GARApplication.h +@@ -129,7 +129,7 @@ class GARApplication : public IBMApplica // Overrides the Application class version: // Initializes Xt Intrinsics with option list (switches). // - virtual boolean initialize(unsigned int* argcp, + virtual boolean initialize(int* argcp, char** argv); CommandScope *commandScope; // command scope -diff -aru src.orig/uipp/prompter/Main.C src/uipp/prompter/Main.C ---- src.orig/uipp/prompter/Main.C 2000-05-16 22:52:59.000000000 +0400 -+++ src/uipp/prompter/Main.C 2014-05-12 09:45:07.000000000 +0400 -@@ -17,7 +17,7 @@ +--- src/uipp/prompter/Main.C.orig 2000-05-16 18:52:59 UTC ++++ src/uipp/prompter/Main.C +@@ -17,7 +17,7 @@ extern "C" void HCLXmInit(); #endif -int main(unsigned int argc, +int main(int argc, char** argv) { #if defined(HAVE_HCLXMINIT) -diff -aru src.orig/uipp/startup/Main.C src/uipp/startup/Main.C ---- src.orig/uipp/startup/Main.C 2000-05-16 22:53:07.000000000 +0400 -+++ src/uipp/startup/Main.C 2014-05-12 09:45:13.000000000 +0400 +--- src/uipp/startup/Main.C.orig 2000-05-16 18:53:07 UTC ++++ src/uipp/startup/Main.C @@ -14,7 +14,7 @@ extern "C" void HCLXmInit(); #endif -int main(unsigned int argc, +int main(int argc, char** argv) { #if defined(HAVE_HCLXMINIT) -diff -aru src.orig/uipp/startup/StartupApplication.C src/uipp/startup/StartupApplication.C ---- src.orig/uipp/startup/StartupApplication.C 2005-11-10 22:48:22.000000000 +0300 -+++ src/uipp/startup/StartupApplication.C 2014-05-12 09:48:31.000000000 +0400 -@@ -117,7 +117,7 @@ +--- src/uipp/startup/StartupApplication.C.orig 2005-11-10 19:48:22 UTC ++++ src/uipp/startup/StartupApplication.C +@@ -117,7 +117,7 @@ InitializeSignals(void) #endif } -boolean StartupApplication::initialize(unsigned int* argcp, +boolean StartupApplication::initialize(int* argcp, char** argv) { ASSERT(argcp); -diff -aru src.orig/uipp/startup/StartupApplication.h src/uipp/startup/StartupApplication.h ---- src.orig/uipp/startup/StartupApplication.h 2003-09-20 09:33:56.000000000 +0400 -+++ src/uipp/startup/StartupApplication.h 2014-05-12 09:48:50.000000000 +0400 -@@ -84,7 +84,7 @@ +--- src/uipp/startup/StartupApplication.h.orig 2003-09-20 05:33:56 UTC ++++ src/uipp/startup/StartupApplication.h +@@ -84,7 +84,7 @@ class StartupApplication : public IBMApp // Overrides the Application class version: // Initializes Xt Intrinsics with option list (switches). // - virtual boolean initialize(unsigned int* argcp, char**argv); + virtual boolean initialize(int* argcp, char**argv); CommandScope *commandScope; // command scope -diff -aru src.orig/uipp/tutor/Main.C src/uipp/tutor/Main.C ---- src.orig/uipp/tutor/Main.C 2000-05-16 22:53:15.000000000 +0400 -+++ src/uipp/tutor/Main.C 2014-05-12 09:45:22.000000000 +0400 -@@ -31,7 +31,7 @@ +--- src/uipp/tutor/Main.C.orig 2000-05-16 18:53:15 UTC ++++ src/uipp/tutor/Main.C +@@ -31,7 +31,7 @@ extern "C" void HCLXmInit(); // const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; -int main(unsigned int argc, +int main(int argc, char** argv) { #if defined(HAVE_HCLXMINIT) -diff -aru src.orig/uipp/tutor/TutorApplication.C src/uipp/tutor/TutorApplication.C ---- src.orig/uipp/tutor/TutorApplication.C 2006-05-08 20:20:14.000000000 +0400 -+++ src/uipp/tutor/TutorApplication.C 2014-05-12 09:48:59.000000000 +0400 -@@ -196,7 +196,7 @@ +--- src/uipp/tutor/TutorApplication.C.orig 2006-05-08 16:20:14 UTC ++++ src/uipp/tutor/TutorApplication.C +@@ -196,7 +196,7 @@ InitializeSignals(void) #endif } -boolean TutorApplication::initialize(unsigned int* argcp, +boolean TutorApplication::initialize(int* argcp, char** argv) { ASSERT(argcp); -diff -aru src.orig/uipp/tutor/TutorApplication.h src/uipp/tutor/TutorApplication.h ---- src.orig/uipp/tutor/TutorApplication.h 1999-05-10 19:46:30.000000000 +0400 -+++ src/uipp/tutor/TutorApplication.h 2014-05-12 09:49:16.000000000 +0400 -@@ -69,7 +69,7 @@ +--- src/uipp/tutor/TutorApplication.h.orig 1999-05-10 15:46:30 UTC ++++ src/uipp/tutor/TutorApplication.h +@@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli // Overrides the Application class version: // Initializes Xt Intrinsics with option list (switches). // - virtual boolean initialize(unsigned int* argcp, + virtual boolean initialize(int* argcp, char** argv); //