net/charm: Downgrade 6.8.2 -> 6.7.1

Direct fetch from the git server might be a license violation.
Will try to get an agreement from UIUC that the previous fetch can be returned.
Not adding PORTEPOCH, because it was nothing wrong technically with 6.8.2.

Suggested by:	linimon, adamw

3 files changed, 29 insertions, 57 deletions

diff --git a/net/charm/Makefile b/net/charm/Makefile
index 4e4addd13a4f..79ed87883c51 100644
--- a/net/charm/Makefile
+++ b/net/charm/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	charm
-DISTVERSIONPREFIX=	v
-DISTVERSION=	6.8.2
+DISTVERSION=	6.7.1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-uiuc
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
@@ -21,7 +20,7 @@ ONLY_FOR_ARCHS_REASON=	Not clear if it can be built on other architectures
 FETCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	bash:shells/bash
 
-USES=		fortran gmake localbase:ldflags shebangfix
+USES=		fortran gmake localbase:ldflags shebangfix tar
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	src/scripts/*
 USE_LDCONFIG=	yes
@@ -54,16 +53,16 @@ local-makesum: # Workaround: the generic 'make makesum' is broken when custom do
 	@${MAKE} distclean fetch makesum
 
 do-fetch:
-	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
-	  ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-	  cd ${DISTDIR}/${DIST_SUBDIR} && \
-	    git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
-	    (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${DISTVERSIONFULL} && ${RM} -r .git) && \
-	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
-	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
-	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T - && \
-	    ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
+	@if ! [ -f "${DISTDIR}/NAMD_2.12_Source.tar.gz" ]; then \
+	  ${ECHO} "(!!)"; \
+	  ${ECHO} "(!!) Please download the release tarball of the version 2.12 of NAMD (NAMD_2.12_Source.tar.gz)"; \
+	  ${ECHO} "(!!) from https://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=NAMD,"; \
+	  ${ECHO} "(!!) put it into ${DISTDIR}, and run 'make' again."; \
+	  ${ECHO} "(!!)"; \
+	  ${FALSE}; \
 	fi
+	@${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
 
 post-patch:
 	@${REINPLACE_CMD} 's|which gfortran |which gfortran${GCC_DEFAULT} |' ${WRKSRC}/src/arch/common/conv-mach-gfortran.sh
@@ -73,6 +72,7 @@ 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:
diff --git a/net/charm/distinfo b/net/charm/distinfo
index 77434b1d6398..18b675b75c97 100644
--- a/net/charm/distinfo
+++ b/net/charm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536444124
-SHA256 (charm-uiuc/charm-v6.8.2.tar.gz) = 23dce13f0aeb8c97fe2746a752984483f67cc2a87b302fe3a7c3eea65b54de06
-SIZE (charm-uiuc/charm-v6.8.2.tar.gz) = 24373693
+TIMESTAMP = 1536474556
+SHA256 (charm-uiuc/charm-6.7.1.tar) = d4f3e8ccf44441153d14fa3230c8006527f9e749a1baa948dc4e9e91f284d2c1
+SIZE (charm-uiuc/charm-6.7.1.tar) = 23818240
diff --git a/net/charm/pkg-plist b/net/charm/pkg-plist
index 5b2ce0e42bee..1925e0404d5a 100644
--- a/net/charm/pkg-plist
+++ b/net/charm/pkg-plist
@@ -5,11 +5,10 @@ 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
@@ -21,11 +20,10 @@ 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
@@ -38,6 +36,7 @@ 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
@@ -66,8 +65,6 @@ 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
@@ -117,6 +114,7 @@ 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
@@ -154,7 +152,6 @@ 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
@@ -167,7 +164,6 @@ include/VERSION
 include/VirtualRouter.h
 include/WSLB.decl.h
 include/WSLB.h
-include/XArraySectionReducer.h
 include/XTTorus.h
 include/arrayRedistributor.h
 include/bgconverse.h
@@ -189,8 +185,12 @@ 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
 include/cc-pgcc.h
@@ -213,7 +213,7 @@ include/ckBIconfig.h
 include/ckIgetControl.h
 include/ckarray.h
 include/ckarrayindex.h
-include/ckarrayoptions.h
+include/ckarrayreductionmgr.h
 include/ckbitvector.h
 include/ckcallback-ccs.h
 include/ckcallback.h
@@ -222,7 +222,6 @@ include/ckcheckpoint.h
 include/ckcomplex.h
 include/ckdirect.h
 include/ckdll.h
-include/ckdummy.h
 include/ckevacuation.h
 include/ckfutures.h
 include/ckgraph.h
@@ -242,8 +241,6 @@ 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
@@ -252,7 +249,6 @@ 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
@@ -269,7 +265,6 @@ 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
@@ -283,8 +278,6 @@ 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
@@ -307,18 +300,12 @@ 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
-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
@@ -352,7 +339,6 @@ 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
@@ -368,7 +354,6 @@ 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
@@ -381,12 +366,6 @@ 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
@@ -414,13 +393,12 @@ include/sockRoutines.c
 include/sockRoutines.h
 include/stats.h
 include/strided_sequence.h
-include/taskqueue.h
+include/tempo.decl.h
+include/tempo.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
@@ -452,6 +430,7 @@ lib/libconv-util.a
 lib/libconv-util.so
 lib/libconv-utilf.a
 lib/libconv-utilf.so
+lib/libglobal-copy.a
 lib/libglobal-swap.a
 lib/libldb-bluegene.a
 lib/libldb-bluegene.so
@@ -527,10 +506,7 @@ 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
@@ -587,22 +563,16 @@ 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
@@ -615,3 +585,5 @@ lib/libtrace-utilization.a
 lib/libtrace-utilization.so
 lib/libtracef_f.a
 lib/libtracef_f.so
+lib/loadsym.a
+lib/loadsym.so