From a0bd024333a3455b309689804ebade1633eb3544 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Thu, 26 Oct 2006 20:15:08 +0000 Subject: Set "-source 1.4" to make it build with JDK-1.5, hence make it packageable. Approved by: portmgr (erwin) --- science/openfoam/Makefile | 12 +++++------- .../files/patch-applications_umm..._patchTool_Java_Allwmake | 9 +++++++++ science/openfoam/files/patch-wmake_rules_General_javaOpt | 6 ++++++ science/openfoam/pkg-plist | 7 ++----- 4 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 science/openfoam/files/patch-applications_umm..._patchTool_Java_Allwmake create mode 100644 science/openfoam/files/patch-wmake_rules_General_javaOpt (limited to 'science/openfoam') diff --git a/science/openfoam/Makefile b/science/openfoam/Makefile index 49d53d46cc9e..146320f59552 100644 --- a/science/openfoam/Makefile +++ b/science/openfoam/Makefile @@ -7,7 +7,7 @@ PORTNAME= ${REALNAME:L} PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= foam @@ -23,7 +23,8 @@ BUILD_DEPENDS= micod:${PORTSDIR}/devel/mico \ ${PARAVIEW_LIB}/ParaViewConfig.cmake:${PORTSDIR}/science/paraview \ ${LOCALBASE}/share/java/java3d/jar/j3dutils.jar:${PORTSDIR}/java/java3d \ ${LOCALBASE}/include/libiberty/demangle.h:${PORTSDIR}/devel/gnulibiberty\ - ${LOCALBASE}/include/vtk/vtkDataSetSource.h:${PORTSDIR}/math/vtk-headers + ${LOCALBASE}/include/vtk/vtkDataSetSource.h:${PORTSDIR}/math/vtk-headers\ + ${X11BASE}/lib/X11/fonts/freefont-ttf/FreeSans.ttf:${PORTSDIR}/x11-fonts/freefont-ttf LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo RUN_DEPENDS= micod:${PORTSDIR}/devel/mico \ dx:${PORTSDIR}/graphics/opendx \ @@ -31,8 +32,6 @@ RUN_DEPENDS= micod:${PORTSDIR}/devel/mico \ ${LOCALBASE}/share/java/java3d/jar/j3dutils.jar:${PORTSDIR}/java/java3d \ paraview:${PORTSDIR}/science/paraview -BROKEN= Incorrect pkg-plist - .if !defined(NOPORTDOCS) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ dot:${PORTSDIR}/graphics/graphviz @@ -40,7 +39,7 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ USE_GCC= 3.4+ USE_JAVA= yes -JAVA_VERSION= 1.4 +JAVA_VERSION= 1.5+ USE_GL= yes REINPLACE_ARGS= -i "" @@ -215,9 +214,8 @@ do-install: cd ${WRKSRC}/${APPDIR} \ && ${FIND} . -type f -exec ${INSTALL_PROGRAM} {} \ ${PREFIX}/${REALNAME}/${APPDIR}/{} \; - @${RMDIR} ${DIR2PRUNE:S|^|${PREFIX}/${REALNAME}/|} + ${RMDIR} ${DIR2PRUNE:S|^|${PREFIX}/${REALNAME}/|} ${TOUCH} ${PREFIX}/${REALNAME}/jobControl/.keepme - .if !defined(NOPORTDOCS) ${CP} -R ${DOCS:S|^|${WRKSRC}/|} ${PREFIX}/${REALNAME} ${CP} -R ${WRKSRC}/tutorials ${PREFIX}/${REALNAME} diff --git a/science/openfoam/files/patch-applications_umm..._patchTool_Java_Allwmake b/science/openfoam/files/patch-applications_umm..._patchTool_Java_Allwmake new file mode 100644 index 000000000000..33389d6e12e8 --- /dev/null +++ b/science/openfoam/files/patch-applications_umm..._patchTool_Java_Allwmake @@ -0,0 +1,9 @@ +--- ./applications/utilities/mesh/manipulation/patchTool/Java/Allwmake.orig Tue Dec 30 10:12:44 2003 ++++ ./applications/utilities/mesh/manipulation/patchTool/Java/Allwmake Sat Oct 21 14:25:49 2006 +@@ -1,5 +1,5 @@ + #!/bin/sh + set -x + rmclassall +-javac -classpath ".:../lib/j3d-org.jar" -d Make/classes/ PatchTool/PatchTool.java ++javac -source 1.4 -classpath ".:../lib/j3d-org.jar" -d Make/classes/ PatchTool/PatchTool.java + jar cf ../lib/PatchTool.jar -C Make/classes . diff --git a/science/openfoam/files/patch-wmake_rules_General_javaOpt b/science/openfoam/files/patch-wmake_rules_General_javaOpt new file mode 100644 index 000000000000..bcfc179ab714 --- /dev/null +++ b/science/openfoam/files/patch-wmake_rules_General_javaOpt @@ -0,0 +1,6 @@ +--- ./wmake/rules/General/javaOpt.orig Mon Nov 22 18:30:37 2004 ++++ ./wmake/rules/General/javaOpt Sat Oct 21 14:23:16 2006 +@@ -1,2 +1,2 @@ + javaDBUG = +-javaOPT = -O ++javaOPT = -O -source 1.4 diff --git a/science/openfoam/pkg-plist b/science/openfoam/pkg-plist index c44b6d865ab0..2cfada58cabe 100644 --- a/science/openfoam/pkg-plist +++ b/science/openfoam/pkg-plist @@ -5755,7 +5755,6 @@ %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/ActionManagement/ActionManager.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/ActionManagement/IActionProvider.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/App$1.class -%%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/App$1ExitEvent.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/App$ExitAction.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/App$ShowHTMLAction.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/App$ShowHTMLOnlineAction.class @@ -5767,7 +5766,6 @@ %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$2.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$3.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$4.class -%%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$5.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$CloneCaseAction.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$CreateCaseAction.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$DeleteCaseAction.class @@ -5787,7 +5785,6 @@ %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$StartProcessEditorAction.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$StopCaseBrowserAction.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel$UnlockCaseAction.class -%%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseBrowserPanel.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseChooserDlg$1.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseChooserDlg.class %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement/CaseManager.class @@ -8023,9 +8020,9 @@ @dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/Editors/DictionaryEntryEditor @dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/Editors/ApplicationEditor @dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/Editors -@dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement +@unexec rm -rf %D/%%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/CaseManagement 2>&1 >/dev/null || true @dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX/ActionManagement -@dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX +@unexec rm -rf %D/%%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes/FoamX 2>&1 >/dev/null || true @dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make/classes @dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/Make @dirrm %%REALNAME%%/applications/utilities/preProcessing/FoamX/Java/META-INF -- cgit v1.2.3