pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cd-hit: Clean up github fetch, replace patch with MAKE_FLAGS.



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <jwbacon%tds.net@localhost>
Pushed By:	outpaddling
Date:		Wed Sep 30 11:53:01 2015 -0500
Changeset:	349c96137c2aca5cd2973bff3d85852360b4fba0

Modified Files:
	cd-hit/Makefile
	cd-hit/distinfo
Removed Files:
	cd-hit/buildlink3.mk

Log Message:
cd-hit: Clean up github fetch, replace patch with MAKE_FLAGS.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=349c96137c2aca5cd2973bff3d85852360b4fba0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cd-hit/Makefile      | 24 ++++++++----------------
 cd-hit/buildlink3.mk | 12 ------------
 cd-hit/distinfo      |  8 ++++----
 3 files changed, 12 insertions(+), 32 deletions(-)

diffs:
diff --git a/cd-hit/Makefile b/cd-hit/Makefile
index cae97b6..2a25754 100644
--- a/cd-hit/Makefile
+++ b/cd-hit/Makefile
@@ -4,10 +4,9 @@
 #               Generated by fbsd2pkg                     #
 ###########################################################
 
-DISTNAME=	cd-hit-v${PKG_VERSION}-2015-0603
-PKGNAME=	cd-hit-${PKG_VERSION}
+DISTNAME=	cdhit-4.6.4
 CATEGORIES=	biology
-MASTER_SITES=	${MASTER_SITE_GITHUB:=weizhongli/cdhit/releases/download/V${PKG_VERSION}/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=weizhongli/}
 
 MAINTAINER=	jwbacon%tds.net@localhost
 HOMEPAGE=	http://weizhong-lab.ucsd.edu/cd-hit/
@@ -15,32 +14,25 @@ COMMENT=	Clustering and comparing protein or nucleotide sequences
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c++
-USE_TOOLS+=	bash:run gmake
+USE_TOOLS+=	bash:run gmake perl
 REPLACE_PERL=	*.pl
+GITHUB_TAG=	V${PKGVERSION}
+
+# Restore default overridden by GITHUB_TAG
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 SUBST_CLASSES+=		compiler
 SUBST_STAGE.compiler=	post-patch
 SUBST_FILES.compiler=	${WRKSRC}/${MAKE_FILE}
 SUBST_SED.compiler=	-e 's|g++|${CXX:Q}|g'
 
-SUBST_CLASSES+=		destdir
-SUBST_STAGE.destdir=	post-patch
-SUBST_FILES.destdir=	${WRKSRC}/${MAKE_FILE}
-SUBST_SED.destdir=	-e 's|$$(PREFIX)|$${DESTDIR}$${PREFIX}/bin|g'
-
 SUBST_CLASSES+=		bash
 SUBST_STAGE.bash=	post-patch
 SUBST_FILES.bash=	${WRKSRC}/cd-hit-2d-para.pl ${WRKSRC}/cd-hit-para.pl
 SUBST_SED.bash=		-e 's|/bin/bash|${PREFIX}/bin/bash|g'
 
-MAKE_FILE=	makefile
-MAKE_FLAGS+=	openmp=yes
+MAKE_FLAGS+=		openmp=yes PREFIX=${DESTDIR}${PREFIX}/bin
 
 INSTALLATION_DIRS=	bin
 
-# Fails on NetBSD
-FETCH_USING=	curl
-
-PKG_VERSION=	4.6.4
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/cd-hit/buildlink3.mk b/cd-hit/buildlink3.mk
deleted file mode 100644
index e8fbd7d..0000000
--- a/cd-hit/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/09/18 13:44:08 outpaddling Exp $
-
-BUILDLINK_TREE+=	cd-hit
-
-.if !defined(CD_HIT_BUILDLINK3_MK)
-CD_HIT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cd-hit+=	cd-hit>=4.6.1
-BUILDLINK_PKGSRCDIR.cd-hit?=	../../wip/cd-hit
-.endif	# CD_HIT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-cd-hit
diff --git a/cd-hit/distinfo b/cd-hit/distinfo
index cd1937f..d94bff4 100644
--- a/cd-hit/distinfo
+++ b/cd-hit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/09/18 13:44:08 outpaddling Exp $
+$NetBSD$
 
-SHA1 (cd-hit-v4.6.4-2015-0603.tar.gz) = e4315377a2cf04648abe6d6ac1f988029a603581
-RMD160 (cd-hit-v4.6.4-2015-0603.tar.gz) = ca0d407a12584495e9e6f2e3a89e968e04f9e7b7
-Size (cd-hit-v4.6.4-2015-0603.tar.gz) = 1150522 bytes
+SHA1 (cdhit-4.6.4.tar.gz) = 3606a8200e62ac60c9dd782a57bec426256e6fa8
+RMD160 (cdhit-4.6.4.tar.gz) = a94a29103393dded87000173d8eb4ec1a1e0614f
+Size (cdhit-4.6.4.tar.gz) = 1148426 bytes


Home | Main Index | Thread Index | Old Index