- Update to 2.0.3.2

PR:		118604
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 111 insertions, 138 deletions

diff --git a/science/clhep/Makefile b/science/clhep/Makefile
index cbfc13498996..89d27121533e 100644
--- a/science/clhep/Makefile
+++ b/science/clhep/Makefile
@@ -6,20 +6,28 @@
 #
 
 PORTNAME=	clhep
-PORTVERSION=	1.8.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.3.2
 CATEGORIES=	science
-MASTER_SITES=	http://wwwasd.web.cern.ch/wwwasd/lhc++/export/share/CLHEP/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/distributions/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-oriented toolkit for particle physics applications by CERN
 
-WRKSRC=		${WRKDIR}/CLHEP
+WRKSRC=		${WRKDIR}/${PORTVERSION}/${PORTNAME:U}
 
+USE_GNOME=	gnometarget
+USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-PLIST_SUB=	TARGET=${CONFIGURE_TARGET} VERSION=${PORTVERSION}
+CONFIGURE_ARGS=	--enable-gmake
+USE_LDCONFIG=	yes
+
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
+		 '/AM_CXXFLAGS=/s|-O ||g'
 
 .include <bsd.port.mk>
diff --git a/science/clhep/distinfo b/science/clhep/distinfo
index 4857ea6dadb0..c8c287585091 100644
--- a/science/clhep/distinfo
+++ b/science/clhep/distinfo
@@ -1,3 +1,3 @@
-MD5 (clhep-1.8.0.0.tgz) = 10771473aac76498ddc62b48deee1e41
-SHA256 (clhep-1.8.0.0.tgz) = 28654256aca6ecfca794e95fde9f13e5cbf987d9071b1ce69d219884c354bc1d
-SIZE (clhep-1.8.0.0.tgz) = 1144540
+MD5 (clhep-2.0.3.2-src.tgz) = 90e30422d00b9145fccce5f33d37e36f
+SHA256 (clhep-2.0.3.2-src.tgz) = 62fcbd20c613fe2541786c9b34d921bc659771ce81efeed85e4b755b32c1794c
+SIZE (clhep-2.0.3.2-src.tgz) = 5048972
diff --git a/science/clhep/pkg-plist b/science/clhep/pkg-plist
index 04a1c954190e..e1ee959ce4f0 100644
--- a/science/clhep/pkg-plist
+++ b/science/clhep/pkg-plist
@@ -1,16 +1,51 @@
+bin/Cast-config
+bin/Evaluator-config
+bin/Exceptions-config
+bin/GenericFunctions-config
+bin/Geometry-config
+bin/Matrix-config
+bin/Random-config
+bin/RandomObjects-config
+bin/RefCount-config
+bin/Units-config
+bin/Vector-config
+bin/clhep-config
+bin/clheplib
+include/CLHEP/Cast/defs.h
+include/CLHEP/Cast/itos.h
 include/CLHEP/Evaluator/Evaluator.h
+include/CLHEP/Evaluator/defs.h
+include/CLHEP/Exceptions/ZMerrno.h
+include/CLHEP/Exceptions/ZMerrno.icc
+include/CLHEP/Exceptions/ZMexAction.h
+include/CLHEP/Exceptions/ZMexClassInfo.h
+include/CLHEP/Exceptions/ZMexClassInfo.icc
+include/CLHEP/Exceptions/ZMexHandler.h
+include/CLHEP/Exceptions/ZMexHandler.icc
+include/CLHEP/Exceptions/ZMexLogResult.h
+include/CLHEP/Exceptions/ZMexLogger.h
+include/CLHEP/Exceptions/ZMexSeverity.h
+include/CLHEP/Exceptions/ZMexception.h
+include/CLHEP/Exceptions/ZMexception.icc
+include/CLHEP/Exceptions/ZMthrow.h
+include/CLHEP/Exceptions/arch_spec_Exceptions.mk
+include/CLHEP/Exceptions/defs.h
+include/CLHEP/Exceptions/link_Exceptions.mk
 include/CLHEP/GenericFunctions/ACos.hh
 include/CLHEP/GenericFunctions/ASin.hh
 include/CLHEP/GenericFunctions/ATan.hh
+include/CLHEP/GenericFunctions/Abs.hh
 include/CLHEP/GenericFunctions/AbsFunction.hh
 include/CLHEP/GenericFunctions/AbsFunctional.hh
 include/CLHEP/GenericFunctions/AbsParameter.hh
 include/CLHEP/GenericFunctions/AnalyticConvolution.hh
 include/CLHEP/GenericFunctions/Argument.hh
 include/CLHEP/GenericFunctions/ArgumentList.hh
+include/CLHEP/GenericFunctions/ArrayFunction.hh
 include/CLHEP/GenericFunctions/AssociatedLaguerre.hh
 include/CLHEP/GenericFunctions/AssociatedLegendre.hh
 include/CLHEP/GenericFunctions/Bessel.hh
+include/CLHEP/GenericFunctions/Bessel.icc
 include/CLHEP/GenericFunctions/BivariateGaussian.hh
 include/CLHEP/GenericFunctions/ConstMinusFunction.hh
 include/CLHEP/GenericFunctions/ConstMinusParameter.hh
@@ -28,6 +63,7 @@ include/CLHEP/GenericFunctions/DefiniteIntegral.hh
 include/CLHEP/GenericFunctions/DoubleParamToArgAdaptor.hh
 include/CLHEP/GenericFunctions/DoubleParamToArgAdaptor.icc
 include/CLHEP/GenericFunctions/EllipticIntegral.hh
+include/CLHEP/GenericFunctions/EllipticIntegral.icc
 include/CLHEP/GenericFunctions/Erf.hh
 include/CLHEP/GenericFunctions/Exp.hh
 include/CLHEP/GenericFunctions/Exponential.hh
@@ -52,6 +88,8 @@ include/CLHEP/GenericFunctions/Landau.hh
 include/CLHEP/GenericFunctions/LikelihoodFunctional.hh
 include/CLHEP/GenericFunctions/Ln.hh
 include/CLHEP/GenericFunctions/LogGamma.hh
+include/CLHEP/GenericFunctions/LogisticFunction.hh
+include/CLHEP/GenericFunctions/Mod.hh
 include/CLHEP/GenericFunctions/ParamToArgAdaptor.hh
 include/CLHEP/GenericFunctions/ParamToArgAdaptor.icc
 include/CLHEP/GenericFunctions/Parameter.hh
@@ -62,103 +100,34 @@ include/CLHEP/GenericFunctions/ParameterQuotient.hh
 include/CLHEP/GenericFunctions/ParameterSum.hh
 include/CLHEP/GenericFunctions/PeriodicRectangular.hh
 include/CLHEP/GenericFunctions/Power.hh
+include/CLHEP/GenericFunctions/Psi2Hydrogen.hh
+include/CLHEP/GenericFunctions/PtRelFcn.hh
+include/CLHEP/GenericFunctions/PuncturedSmearedExp.hh
+include/CLHEP/GenericFunctions/RCBase.hh
+include/CLHEP/GenericFunctions/RKIntegrator.hh
 include/CLHEP/GenericFunctions/Rectangular.hh
 include/CLHEP/GenericFunctions/ReverseExponential.hh
+include/CLHEP/GenericFunctions/Sigma.hh
 include/CLHEP/GenericFunctions/Sin.hh
 include/CLHEP/GenericFunctions/SphericalBessel.hh
+include/CLHEP/GenericFunctions/SphericalBessel.icc
 include/CLHEP/GenericFunctions/SphericalNeumann.hh
+include/CLHEP/GenericFunctions/SphericalNeumann.icc
 include/CLHEP/GenericFunctions/Sqrt.hh
 include/CLHEP/GenericFunctions/Square.hh
 include/CLHEP/GenericFunctions/Tan.hh
 include/CLHEP/GenericFunctions/TrivariateGaussian.hh
 include/CLHEP/GenericFunctions/Variable.hh
 include/CLHEP/GenericFunctions/X.hh
+include/CLHEP/GenericFunctions/defs.h
 include/CLHEP/Geometry/BasicVector3D.h
 include/CLHEP/Geometry/Normal3D.h
 include/CLHEP/Geometry/Plane3D.h
 include/CLHEP/Geometry/Point3D.h
 include/CLHEP/Geometry/Transform3D.h
+include/CLHEP/Geometry/Transform3D.icc
 include/CLHEP/Geometry/Vector3D.h
-include/CLHEP/HepMC/CBInterface.h
-include/CLHEP/HepMC/CBhepevt.h
-include/CLHEP/HepMC/CBhepevt.icc
-include/CLHEP/HepMC/ConvertHEPEVT.h
-include/CLHEP/HepMC/DummyDecayModel.h
-include/CLHEP/HepMC/Flow.h
-include/CLHEP/HepMC/GenEvent.h
-include/CLHEP/HepMC/GenEventConvert.h
-include/CLHEP/HepMC/GenEventConvert.icc
-include/CLHEP/HepMC/GenEventtoHEPEVT.icc
-include/CLHEP/HepMC/GenParticle.h
-include/CLHEP/HepMC/GenVertex.h
-include/CLHEP/HepMC/HEPEVTtoGenEvent.icc
-include/CLHEP/HepMC/HepMCConfig.h
-include/CLHEP/HepMC/ParticleDataTableConfig.h
-include/CLHEP/HepMC/Polarization.h
-include/CLHEP/HepMC/ReadHepMC.h
-include/CLHEP/HepMC/WeightContainer.h
-include/CLHEP/HepMC/WriteHepMC.h
-include/CLHEP/HepMC/include/PythiaWrapper.h
-include/CLHEP/HepMC/include/PythiaWrapper5_720.h
-include/CLHEP/HepMC/include/PythiaWrapper6_152.h
-include/CLHEP/HepMC/include/PythiaWrapper6_152_WIN32.h
-include/CLHEP/HepMC/include/PythiaWrapper6_2.h
-include/CLHEP/HepMC/include/PythiaWrapper6_2_WIN32.h
-include/CLHEP/HepMC/include/hepev4.h
-include/CLHEP/HepMC/include/hepev4.inc
-include/CLHEP/HepMC/include/stdhep.h
-include/CLHEP/HepMC/include/stdhep.inc
-include/CLHEP/HepPDT/CommonParticleData.hh
-include/CLHEP/HepPDT/CommonParticleData.icc
-include/CLHEP/HepPDT/Constituent.hh
-include/CLHEP/HepPDT/DMFactory.hh
-include/CLHEP/HepPDT/DMFactory.icc
-include/CLHEP/HepPDT/DecayChannel.hh
-include/CLHEP/HepPDT/DecayChannelT.hh
-include/CLHEP/HepPDT/DecayChannelT.icc
-include/CLHEP/HepPDT/DecayData.hh
-include/CLHEP/HepPDT/DecayDataT.hh
-include/CLHEP/HepPDT/DecayDataT.icc
-include/CLHEP/HepPDT/DecayModel.hh
-include/CLHEP/HepPDT/DecayModelBase.hh
-include/CLHEP/HepPDT/DefTable.hh
-include/CLHEP/HepPDT/DefaultConfig.hh
-include/CLHEP/HepPDT/MapVector.hh
-include/CLHEP/HepPDT/Measurement.hh
-include/CLHEP/HepPDT/Measurement.icc
-include/CLHEP/HepPDT/NullDecayModel.hh
-include/CLHEP/HepPDT/NullDecayModelT.hh
-include/CLHEP/HepPDT/PDGtoQQTable.hh
-include/CLHEP/HepPDT/ParticleData.hh
-include/CLHEP/HepPDT/ParticleDataT.hh
-include/CLHEP/HepPDT/ParticleDataT.icc
-include/CLHEP/HepPDT/ParticleDataTable.hh
-include/CLHEP/HepPDT/ParticleDataTableT.hh
-include/CLHEP/HepPDT/ParticleDataTableT.icc
-include/CLHEP/HepPDT/ParticleID.hh
-include/CLHEP/HepPDT/ParticleID.icc
-include/CLHEP/HepPDT/QQChannel.hh
-include/CLHEP/HepPDT/QQDecay.hh
-include/CLHEP/HepPDT/QQDecayTable.hh
-include/CLHEP/HepPDT/QQStructs.hh
-include/CLHEP/HepPDT/ResonanceStructure.hh
-include/CLHEP/HepPDT/SimpleDecayModel.hh
-include/CLHEP/HepPDT/SimpleParticle.hh
-include/CLHEP/HepPDT/SpinState.hh
-include/CLHEP/HepPDT/SpinState.icc
-include/CLHEP/HepPDT/TableBuilder.hh
-include/CLHEP/HepPDT/TableBuilderHerwigT.icc
-include/CLHEP/HepPDT/TableBuilderIsajetT.icc
-include/CLHEP/HepPDT/TableBuilderPythiaT.icc
-include/CLHEP/HepPDT/TableBuilderT.hh
-include/CLHEP/HepPDT/TableBuilderT.icc
-include/CLHEP/HepPDT/TableBuilderTEvtGen.icc
-include/CLHEP/HepPDT/TableBuilderTQQ.icc
-include/CLHEP/HepPDT/TempParticleData.hh
-include/CLHEP/HepPDT/Version.hh
-include/CLHEP/HepPDT/convertTemporaryMap.icc
-include/CLHEP/HepPDT/pretend.hh
-include/CLHEP/HepPDT/stringtodouble.hh
+include/CLHEP/Geometry/defs.h
 include/CLHEP/Matrix/DiagMatrix.h
 include/CLHEP/Matrix/DiagMatrix.icc
 include/CLHEP/Matrix/GenMatrix.h
@@ -170,8 +139,11 @@ include/CLHEP/Matrix/SymMatrix.h
 include/CLHEP/Matrix/SymMatrix.icc
 include/CLHEP/Matrix/Vector.h
 include/CLHEP/Matrix/Vector.icc
+include/CLHEP/Matrix/defs.h
 include/CLHEP/Random/DRand48Engine.h
+include/CLHEP/Random/DoubConv.hh
 include/CLHEP/Random/DualRand.h
+include/CLHEP/Random/EngineFactory.h
 include/CLHEP/Random/Hurd160Engine.h
 include/CLHEP/Random/Hurd288Engine.h
 include/CLHEP/Random/JamesRandom.h
@@ -214,6 +186,7 @@ include/CLHEP/Random/Random.h
 include/CLHEP/Random/Random.icc
 include/CLHEP/Random/RandomEngine.h
 include/CLHEP/Random/RandomEngine.icc
+include/CLHEP/Random/RandomFunc.h
 include/CLHEP/Random/Randomize.h
 include/CLHEP/Random/RanecuEngine.h
 include/CLHEP/Random/Ranlux64Engine.h
@@ -221,42 +194,24 @@ include/CLHEP/Random/RanluxEngine.h
 include/CLHEP/Random/RanshiEngine.h
 include/CLHEP/Random/SeedTable.h
 include/CLHEP/Random/Stat.h
+include/CLHEP/Random/StaticRandomStates.h
 include/CLHEP/Random/TripleRand.h
+include/CLHEP/Random/defs.h
+include/CLHEP/Random/engineIDulong.h
 include/CLHEP/RandomObjects/RandMultiGauss.h
 include/CLHEP/RandomObjects/RandomVector.h
 include/CLHEP/RandomObjects/RandomVector.icc
-include/CLHEP/StdHep/CBcm.hh
-include/CLHEP/StdHep/CBstdhep.hh
-include/CLHEP/StdHep/CBstdhep.icc
-include/CLHEP/StdHep/ConversionMethods.hh
-include/CLHEP/StdHep/ReadStdHep.hh
-include/CLHEP/StdHep/StdEvent.hh
-include/CLHEP/StdHep/StdEventConvert.hh
-include/CLHEP/StdHep/StdEventConvert.icc
-include/CLHEP/StdHep/StdHep.hh
-include/CLHEP/StdHep/StdHepfromStdEvent.icc
-include/CLHEP/StdHep/StdHeptoGenEvent.icc
-include/CLHEP/StdHep/StdRunInfo.hh
-include/CLHEP/StdHep/StdRunInfoConvert.hh
-include/CLHEP/StdHep/StdRunInfoConvert.icc
-include/CLHEP/StdHep/WriteStdHep.hh
-include/CLHEP/StdHep/include/herwig61.inc
-include/CLHEP/StdHep/include/herwig64.inc
-include/CLHEP/StdHep/include/stdcm1.h
-include/CLHEP/StdHep/include/stdcm1.inc
-include/CLHEP/StdHep/include/stdcnt.h
-include/CLHEP/StdHep/include/stdcnt.inc
-include/CLHEP/StdHep/include/stdevent.h
-include/CLHEP/StdHep/include/stdlun.h
-include/CLHEP/StdHep/include/stdlun.inc
-include/CLHEP/StdHep/include/stdtmp.h
-include/CLHEP/StdHep/include/stdtmp.inc
-include/CLHEP/StdHep/include/stdver.h
-include/CLHEP/StdHep/include/stdver.inc
+include/CLHEP/RandomObjects/defs.h
+include/CLHEP/RefCount/ZMhandleTo.h
+include/CLHEP/RefCount/ZMhandleTo.icc
+include/CLHEP/RefCount/ZMuseCount.h
+include/CLHEP/RefCount/ZMuseCount.icc
+include/CLHEP/RefCount/defs.h
+include/CLHEP/Units/GlobalPhysicalConstants.h
+include/CLHEP/Units/GlobalSystemOfUnits.h
 include/CLHEP/Units/PhysicalConstants.h
 include/CLHEP/Units/SystemOfUnits.h
-include/CLHEP/Utilities/CLHEP.h
-include/CLHEP/Utilities/fortran.h
+include/CLHEP/Units/defs.h
 include/CLHEP/Vector/AxisAngle.h
 include/CLHEP/Vector/AxisAngle.icc
 include/CLHEP/Vector/Boost.h
@@ -283,36 +238,46 @@ include/CLHEP/Vector/RotationY.h
 include/CLHEP/Vector/RotationY.icc
 include/CLHEP/Vector/RotationZ.h
 include/CLHEP/Vector/RotationZ.icc
+include/CLHEP/Vector/Sqr.h
 include/CLHEP/Vector/ThreeVector.h
 include/CLHEP/Vector/ThreeVector.icc
 include/CLHEP/Vector/TwoVector.h
 include/CLHEP/Vector/TwoVector.icc
 include/CLHEP/Vector/ZMxpv.h
-include/CLHEP/config/CLHEP-default.h
-include/CLHEP/config/CLHEP-%%TARGET%%-c++.h
-include/CLHEP/config/CLHEP.h
-include/CLHEP/config/StringStream.h
-include/CLHEP/config/TemplateFunctions.h
-include/CLHEP/config/fstream.h
-include/CLHEP/config/iomanip.h
-include/CLHEP/config/iosfwd.h
-include/CLHEP/config/iostream.h
-include/CLHEP/config/sstream.h
-include/CLHEP/config/strstream.h
-lib/libCLHEP-c++.%%VERSION%%.a
-@dirrm include/CLHEP/config
+include/CLHEP/Vector/defs.h
+lib/libCLHEP-%%VERSION%%.a
+lib/libCLHEP-%%VERSION%%.so
+lib/libCLHEP-Cast-%%VERSION%%.a
+lib/libCLHEP-Cast-%%VERSION%%.so
+lib/libCLHEP-Evaluator-%%VERSION%%.a
+lib/libCLHEP-Evaluator-%%VERSION%%.so
+lib/libCLHEP-Exceptions-%%VERSION%%.a
+lib/libCLHEP-Exceptions-%%VERSION%%.so
+lib/libCLHEP-GenericFunctions-%%VERSION%%.a
+lib/libCLHEP-GenericFunctions-%%VERSION%%.so
+lib/libCLHEP-Geometry-%%VERSION%%.a
+lib/libCLHEP-Geometry-%%VERSION%%.so
+lib/libCLHEP-Matrix-%%VERSION%%.a
+lib/libCLHEP-Matrix-%%VERSION%%.so
+lib/libCLHEP-Random-%%VERSION%%.a
+lib/libCLHEP-Random-%%VERSION%%.so
+lib/libCLHEP-RandomObjects-%%VERSION%%.a
+lib/libCLHEP-RandomObjects-%%VERSION%%.so
+lib/libCLHEP-RefCount-%%VERSION%%.a
+lib/libCLHEP-RefCount-%%VERSION%%.so
+lib/libCLHEP-Vector-%%VERSION%%.a
+lib/libCLHEP-Vector-%%VERSION%%.so
+lib/libCLHEP.a
+lib/libCLHEP.so
 @dirrm include/CLHEP/Vector
-@dirrm include/CLHEP/Utilities
 @dirrm include/CLHEP/Units
-@dirrm include/CLHEP/StdHep/include
-@dirrm include/CLHEP/StdHep
+@dirrm include/CLHEP/RefCount
 @dirrm include/CLHEP/RandomObjects
 @dirrm include/CLHEP/Random
 @dirrm include/CLHEP/Matrix
-@dirrm include/CLHEP/HepPDT
-@dirrm include/CLHEP/HepMC/include
-@dirrm include/CLHEP/HepMC
 @dirrm include/CLHEP/Geometry
 @dirrm include/CLHEP/GenericFunctions
+@dirrm include/CLHEP/Exceptions
 @dirrm include/CLHEP/Evaluator
+@dirrm include/CLHEP/Cast
 @dirrm include/CLHEP