3 files changed, 227 insertions, 32 deletions

diff --git a/science/clhep/Makefile b/science/clhep/Makefile
index e9c871a2a67f..ea3c6c581f31 100644
--- a/science/clhep/Makefile
+++ b/science/clhep/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	clhep
-PORTVERSION=	1.6.0.0
+PORTVERSION=	1.8.0.0
 CATEGORIES=	science
-MASTER_SITES=	http://wwwinfo.cern.ch/asd/lhc++/export/share/CLHEP/${PORTVERSION}/
+MASTER_SITES=	http://wwwinfo.cern.ch/asd/lhc++/export/share/CLHEP/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/CLHEP
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
-PLIST_SUB=	TARGET=${CONFIGURE_TARGET}
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+PLIST_SUB=	TARGET=${CONFIGURE_TARGET} VERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/science/clhep/distinfo b/science/clhep/distinfo
index 2faafde69777..103641c92b12 100644
--- a/science/clhep/distinfo
+++ b/science/clhep/distinfo
@@ -1 +1 @@
-MD5 (clhep-1.6.0.0.tar.gz) = 8f2a95b64a6044f8211018b3d26c7466
+MD5 (clhep-1.8.0.0.tgz) = 10771473aac76498ddc62b48deee1e41
diff --git a/science/clhep/pkg-plist b/science/clhep/pkg-plist
index b37dd41f6cb9..04a1c954190e 100644
--- a/science/clhep/pkg-plist
+++ b/science/clhep/pkg-plist
@@ -1,9 +1,164 @@
 include/CLHEP/Evaluator/Evaluator.h
+include/CLHEP/GenericFunctions/ACos.hh
+include/CLHEP/GenericFunctions/ASin.hh
+include/CLHEP/GenericFunctions/ATan.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/AssociatedLaguerre.hh
+include/CLHEP/GenericFunctions/AssociatedLegendre.hh
+include/CLHEP/GenericFunctions/Bessel.hh
+include/CLHEP/GenericFunctions/BivariateGaussian.hh
+include/CLHEP/GenericFunctions/ConstMinusFunction.hh
+include/CLHEP/GenericFunctions/ConstMinusParameter.hh
+include/CLHEP/GenericFunctions/ConstOverFunction.hh
+include/CLHEP/GenericFunctions/ConstOverParameter.hh
+include/CLHEP/GenericFunctions/ConstPlusFunction.hh
+include/CLHEP/GenericFunctions/ConstPlusParameter.hh
+include/CLHEP/GenericFunctions/ConstTimesFunction.hh
+include/CLHEP/GenericFunctions/ConstTimesParameter.hh
+include/CLHEP/GenericFunctions/Cos.hh
+include/CLHEP/GenericFunctions/CumulativeChiSquare.hh
+include/CLHEP/GenericFunctions/CutBase.hh
+include/CLHEP/GenericFunctions/CutBase.icc
+include/CLHEP/GenericFunctions/DefiniteIntegral.hh
+include/CLHEP/GenericFunctions/DoubleParamToArgAdaptor.hh
+include/CLHEP/GenericFunctions/DoubleParamToArgAdaptor.icc
+include/CLHEP/GenericFunctions/EllipticIntegral.hh
+include/CLHEP/GenericFunctions/Erf.hh
+include/CLHEP/GenericFunctions/Exp.hh
+include/CLHEP/GenericFunctions/Exponential.hh
+include/CLHEP/GenericFunctions/FixedConstant.hh
+include/CLHEP/GenericFunctions/FloatingConstant.hh
+include/CLHEP/GenericFunctions/FunctionComposition.hh
+include/CLHEP/GenericFunctions/FunctionConvolution.hh
+include/CLHEP/GenericFunctions/FunctionDifference.hh
+include/CLHEP/GenericFunctions/FunctionDirectProduct.hh
+include/CLHEP/GenericFunctions/FunctionNegation.hh
+include/CLHEP/GenericFunctions/FunctionNoop.hh
+include/CLHEP/GenericFunctions/FunctionNumDeriv.hh
+include/CLHEP/GenericFunctions/FunctionPlusParameter.hh
+include/CLHEP/GenericFunctions/FunctionProduct.hh
+include/CLHEP/GenericFunctions/FunctionQuotient.hh
+include/CLHEP/GenericFunctions/FunctionSum.hh
+include/CLHEP/GenericFunctions/FunctionTimesParameter.hh
+include/CLHEP/GenericFunctions/Gaussian.hh
+include/CLHEP/GenericFunctions/GenericFunctions.hh
+include/CLHEP/GenericFunctions/IncompleteGamma.hh
+include/CLHEP/GenericFunctions/Landau.hh
+include/CLHEP/GenericFunctions/LikelihoodFunctional.hh
+include/CLHEP/GenericFunctions/Ln.hh
+include/CLHEP/GenericFunctions/LogGamma.hh
+include/CLHEP/GenericFunctions/ParamToArgAdaptor.hh
+include/CLHEP/GenericFunctions/ParamToArgAdaptor.icc
+include/CLHEP/GenericFunctions/Parameter.hh
+include/CLHEP/GenericFunctions/ParameterDifference.hh
+include/CLHEP/GenericFunctions/ParameterNegation.hh
+include/CLHEP/GenericFunctions/ParameterProduct.hh
+include/CLHEP/GenericFunctions/ParameterQuotient.hh
+include/CLHEP/GenericFunctions/ParameterSum.hh
+include/CLHEP/GenericFunctions/PeriodicRectangular.hh
+include/CLHEP/GenericFunctions/Power.hh
+include/CLHEP/GenericFunctions/Rectangular.hh
+include/CLHEP/GenericFunctions/ReverseExponential.hh
+include/CLHEP/GenericFunctions/Sin.hh
+include/CLHEP/GenericFunctions/SphericalBessel.hh
+include/CLHEP/GenericFunctions/SphericalNeumann.hh
+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/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/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/Matrix/DiagMatrix.h
 include/CLHEP/Matrix/DiagMatrix.icc
 include/CLHEP/Matrix/GenMatrix.h
@@ -67,59 +222,97 @@ include/CLHEP/Random/RanshiEngine.h
 include/CLHEP/Random/SeedTable.h
 include/CLHEP/Random/Stat.h
 include/CLHEP/Random/TripleRand.h
-include/CLHEP/StdHepC++/StdCollision.hh
-include/CLHEP/StdHepC++/StdEvent.hh
-include/CLHEP/StdHepC++/StdFI.hh
-include/CLHEP/StdHepC++/StdParticle.hh
-include/CLHEP/StdHepC++/StdParticleData.hh
-include/CLHEP/StdHepC++/StdRun.hh
-include/CLHEP/StdHepC++/StdStreams.hh
-include/CLHEP/StdHepC++/include/StdHepVer.h
-include/CLHEP/StdHepC++/include/herwig.inc
-include/CLHEP/StdHepC++/include/stdcm1.h
-include/CLHEP/StdHepC++/include/stdcm1.inc
-include/CLHEP/StdHepC++/include/stdcnt.h
-include/CLHEP/StdHepC++/include/stdcnt.inc
-include/CLHEP/StdHepC++/include/stdevent.h
-include/CLHEP/StdHepC++/include/stdhep.h
-include/CLHEP/StdHepC++/include/stdhep.inc
-include/CLHEP/StdHepC++/include/stdlun.h
-include/CLHEP/StdHepC++/include/stdlun.inc
-include/CLHEP/StdHepC++/include/stdtmp.h
-include/CLHEP/Tools/RandMultiGauss.h
-include/CLHEP/Tools/RandomVector.h
-include/CLHEP/Tools/RandomVector.icc
+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/Units/PhysicalConstants.h
 include/CLHEP/Units/SystemOfUnits.h
 include/CLHEP/Utilities/CLHEP.h
 include/CLHEP/Utilities/fortran.h
+include/CLHEP/Vector/AxisAngle.h
+include/CLHEP/Vector/AxisAngle.icc
+include/CLHEP/Vector/Boost.h
+include/CLHEP/Vector/Boost.icc
+include/CLHEP/Vector/BoostX.h
+include/CLHEP/Vector/BoostX.icc
+include/CLHEP/Vector/BoostY.h
+include/CLHEP/Vector/BoostY.icc
+include/CLHEP/Vector/BoostZ.h
+include/CLHEP/Vector/BoostZ.icc
+include/CLHEP/Vector/EulerAngles.h
+include/CLHEP/Vector/EulerAngles.icc
 include/CLHEP/Vector/LorentzRotation.h
 include/CLHEP/Vector/LorentzRotation.icc
 include/CLHEP/Vector/LorentzVector.h
 include/CLHEP/Vector/LorentzVector.icc
 include/CLHEP/Vector/Rotation.h
 include/CLHEP/Vector/Rotation.icc
+include/CLHEP/Vector/RotationInterfaces.h
+include/CLHEP/Vector/RotationInterfaces.icc
+include/CLHEP/Vector/RotationX.h
+include/CLHEP/Vector/RotationX.icc
+include/CLHEP/Vector/RotationY.h
+include/CLHEP/Vector/RotationY.icc
+include/CLHEP/Vector/RotationZ.h
+include/CLHEP/Vector/RotationZ.icc
 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++.a
+lib/libCLHEP-c++.%%VERSION%%.a
 @dirrm include/CLHEP/config
 @dirrm include/CLHEP/Vector
 @dirrm include/CLHEP/Utilities
 @dirrm include/CLHEP/Units
-@dirrm include/CLHEP/Tools
-@dirrm include/CLHEP/StdHepC++/include
-@dirrm include/CLHEP/StdHepC++
+@dirrm include/CLHEP/StdHep/include
+@dirrm include/CLHEP/StdHep
+@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/Evaluator
 @dirrm include/CLHEP