science/clhep: Upgrade version 2.1.0.1 => 2.2.0.1 and stage

PR:		192215
Submitted by:	Ports Fury

3 files changed, 68 insertions, 29 deletions

diff --git a/science/clhep/Makefile b/science/clhep/Makefile
index 7bf965c70345..ba1b9e8b0fcd 100644
--- a/science/clhep/Makefile
+++ b/science/clhep/Makefile
@@ -2,32 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	clhep
-PORTVERSION=	2.1.0.1
+PORTVERSION=	2.2.0.1
 CATEGORIES=	science
 MASTER_SITES=	http://wwwasd.web.cern.ch/wwwasd/lhc++/clhep/DISTRIBUTION/tarFiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-oriented toolkit for particle physics applications by CERN
 
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	multi
+
 WRKSRC=		${WRKDIR}/${PORTVERSION}/${PORTNAME:tu}
 
-USES=		gmake perl5 tar:tgz
+USES=		cmake:outsource perl5 tar:tgz
 USE_PERL5=	build
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gmake
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=	Does not compile on FreeBSD 6.X
-.endif
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
-		 '/AM_CXXFLAGS=/s|-O ||g'
+	@${REINPLACE_CMD} -e \
+		'/DESTINATION/s|lib$${LIB_SUFFIX}|libdata|' \
+		${WRKSRC}/cmake/Modules/ClhepToolchain.cmake
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/clhep/distinfo b/science/clhep/distinfo
index 58dd3acb5ad5..b2f2e710321d 100644
--- a/science/clhep/distinfo
+++ b/science/clhep/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clhep-2.1.0.1.tgz) = b8492c1c795e899d8ab2462fc4f40f05a520dba17e598ca2434623e24f51cd29
-SIZE (clhep-2.1.0.1.tgz) = 4243520
+SHA256 (clhep-2.2.0.1.tgz) = 1006284b195e569276ba9d6e3e2b0b2d002e098c10ac09157b26ec076987d7d7
+SIZE (clhep-2.2.0.1.tgz) = 1844675
diff --git a/science/clhep/pkg-plist b/science/clhep/pkg-plist
index b21c805b7be3..9d219fe6b4e3 100644
--- a/science/clhep/pkg-plist
+++ b/science/clhep/pkg-plist
@@ -11,7 +11,6 @@ bin/Units-config
 bin/Utility-config
 bin/Vector-config
 bin/clhep-config
-bin/clheplib
 include/CLHEP/Cast/defs.h
 include/CLHEP/Cast/itos.h
 include/CLHEP/ClhepVersion.h
@@ -33,16 +32,6 @@ 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/Airy.hh
-include/CLHEP/GenericFunctions/Airy.icc
-include/CLHEP/GenericFunctions/Gamma.hh
-include/CLHEP/GenericFunctions/GammaDistribution.hh
-include/CLHEP/GenericFunctions/KroneckerDelta.hh
-include/CLHEP/GenericFunctions/Legendre.hh
-include/CLHEP/GenericFunctions/Legendre.icc
-include/CLHEP/GenericFunctions/ParameterComposition.hh
-include/CLHEP/GenericFunctions/SymToArgAdaptor.hh
-include/CLHEP/GenericFunctions/SymToArgAdaptor.icc
 include/CLHEP/GenericFunctions/ACos.hh
 include/CLHEP/GenericFunctions/ASin.hh
 include/CLHEP/GenericFunctions/ATan.hh
@@ -50,15 +39,24 @@ include/CLHEP/GenericFunctions/Abs.hh
 include/CLHEP/GenericFunctions/AbsFunction.hh
 include/CLHEP/GenericFunctions/AbsFunctional.hh
 include/CLHEP/GenericFunctions/AbsParameter.hh
+include/CLHEP/GenericFunctions/AdaptiveRKStepper.hh
+include/CLHEP/GenericFunctions/Airy.hh
+include/CLHEP/GenericFunctions/Airy.icc
 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/AssociatedLegendre.icc
 include/CLHEP/GenericFunctions/Bessel.hh
 include/CLHEP/GenericFunctions/Bessel.icc
+include/CLHEP/GenericFunctions/BetaDistribution.hh
 include/CLHEP/GenericFunctions/BivariateGaussian.hh
+include/CLHEP/GenericFunctions/ButcherTableau.hh
+include/CLHEP/GenericFunctions/ButcherTableau.icc
+include/CLHEP/GenericFunctions/ClassicalSolver.hh
+include/CLHEP/GenericFunctions/ClebschGordanCoefficientSet.hh
 include/CLHEP/GenericFunctions/ConstMinusFunction.hh
 include/CLHEP/GenericFunctions/ConstMinusParameter.hh
 include/CLHEP/GenericFunctions/ConstOverFunction.hh
@@ -74,13 +72,19 @@ include/CLHEP/GenericFunctions/CutBase.icc
 include/CLHEP/GenericFunctions/DefiniteIntegral.hh
 include/CLHEP/GenericFunctions/DoubleParamToArgAdaptor.hh
 include/CLHEP/GenericFunctions/DoubleParamToArgAdaptor.icc
+include/CLHEP/GenericFunctions/EfficiencyFunctional.hh
 include/CLHEP/GenericFunctions/EllipticIntegral.hh
 include/CLHEP/GenericFunctions/EllipticIntegral.icc
+include/CLHEP/GenericFunctions/EmbeddedRKStepper.hh
 include/CLHEP/GenericFunctions/Erf.hh
 include/CLHEP/GenericFunctions/Exp.hh
 include/CLHEP/GenericFunctions/Exponential.hh
+include/CLHEP/GenericFunctions/ExtendedButcherTableau.hh
+include/CLHEP/GenericFunctions/ExtendedButcherTableau.icc
 include/CLHEP/GenericFunctions/FixedConstant.hh
 include/CLHEP/GenericFunctions/FloatingConstant.hh
+include/CLHEP/GenericFunctions/FourierFit.hh
+include/CLHEP/GenericFunctions/FourierFit.icc
 include/CLHEP/GenericFunctions/FunctionComposition.hh
 include/CLHEP/GenericFunctions/FunctionConvolution.hh
 include/CLHEP/GenericFunctions/FunctionDifference.hh
@@ -93,43 +97,73 @@ include/CLHEP/GenericFunctions/FunctionProduct.hh
 include/CLHEP/GenericFunctions/FunctionQuotient.hh
 include/CLHEP/GenericFunctions/FunctionSum.hh
 include/CLHEP/GenericFunctions/FunctionTimesParameter.hh
+include/CLHEP/GenericFunctions/Gamma.hh
+include/CLHEP/GenericFunctions/GammaDistribution.hh
 include/CLHEP/GenericFunctions/Gaussian.hh
 include/CLHEP/GenericFunctions/GenericFunctions.hh
 include/CLHEP/GenericFunctions/IncompleteGamma.hh
+include/CLHEP/GenericFunctions/InterpolatingPolynomial.hh
+include/CLHEP/GenericFunctions/KroneckerDelta.hh
 include/CLHEP/GenericFunctions/Landau.hh
+include/CLHEP/GenericFunctions/Legendre.hh
+include/CLHEP/GenericFunctions/Legendre.icc
+include/CLHEP/GenericFunctions/LegendreCoefficientSet.hh
+include/CLHEP/GenericFunctions/LegendreCoefficientSet.icc
+include/CLHEP/GenericFunctions/LegendreExpansion.hh
+include/CLHEP/GenericFunctions/LegendreExpansion.icc
+include/CLHEP/GenericFunctions/LegendreFit.hh
+include/CLHEP/GenericFunctions/LegendreFit.icc
 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/NonrelativisticBW.hh
 include/CLHEP/GenericFunctions/ParamToArgAdaptor.hh
 include/CLHEP/GenericFunctions/ParamToArgAdaptor.icc
 include/CLHEP/GenericFunctions/Parameter.hh
+include/CLHEP/GenericFunctions/ParameterComposition.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/PhaseSpace.hh
 include/CLHEP/GenericFunctions/Power.hh
 include/CLHEP/GenericFunctions/Psi2Hydrogen.hh
+include/CLHEP/GenericFunctions/Psi2Hydrogen.icc
 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/RelativisticBW.hh
 include/CLHEP/GenericFunctions/ReverseExponential.hh
+include/CLHEP/GenericFunctions/RungeKuttaClassicalSolver.hh
 include/CLHEP/GenericFunctions/Sigma.hh
+include/CLHEP/GenericFunctions/SimpleRKStepper.hh
 include/CLHEP/GenericFunctions/Sin.hh
 include/CLHEP/GenericFunctions/SphericalBessel.hh
 include/CLHEP/GenericFunctions/SphericalBessel.icc
+include/CLHEP/GenericFunctions/SphericalHarmonicCoefficientSet.hh
+include/CLHEP/GenericFunctions/SphericalHarmonicCoefficientSet.icc
+include/CLHEP/GenericFunctions/SphericalHarmonicExpansion.hh
+include/CLHEP/GenericFunctions/SphericalHarmonicExpansion.icc
+include/CLHEP/GenericFunctions/SphericalHarmonicFit.hh
+include/CLHEP/GenericFunctions/SphericalHarmonicFit.icc
 include/CLHEP/GenericFunctions/SphericalNeumann.hh
 include/CLHEP/GenericFunctions/SphericalNeumann.icc
 include/CLHEP/GenericFunctions/Sqrt.hh
 include/CLHEP/GenericFunctions/Square.hh
+include/CLHEP/GenericFunctions/StepDoublingRKStepper.hh
+include/CLHEP/GenericFunctions/SymToArgAdaptor.hh
+include/CLHEP/GenericFunctions/SymToArgAdaptor.icc
 include/CLHEP/GenericFunctions/Tan.hh
+include/CLHEP/GenericFunctions/Theta.hh
 include/CLHEP/GenericFunctions/TrivariateGaussian.hh
 include/CLHEP/GenericFunctions/Variable.hh
+include/CLHEP/GenericFunctions/VoigtProfile.hh
 include/CLHEP/GenericFunctions/X.hh
 include/CLHEP/GenericFunctions/defs.h
 include/CLHEP/Geometry/BasicVector3D.h
@@ -170,6 +204,7 @@ include/CLHEP/Random/RandBreitWigner.icc
 include/CLHEP/Random/RandChiSquare.h
 include/CLHEP/Random/RandChiSquare.icc
 include/CLHEP/Random/RandEngine.h
+include/CLHEP/Random/RandExpZiggurat.h
 include/CLHEP/Random/RandExponential.h
 include/CLHEP/Random/RandExponential.icc
 include/CLHEP/Random/RandFlat.h
@@ -182,6 +217,7 @@ include/CLHEP/Random/RandGaussQ.h
 include/CLHEP/Random/RandGaussQ.icc
 include/CLHEP/Random/RandGaussT.h
 include/CLHEP/Random/RandGaussT.icc
+include/CLHEP/Random/RandGaussZiggurat.h
 include/CLHEP/Random/RandGeneral.h
 include/CLHEP/Random/RandGeneral.icc
 include/CLHEP/Random/RandLandau.h
@@ -192,6 +228,8 @@ include/CLHEP/Random/RandPoissonQ.h
 include/CLHEP/Random/RandPoissonQ.icc
 include/CLHEP/Random/RandPoissonT.h
 include/CLHEP/Random/RandPoissonT.icc
+include/CLHEP/Random/RandSkewNormal.h
+include/CLHEP/Random/RandSkewNormal.icc
 include/CLHEP/Random/RandStudentT.h
 include/CLHEP/Random/RandStudentT.icc
 include/CLHEP/Random/Random.h
@@ -224,11 +262,11 @@ include/CLHEP/Units/GlobalSystemOfUnits.h
 include/CLHEP/Units/PhysicalConstants.h
 include/CLHEP/Units/SystemOfUnits.h
 include/CLHEP/Units/defs.h
+include/CLHEP/Utility/defs.h
 include/CLHEP/Utility/keywords.h
 include/CLHEP/Utility/memory.h
 include/CLHEP/Utility/noncopyable.h
 include/CLHEP/Utility/type_traits.h
-include/CLHEP/Utility/defs.h
 include/CLHEP/Vector/AxisAngle.h
 include/CLHEP/Vector/AxisAngle.icc
 include/CLHEP/Vector/Boost.h
@@ -286,9 +324,15 @@ lib/libCLHEP-Vector-%%VERSION%%.a
 lib/libCLHEP-Vector-%%VERSION%%.so
 lib/libCLHEP.a
 lib/libCLHEP.so
+libdata/CLHEP-%%VERSION%%/CLHEPConfig.cmake
+libdata/CLHEP-%%VERSION%%/CLHEPConfigVersion.cmake
+libdata/CLHEP-%%VERSION%%/CLHEPLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
+libdata/CLHEP-%%VERSION%%/CLHEPLibraryDepends.cmake
+libdata/pkgconfig/clhep.pc
+@dirrm libdata/CLHEP-%%VERSION%%
 @dirrm include/CLHEP/Vector
-@dirrm include/CLHEP/Units
 @dirrm include/CLHEP/Utility
+@dirrm include/CLHEP/Units
 @dirrm include/CLHEP/RefCount
 @dirrm include/CLHEP/RandomObjects
 @dirrm include/CLHEP/Random