trimadap: Cleanup & honor LDFLAGS

[Winston Weinert <winston%ml1.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Winston Weinert <winston%ml1.net@localhost>
Pushed By:	winston
Date:		Thu Apr 26 03:47:13 2018 -0500
Changeset:	4cb94d631756bbd6fd06b65c6ce56b00d1b4d158

Modified Files:
	trimadap/Makefile
	trimadap/distinfo
	trimadap/patches/patch-Makefile

Log Message:
trimadap: Cleanup & honor LDFLAGS

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

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

diffstat:
 trimadap/Makefile               | 13 +------------
 trimadap/distinfo               | 10 +++++-----
 trimadap/patches/patch-Makefile | 16 +++++++++++++---
 3 files changed, 19 insertions(+), 20 deletions(-)

diffs:
diff --git a/trimadap/Makefile b/trimadap/Makefile
index ecf52e2fda..30019e8e03 100644
--- a/trimadap/Makefile
+++ b/trimadap/Makefile
@@ -1,9 +1,4 @@
 # $NetBSD$
-#
-###########################################################
-#                  Generated by fbsd2pkg                  #
-#              Tue Mar  6 13:47:17 CST 2018               #
-###########################################################
 
 DISTNAME=	trimadap-${PORTVERSION}
 CATEGORIES=	biology
@@ -18,13 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 WRKSRC=		${WRKDIR}/trimadap-${GITHUB_TAG}
 
-PORTVERSION=	0.1.20170211
-
-# FIXME: Come up with a better patch that can be sent upstream
-SUBST_CLASSES+=		libz
-SUBST_STAGE.libz=	post-patch
-SUBST_SED.libz+=	-e "s|-lz|-L${PREFIX}/lib -lz|g"
-SUBST_FILES.libz+=	${WRKSRC}/Makefile
+PORTVERSION=	0.2.20170211
 
 INSTALLATION_DIRS=	bin
 
diff --git a/trimadap/distinfo b/trimadap/distinfo
index 6028a58d02..fbebdc61ae 100644
--- a/trimadap/distinfo
+++ b/trimadap/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (trimadap-0.1.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 30705541cc8c68ea3bfeb5d2bdbc6fcf3e55e51d
-RMD160 (trimadap-0.1.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 95019d0ed6aa478efa9126a6446afc71ea054f6d
-SHA512 (trimadap-0.1.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 364683285fd5f52df33e637f2ca9756b00a24acb45ea3a9ccddaf4126ee30e3f4e1150f56b0e5404f62b010374000eb6768c16ef17954356ffba7d1f28c01c86
-Size (trimadap-0.1.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 13133 bytes
-SHA1 (patch-Makefile) = 3c1208c10b83461280a53e6b14f9d2a73481947b
+SHA1 (trimadap-0.2.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 30705541cc8c68ea3bfeb5d2bdbc6fcf3e55e51d
+RMD160 (trimadap-0.2.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 95019d0ed6aa478efa9126a6446afc71ea054f6d
+SHA512 (trimadap-0.2.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 364683285fd5f52df33e637f2ca9756b00a24acb45ea3a9ccddaf4126ee30e3f4e1150f56b0e5404f62b010374000eb6768c16ef17954356ffba7d1f28c01c86
+Size (trimadap-0.2.20170211-ddfef210563830d9193b40949da3523b6fb93003.tar.gz) = 13133 bytes
+SHA1 (patch-Makefile) = 7f66c14aa1ccf67ee94895d03a98aad62e8d0731
 SHA1 (patch-kthread.c) = 40cfaaf734b0eed0da13f698d2e31d55f189f272
diff --git a/trimadap/patches/patch-Makefile b/trimadap/patches/patch-Makefile
index b25fe4aea3..91dcd5659a 100644
--- a/trimadap/patches/patch-Makefile
+++ b/trimadap/patches/patch-Makefile
@@ -1,13 +1,23 @@
 $NetBSD$
 
-#Use the correct compiler variable (CXX, not CC) and respect the environment
+Allow flags & compiler override
 --- Makefile.orig	2017-02-11 22:31:35 UTC
 +++ Makefile
-@@ -1,5 +1,5 @@
+@@ -1,10 +1,12 @@
 -CC=gcc
 -CFLAGS=-g -Wall -O2 -Wno-unused-function
 +CC ?=		gcc
 +CFLAGS ?=	-g -Wall -O2 -Wno-unused-function
++LDFLAGS +=	-lz -lm
  
- all:trimadap-mt
+-all:trimadap-mt
++all: trimadap-mt
  
+ trimadap-mt:trimadap-mt.c ksw.c kthread.c kseq.h ksw.h
+-		$(CC) $(CFLAGS) -pthread ksw.c kthread.c trimadap-mt.c -o $@ -lz -lm
++	$(CC) $(CFLAGS) -pthread ksw.c kthread.c trimadap-mt.c -o $@ $(LDFLAGS)
+ 
+ clean:
+-		rm -fr gmon.out *.o ext/*.o a.out seqtk trimadap *~ *.a *.dSYM session* trimadap-mt
++	rm -fr gmon.out *.o ext/*.o a.out seqtk trimadap *~ *.a \
++		*.dSYM session* trimadap-mt