Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Sep 2018 17:03:56 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r479320 - in head: . net/charm
Message-ID:  <201809091703.w89H3u0v018715@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sun Sep  9 17:03:56 2018
New Revision: 479320
URL: https://svnweb.freebsd.org/changeset/ports/479320

Log:
  net/charm: Add IGNORE clause instead of the custom do-fetch clause for the licensing warning
  
  Also add RESTRICTED, and rermove GIT_URL.
  
  Reported by:	mat

Modified:
  head/LEGAL
  head/net/charm/Makefile

Modified: head/LEGAL
==============================================================================
--- head/LEGAL	Sun Sep  9 16:59:57 2018	(r479319)
+++ head/LEGAL	Sun Sep  9 17:03:56 2018	(r479320)
@@ -239,3 +239,4 @@ snes9x-*		emulators/snes9x-gtk	Commercial users must s
 rainloop-1.*.zip	mail/rainloop		Redistribution in any form is prohibited
 lha-114i.tar.gz		archivers/lha		Binary only redistribution is prohibited. Non-network redistribution such as CDROM requires prior notification to author. Commercial use whose main purpose is to provide the functions of this program is prohibited.
 atom-*.tgz		science/atom		Redistribution in any form is prohibited
+charm-uiuc*		net/charm		No commercial use: commercial use requires a commercial license

Modified: head/net/charm/Makefile
==============================================================================
--- head/net/charm/Makefile	Sun Sep  9 16:59:57 2018	(r479319)
+++ head/net/charm/Makefile	Sun Sep  9 17:03:56 2018	(r479320)
@@ -20,13 +20,13 @@ ONLY_FOR_ARCHS_REASON=	Not clear if it can be built on
 FETCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	bash:shells/bash
 
+RESTRICTED=	No commercial use: commercial use requires a commercial license
+
 USES=		fortran gmake localbase:ldflags shebangfix tar
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	src/scripts/*
 USE_LDCONFIG=	yes
 
-GIT_URL=	https://charm.cs.illinois.edu/gerrit/charm.git
-
 ARCH_STR=	linux${ARCH:S/amd64/64/:S/i386/32/}
 
 INSTALL_WRKSRC=	${WRKSRC}/${VERSION}-${ARCH_STR}-gfortran-clang/tmp
@@ -49,20 +49,15 @@ MPI_VARS=		VERSION=mpi
 MPI_LDFLAGS=		-lmpich
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
-local-makesum: # Workaround: the generic 'make makesum' is broken when custom do-fetch is defined: it calls ${SCRIPTSDIR}/do-fetch.sh.
-	@${MAKE} distclean fetch makesum
+.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:
-	@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
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|which gfortran |which gfortran${GCC_DEFAULT} |' ${WRKSRC}/src/arch/common/conv-mach-gfortran.sh
@@ -84,4 +79,4 @@ post-install:
 .endfor
 	@cd ${STAGEDIR} && ${MV} lib_so/* ./${PREFIX}/lib && ${RMDIR} lib_so
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809091703.w89H3u0v018715>