svn commit: r479268 - in head/science/namd: . files
Yuri Victorovich
yuri at FreeBSD.org
Sun Sep 9 06:18:03 UTC 2018
Author: yuri
Date: Sun Sep 9 06:18:01 2018
New Revision: 479268
URL: https://svnweb.freebsd.org/changeset/ports/479268
Log:
science/namd: Downgrade 2-12-211 -> 2.12
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 2.12.211.
Suggested by: linimon, adamw
Modified:
head/science/namd/Makefile
head/science/namd/distinfo
head/science/namd/files/patch-Makefile
head/science/namd/files/patch-config
Modified: head/science/namd/Makefile
==============================================================================
--- head/science/namd/Makefile Sun Sep 9 06:14:40 2018 (r479267)
+++ head/science/namd/Makefile Sun Sep 9 06:18:01 2018 (r479268)
@@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= namd
-DISTVERSION= 2-12-211
-DISTVERSIONSUFFIX= -gfdf7ea56
+DISTVERSION= 2.12
CATEGORIES= science
+DISTNAME= ${PORTNAME:tu}_${DISTVERSION}_Source
MAINTAINER= yuri at FreeBSD.org
COMMENT= Computer software for molecular dynamics simulation
@@ -17,7 +17,6 @@ ONLY_FOR_ARCHS= amd64 i386
ONLY_FOR_ARCHS_REASON= Not clear if it can be built on other architectures
BROKEN_i386= need to fix the fft library handling
-FETCH_DEPENDS= git:devel/git
BUILD_DEPENDS= bash:shells/bash \
${LOCALBASE}/include/fftw3.h:math/fftw3
LIB_DEPENDS= libck.so:net/charm \
@@ -49,15 +48,13 @@ local-makesum: # Workaround: the generic 'make makesum
@${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}/${DISTFILES}" ]; then \
+ ${ECHO} "(!!)"; \
+ ${ECHO} "(!!) Please download the release tarball of the version ${DISTVERSION} (${DISTFILES})"; \
+ ${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
do-configure:
Modified: head/science/namd/distinfo
==============================================================================
--- head/science/namd/distinfo Sun Sep 9 06:14:40 2018 (r479267)
+++ head/science/namd/distinfo Sun Sep 9 06:18:01 2018 (r479268)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536445358
-SHA256 (namd-2-12-211-gfdf7ea56.tar.gz) = 2ab3a98f7cc9fa997088502aa87ad8cfe9218b35d4b783b7370a5d5d49f7fe15
-SIZE (namd-2-12-211-gfdf7ea56.tar.gz) = 8278948
+TIMESTAMP = 1536472466
+SHA256 (NAMD_2.12_Source.tar.gz) = 436d11e4ff78136c7463d448d2eee92509a39b4c03cab8d07176bb20ddcb675a
+SIZE (NAMD_2.12_Source.tar.gz) = 9706667
Modified: head/science/namd/files/patch-Makefile
==============================================================================
--- head/science/namd/files/patch-Makefile Sun Sep 9 06:14:40 2018 (r479267)
+++ head/science/namd/files/patch-Makefile Sun Sep 9 06:18:01 2018 (r479268)
@@ -1,9 +1,9 @@
---- Makefile.orig 1970-01-01 00:00:00 UTC
+--- Makefile.orig 2018-09-09 05:56:50 UTC
+++ Makefile
-@@ -435,7 +435,7 @@ LIBS = $(CUDAOBJS) $(PLUGINLIB) $(SBLIB)
+@@ -436,7 +436,7 @@ LIBS = $(CUDAOBJS) $(PLUGINLIB) $(SBLIB)
# CXX is platform dependent
- CXXBASEFLAGS = $(COPTI)$(CHARMINC) $(COPTI)$(SRCDIR) $(COPTI)$(INCDIR) $(DPMTA) $(DPME) $(FMM) $(COPTI)$(PLUGININCDIR) $(COPTI)$(COLVARSINCDIR) $(COPTD)STATIC_PLUGIN $(TCL) $(PYTHON) $(FFT) $(CUDA) $(MIC) $(MEMOPT) $(CCS) $(RELEASE) $(EXTRADEFINES) $(TRACEOBJDEF) $(EXTRAINCS) $(MSA) $(CKLOOP)
+ CXXBASEFLAGS = $(COPTI)$(CHARMINC) $(COPTI)$(SRCDIR) $(COPTI)$(INCDIR) $(DPMTA) $(DPME) $(FMM) $(COPTI)$(PLUGININCDIR) $(COPTD)STATIC_PLUGIN $(TCL) $(PYTHON) $(FFT) $(CUDA) $(MIC) $(MEMOPT) $(CCS) $(RELEASE) $(EXTRADEFINES) $(TRACEOBJDEF) $(EXTRAINCS) $(MSA) $(CKLOOP)
-CXXFLAGS = $(CXXBASEFLAGS) $(CXXOPTS)
+CXXFLAGS += $(CXXBASEFLAGS) $(CXXOPTS)
CXXMICFLAGS = $(CXXBASEFLAGS) $(CXXOPTS) $(CXXMICOPTS)
Modified: head/science/namd/files/patch-config
==============================================================================
--- head/science/namd/files/patch-config Sun Sep 9 06:14:40 2018 (r479267)
+++ head/science/namd/files/patch-config Sun Sep 9 06:18:01 2018 (r479268)
@@ -1,11 +1,11 @@
---- config.orig 2018-09-07 20:23:43 UTC
+--- config.orig 2018-09-09 05:55:48 UTC
+++ config
-@@ -582,7 +582,7 @@ function error_exists {
- if [ -n "$CHARM_OPTS" ]; then
+@@ -535,7 +535,7 @@ begin:
+ if ( $?CHARM_OPTS ) then
echo "CHARMOPTS = $CHARM_OPTS" >> Make.config
- fi
+ endif
- echo 'CHARM = $(CHARMBASE)/$(CHARMARCH)' >> Make.config
+ echo 'CHARM = $(CHARMBASE)' >> Make.config
- ARCH_SUFFIX=""
- [[ "$CHARM_ARCH" == *-scyld* ]] && ARCH_SUFFIX=${ARCH_SUFFIX}-Scyld
- if [[ "$CHARM_ARCH" == *-clustermatic* ]]; then
+ set ARCH_SUFFIX = ""
+ if ( $CHARM_ARCH =~ *-scyld* ) set ARCH_SUFFIX = ${ARCH_SUFFIX}-Scyld
+ if ( $CHARM_ARCH =~ *-clustermatic* ) then
More information about the svn-ports-head
mailing list