samtools: Minimize Makefile patch

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Mar 19 12:50:46 2021 -0500
Changeset:	3d2cf0683c27a1986ff1c4bd1aeaa12a43bb6c9e

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

Log Message:
samtools: Minimize Makefile patch

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

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

diffstat:
 samtools/distinfo               |  2 +-
 samtools/patches/patch-Makefile | 38 ++------------------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

diffs:
diff --git a/samtools/distinfo b/samtools/distinfo
index ac849f5be5..0036d52043 100644
--- a/samtools/distinfo
+++ b/samtools/distinfo
@@ -4,4 +4,4 @@ SHA1 (samtools-1.12.tar.gz) = f46eb3a18885fb352d8746d51a206f7f34916232
 RMD160 (samtools-1.12.tar.gz) = 511ba541e9f3dbbab333d4a24a83f63c628b5b18
 SHA512 (samtools-1.12.tar.gz) = 7f468a4740610c2fdc42d8f020d3082e5b2b2e73b0c2dfc19b212ca259d703f34f7df0922e409a94500ccc0357d4d46306035be29c23a523ef6e959022f9d1db
 Size (samtools-1.12.tar.gz) = 4528460 bytes
-SHA1 (patch-Makefile) = 12dd394dcf9d29f612f5ebac5731f3369109397e
+SHA1 (patch-Makefile) = 3fc1f1d67167c8ca8eff1ed17f7a084ec3d4579d
diff --git a/samtools/patches/patch-Makefile b/samtools/patches/patch-Makefile
index 608c84c00d..a1f947b630 100644
--- a/samtools/patches/patch-Makefile
+++ b/samtools/patches/patch-Makefile
@@ -1,43 +1,9 @@
 $NetBSD$
 
-# Use pkgsrc install commands
+# Respect pkgsrc env
 
---- Makefile.orig	2020-09-22 12:15:55.000000000 +0000
+--- Makefile.orig	2021-03-19 17:48:34.572594186 +0000
 +++ Makefile
-@@ -21,13 +21,13 @@
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- # DEALINGS IN THE SOFTWARE.
- 
--CC       = gcc
--AR       = ar
--AWK      = awk
--CPPFLAGS =
-+CC       ?= gcc
-+AR       ?= ar
-+AWK      ?= awk
-+CPPFLAGS ?=
- #CFLAGS   = -g -Wall -O2 -pedantic -std=c99 -D_XOPEN_SOURCE=600
--CFLAGS   = -g -Wall -O2
--LDFLAGS  =
-+CFLAGS   ?= -g -Wall -O2
-+LDFLAGS  ?=
- LIBS     =
- 
- LZ4DIR   = ./lz4
-@@ -49,10 +49,10 @@ AOBJS=      bam_index.o bam_plcmd.o sam_
- 	    bam_ampliconclip.o amplicon_stats.o
- LZ4OBJS  =  $(LZ4DIR)/lz4.o
- 
--prefix      = /usr/local
--exec_prefix = $(prefix)
-+PREFIX      = /usr/local
-+exec_prefix = $(PREFIX)
- bindir      = $(exec_prefix)/bin
--datarootdir = $(prefix)/share
-+datarootdir = $(PREFIX)/share
- mandir      = $(datarootdir)/man
- man1dir     = $(mandir)/man1
- 
 @@ -61,12 +61,11 @@ misc_bindir = $(bindir)
  
  MKDIR_P = mkdir -p