net/charm: Upgrade 6.7.1 -> 6.8.2

Switched to using MASTER_SITES since source tarballs are available in open access.

Reported by:	adridg (tarballs URL)

3 files changed, 70 insertions, 49 deletions

diff --git a/net/charm/Makefile b/net/charm/Makefile
index 90938b981c3d..8aacc8d9cbb7 100644
--- a/net/charm/Makefile
+++ b/net/charm/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	charm
-DISTVERSION=	6.7.1
+DISTVERSION=	6.8.2
 CATEGORIES=	net
+MASTER_SITES=	http://charm.cs.illinois.edu/distrib/
 PKGNAMESUFFIX=	-uiuc
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
@@ -22,13 +23,14 @@ BUILD_DEPENDS=	bash:shells/bash
 
 RESTRICTED=	No commercial use: commercial use requires a commercial license
 
-USES=		fortran gmake localbase:ldflags shebangfix tar
+USES=		fortran gmake localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	src/scripts/*
 USE_LDCONFIG=	yes
 
-ARCH_STR=	linux${ARCH:S/amd64/64/:S/i386/32/}
+#ARCH_STR=	linux${ARCH:S/amd64/64/:S/i386/32/}
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-v${DISTVERSION}
 INSTALL_WRKSRC=	${WRKSRC}/${VERSION}-${ARCH_STR}-gfortran-clang/tmp
 
 BINARY_ALIAS=	gfortran=gfortran${GCC_DEFAULT}
@@ -40,25 +42,15 @@ MULTIPROCESSING_DESC=	Multiprocessing
 OPTIONS_SUB=		yes
 
 MULTICORE_DESC=		Single-node multicore version
-MULTICORE_VARS=		VERSION=multicore
+MULTICORE_VARS=		VERSION=multicore ARCH_STR=linux${ARCH:S/amd64/64/:S/i386/32/}
 
 ETHERNET_DESC=		Ethernet version
-ETHERNET_VARS=		VERSION=netlrts
+ETHERNET_VARS=		VERSION=netlrts ARCH_STR=linux${ARCH:S/amd64/-x86_64/:S/i386//}
 
-MPI_VARS=		VERSION=mpi
+MPI_VARS=		VERSION=mpi ARCH_STR=linux${ARCH:S/amd64/-x86_64/:S/i386//}
 MPI_LDFLAGS=		-lmpich
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
-.include <bsd.port.pre.mk>
-
-.if !exists(${DISTDIR}/NAMD_2.12_Source.tar.gz)
-IGNORE=	please download the release tarball of the version ${DISTVERSION} (${DISTFILES}) from https://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=NAMD, put it into ${DISTDIR}, and run 'make' again
-.else
-do-fetch:
-	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
-	@cd ${DISTDIR}/${DIST_SUBDIR} && ${TAR} xf ${DISTDIR}/NAMD_2.12_Source.tar.gz --strip-components 1 NAMD_2.12_Source/charm-${DISTVERSION}.tar
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's|which gfortran |which gfortran${GCC_DEFAULT} |' ${WRKSRC}/src/arch/common/conv-mach-gfortran.sh
 	@${FIND} ${WRKSRC} -name conv-mach.h | ${XARGS} ${REINPLACE_CMD} 's|CMK_THREADS_ARE_WIN32_FIBERS *1|CMK_THREADS_ARE_WIN32_FIBERS 0|'
@@ -67,7 +59,6 @@ post-patch:
 	@${REINPLACE_CMD} -E 's|(CMK_CC)="(.*)"|\1="\2 ${CFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|(CMK_CXX)="(.*)"|\1="\2 ${CXXFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|(CMK_LD)="(.*)"|\1="\2 ${LDFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
-	@${REINPLACE_CMD} -E 's|/lib/cpp|/usr/bin/cpp|' ${WRKSRC}/src/arch/*/*.sh
 	@${REINPLACE_CMD} -E 's|-shared -o libqt\.so|-shared -o libqt.so -Wl,-soname,libqt.so|' ${WRKSRC}/src/QuickThreads/mkfiles/*
 
 do-build:
@@ -79,4 +70,4 @@ post-install:
 .endfor
 	@cd ${STAGEDIR} && ${MV} lib_so/* ./${PREFIX}/lib && ${RMDIR} lib_so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/charm/distinfo b/net/charm/distinfo
index 18b675b75c97..29c89e78deda 100644
--- a/net/charm/distinfo
+++ b/net/charm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536474556
-SHA256 (charm-uiuc/charm-6.7.1.tar) = d4f3e8ccf44441153d14fa3230c8006527f9e749a1baa948dc4e9e91f284d2c1
-SIZE (charm-uiuc/charm-6.7.1.tar) = 23818240
+TIMESTAMP = 1536533882
+SHA256 (charm-uiuc/charm-6.8.2.tar.gz) = 08e6001b0e9cd00ebde179f76098767149bf7e454f29028fb9a8bfb55778698e
+SIZE (charm-uiuc/charm-6.8.2.tar.gz) = 24420478
diff --git a/net/charm/pkg-plist b/net/charm/pkg-plist
index 1925e0404d5a..ea7f4b668488 100644
--- a/net/charm/pkg-plist
+++ b/net/charm/pkg-plist
@@ -5,10 +5,11 @@ bin/charmrun
 bin/charmxi
 bin/conv-cpm
 bin/dep.pl
+bin/fuzzytree.txt
 bin/testrun
+bin/tree.txt
 include/AdaptiveLB.decl.h
 include/AdaptiveLB.h
-include/BGPTorus.h
 include/BGQTorus.h
 include/BaseLB.decl.h
 include/BaseLB.h
@@ -20,10 +21,11 @@ include/CentralLB.decl.h
 include/CentralLB.h
 include/CentralLBMsg.h
 include/CkArray.decl.h
-include/CkArrayReductionMgr.decl.h
 include/CkCallback.decl.h
 include/CkCheckpoint.decl.h
 include/CkCheckpointStatus.decl.h
+include/CkDummy.decl.h
+include/CkDummy.def.h
 include/CkFutures.decl.h
 include/CkIO.decl.h
 include/CkIO.def.h
@@ -36,7 +38,6 @@ include/CkLoopAPI.h
 include/CkMarshall.decl.h
 include/CkMemCheckpoint.decl.h
 include/CkMulticast.decl.h
-include/CkMulticast.def.h
 include/CkReduction.decl.h
 include/ComboCentLB.decl.h
 include/ComboCentLB.h
@@ -65,6 +66,8 @@ include/GreedyCommLB.decl.h
 include/GreedyCommLB.h
 include/GreedyLB.decl.h
 include/GreedyLB.h
+include/GreedyRefineLB.decl.h
+include/GreedyRefineLB.h
 include/GridCommLB.decl.h
 include/GridCommLB.h
 include/GridCommRefineLB.decl.h
@@ -92,6 +95,7 @@ include/LBOM.h
 include/LBObj.h
 include/LBProfit.h
 include/LBSimulation.h
+%%MPI%%include/MPIOPTS
 include/MetaBalancer.decl.h
 include/MetaBalancer.h
 include/MetisLB.decl.h
@@ -114,7 +118,6 @@ include/OrbLB.h
 include/PathHistory.decl.h
 include/PhasebyArrayLB.decl.h
 include/PhasebyArrayLB.h
-include/RTH.h
 include/RandCentLB.decl.h
 include/RandCentLB.h
 include/RecBipartLB.decl.h
@@ -152,6 +155,7 @@ include/TopoCentLB.h
 include/TopoLB.decl.h
 include/TopoLB.h
 include/TopoManager.h
+include/TraceAutoPerf.decl.h
 include/TraceControlPoints.decl.h
 include/TraceProjections.decl.h
 include/TraceSimple.decl.h
@@ -164,6 +168,7 @@ include/VERSION
 include/VirtualRouter.h
 include/WSLB.decl.h
 include/WSLB.h
+include/XArraySectionReducer.h
 include/XTTorus.h
 include/arrayRedistributor.h
 include/bgconverse.h
@@ -185,14 +190,14 @@ include/cc-craycc.h
 include/cc-craycc.sh
 include/cc-gcc.h
 include/cc-gcc.sh
-include/cc-gcc3.h
-include/cc-gcc3.sh
 include/cc-icc.h
 include/cc-icc.sh
-include/cc-icc8.h
-include/cc-icc8.sh
 include/cc-iccstatic.h
 include/cc-iccstatic.sh
+%%MPI%%include/cc-mpicxx.h
+%%MPI%%include/cc-mpicxx.sh
+%%MPI%%include/cc-pathscale.h
+%%MPI%%include/cc-pathscale.sh
 include/cc-pgcc.h
 include/cc-pgcc.sh
 include/cc-xlc.h
@@ -213,7 +218,7 @@ include/ckBIconfig.h
 include/ckIgetControl.h
 include/ckarray.h
 include/ckarrayindex.h
-include/ckarrayreductionmgr.h
+include/ckarrayoptions.h
 include/ckbitvector.h
 include/ckcallback-ccs.h
 include/ckcallback.h
@@ -222,6 +227,7 @@ include/ckcheckpoint.h
 include/ckcomplex.h
 include/ckdirect.h
 include/ckdll.h
+include/ckdummy.h
 include/ckevacuation.h
 include/ckfutures.h
 include/ckgraph.h
@@ -241,6 +247,8 @@ include/ckmigratable.h
 include/ckmulticast.h
 include/ckobjQ.h
 include/ckobjid.h
+include/ckrdma.h
+include/ckrdmawrapper.h
 include/ckreduction.h
 include/cksection.h
 include/cksequence.h
@@ -249,6 +257,7 @@ include/cksequence_internal.h
 include/ckset.h
 include/ckstatistics.h
 include/ckstream.h
+include/cktaskQ.h
 include/cktiming.h
 include/ckvector3d.h
 include/cmidirect.h
@@ -265,6 +274,7 @@ include/controlPointsf.h
 include/conv-autoconfig.h
 include/conv-ccs.h
 include/conv-common.h
+%%MPI%%include/conv-common.sh
 include/conv-config.h
 include/conv-config.sh
 include/conv-cpath.h
@@ -278,6 +288,8 @@ include/conv-mach-causalft.h
 include/conv-mach-causalft.sh
 %%ETHERNET%%include/conv-mach-clustermatic.h
 %%ETHERNET%%include/conv-mach-clustermatic.sh
+include/conv-mach-cuda.h
+include/conv-mach-cuda.sh
 include/conv-mach-g95.h
 include/conv-mach-g95.sh
 include/conv-mach-gfortran.h
@@ -292,20 +304,28 @@ include/conv-mach-ifort.sh
 %%MPI%%include/conv-mach-lam.sh
 include/conv-mach-lcs.h
 include/conv-mach-lcs.sh
-%%MULTICORE%%include/conv-mach-local.h
-%%MULTICORE%%include/conv-mach-local.sh
-%%ETHERNET%%include/conv-mach-local.h
-%%ETHERNET%%include/conv-mach-local.sh
+%%MULTICORE%%%%ETHERNET%%include/conv-mach-local.h
+%%MULTICORE%%%%ETHERNET%%include/conv-mach-local.sh
+%%MPI%%include/conv-mach-mic.h
+%%MPI%%include/conv-mach-mic.sh
 include/conv-mach-mlogft.h
 include/conv-mach-mlogft.sh
 %%MPI%%include/conv-mach-mpt.h
 %%MPI%%include/conv-mach-mpt.sh
+include/conv-mach-nolb.h
+include/conv-mach-nolb.sh
+include/conv-mach-omp.h
+include/conv-mach-omp.sh
 include/conv-mach-ooc.h
 include/conv-mach-ooc.sh
 include/conv-mach-opt.h
 include/conv-mach-opt.sh
 include/conv-mach-papi.h
 include/conv-mach-papi.sh
+%%ETHERNET%%include/conv-mach-pedantic.h
+%%ETHERNET%%include/conv-mach-pedantic.sh
+include/conv-mach-perftools.h
+include/conv-mach-perftools.sh
 include/conv-mach-persistent.h
 include/conv-mach-persistent.sh
 include/conv-mach-pgf90.h
@@ -313,24 +333,18 @@ include/conv-mach-pgf90.sh
 include/conv-mach-pre.sh
 %%MPI%%include/conv-mach-pthreads.h
 %%MPI%%include/conv-mach-pthreads.sh
+%%ETHERNET%%include/conv-mach-pxshm.h
+%%ETHERNET%%include/conv-mach-pxshm.sh
 %%MPI%%include/conv-mach-scyld.h
 %%MPI%%include/conv-mach-scyld.sh
 %%MPI%%include/conv-mach-smp.h
 %%MPI%%include/conv-mach-smp.sh
-%%ETHERNET%%include/conv-mach-pxshm.h
-%%ETHERNET%%include/conv-mach-pxshm.sh
-%%ETHERNET%%include/conv-mach-scyld.h
-%%ETHERNET%%include/conv-mach-scyld.sh
-%%ETHERNET%%include/conv-mach-smp.h
-%%ETHERNET%%include/conv-mach-smp.sh
 include/conv-mach-syncft.h
 include/conv-mach-syncft.sh
-%%MULTICORE%%include/conv-mach-tcp.h
-%%MULTICORE%%include/conv-mach-tcp.sh
 %%ETHERNET%%include/conv-mach-sysvshm.h
 %%ETHERNET%%include/conv-mach-sysvshm.sh
-%%ETHERNET%%include/conv-mach-tcp.h
-%%ETHERNET%%include/conv-mach-tcp.sh
+%%MULTICORE%%%%ETHERNET%%include/conv-mach-tcp.h
+%%MULTICORE%%%%ETHERNET%%include/conv-mach-tcp.sh
 include/conv-mach-tsan.h
 include/conv-mach-tsan.sh
 include/conv-mach.h
@@ -339,6 +353,7 @@ include/conv-onesided.h
 include/conv-ooc.h
 include/conv-qd.h
 include/conv-random.h
+include/conv-rdma.h
 include/conv-trace.h
 include/converse.h
 include/cp_effects.h
@@ -354,6 +369,7 @@ include/graph.h
 include/init.h
 include/lbdb++.h
 include/lbdb.h
+include/lrtslock.h
 include/manager.h
 include/memory-isomalloc.h
 include/mempool.h
@@ -366,6 +382,12 @@ include/msgq.h
 include/objid.h
 include/pathHistory.h
 include/persistent.h
+include/picsautoperf.h
+include/picsautoperfAPI.h
+include/picsautoperfAPIC.h
+include/picsdecisiontree.h
+include/picsdefs.h
+include/picstreenode.h
 include/pup.h
 include/pup_c.h
 include/pup_cmialloc.h
@@ -393,12 +415,13 @@ include/sockRoutines.c
 include/sockRoutines.h
 include/stats.h
 include/strided_sequence.h
-include/tempo.decl.h
-include/tempo.h
+include/taskqueue.h
 include/topology.h
+include/topomanager_config.h
 include/trace-bluegene.h
 include/trace-common.h
 include/trace-controlPoints.h
+include/trace-perf.h
 include/trace-projections.h
 include/trace-simple.h
 include/trace.h
@@ -430,8 +453,8 @@ lib/libconv-util.a
 lib/libconv-util.so
 lib/libconv-utilf.a
 lib/libconv-utilf.so
-lib/libglobal-copy.a
 lib/libglobal-swap.a
+%%MPI%%%%ETHERNET%%lib/libglobal-swap.so
 lib/libldb-bluegene.a
 lib/libldb-bluegene.so
 lib/libldb-neighbor.a
@@ -506,7 +529,10 @@ lib/libmoduleGreedyCommLB.a
 lib/libmoduleGreedyCommLB.so
 lib/libmoduleGreedyLB.a
 lib/libmoduleGreedyLB.so
+lib/libmoduleGreedyRefineLB.a
+lib/libmoduleGreedyRefineLB.so
 lib/libmoduleHybridLB.a
+lib/libmoduleHybridLB.dep
 lib/libmoduleHybridLB.so
 lib/libmoduleNDMeshStreamer.a
 lib/libmoduleNDMeshStreamer.dep
@@ -563,16 +589,22 @@ lib/libthreads-uJcontext-tls.a
 lib/libthreads-uJcontext-tls.so
 lib/libthreads-uJcontext.a
 lib/libthreads-uJcontext.so
+lib/libtmgr.a
+lib/libtmgr.so
 lib/libtrace-all.a
 lib/libtrace-all.so
 lib/libtrace-bluegene.a
 lib/libtrace-bluegene.so
+lib/libtrace-controlPoints.a
+lib/libtrace-controlPoints.so
 lib/libtrace-converse.a
 lib/libtrace-converse.so
 lib/libtrace-counter.a
 lib/libtrace-counter.so
 lib/libtrace-memory.a
 lib/libtrace-memory.so
+lib/libtrace-perfReport.a
+lib/libtrace-perfReport.so
 lib/libtrace-projections.a
 lib/libtrace-projections.so
 lib/libtrace-projector.a
@@ -585,5 +617,3 @@ lib/libtrace-utilization.a
 lib/libtrace-utilization.so
 lib/libtracef_f.a
 lib/libtracef_f.so
-lib/loadsym.a
-lib/loadsym.so