gffread: Clean up

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu Oct 27 19:33:49 2022 -0500
Changeset:	93e010fd4ba92f43d28dcec6cce8db413f64c551

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

Log Message:
gffread: Clean up

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

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

diffstat:
 gffread/Makefile               |  9 +--------
 gffread/distinfo               |  2 +-
 gffread/patches/patch-Makefile | 21 +++++++++++----------
 3 files changed, 13 insertions(+), 19 deletions(-)

diffs:
diff --git a/gffread/Makefile b/gffread/Makefile
index 6919d7c07d..8d5ae0064f 100644
--- a/gffread/Makefile
+++ b/gffread/Makefile
@@ -5,16 +5,13 @@
 #              Thu Oct 27 09:58:19 CDT 2022               #
 ###########################################################
 
-###########################################################
-# Unconverted and partially converted FreeBSD port syntax:
-
 DISTNAME=	gffread-0.12.7
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gpertea/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-HOMEPAGE=	https://ccb.jhu.edu/software/stringtie/gff.shtml#gffread
+HOMEPAGE=	https://ccb.jhu.edu/software/stringtie/gff.shtml
 COMMENT=	GFF/GTF format conversions, filtering, FASTA extraction, etc
 LICENSE=	mit
 
@@ -24,8 +21,4 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 INSTALL_TARGET=	install-strip
 
-INSTALLATION_DIRS=	bin
-
-# CentOS doesn't have zlib in the base, so uncomment if needed.
-# .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gffread/distinfo b/gffread/distinfo
index 57688bc7d5..bc17560aeb 100644
--- a/gffread/distinfo
+++ b/gffread/distinfo
@@ -6,4 +6,4 @@ Size (gffread-0.12.7.tar.gz) = 403734 bytes
 BLAKE2s (gpertea-gclib-v0.12.7.tar.gz) = 68a41720355aac7d8b0602a66c558cfdabd93594a9079761ab5332f7adece277
 SHA512 (gpertea-gclib-v0.12.7.tar.gz) = 2ff7be21f8ae002afdd7e34b6200e308f87077331c174dbea863972a01a0b6758062accda431bb73ef45ae91db44871f9eb0f5ae4bd564252599236282e57f90
 Size (gpertea-gclib-v0.12.7.tar.gz) = 259314 bytes
-SHA1 (patch-Makefile) = 02268a6336c4a5f7488b0fb64842714ab04d0ec9
+SHA1 (patch-Makefile) = 07e83c4b17715f31f0429671dba703a8b1d31118
diff --git a/gffread/patches/patch-Makefile b/gffread/patches/patch-Makefile
index c5603c65ff..0fc1752909 100644
--- a/gffread/patches/patch-Makefile
+++ b/gffread/patches/patch-Makefile
@@ -2,7 +2,7 @@ $NetBSD$
 
 # Portability and package-friendliness
 
---- Makefile.orig	2021-07-23 14:21:36 UTC
+--- Makefile.orig	2021-07-23 14:21:36.000000000 +0000
 +++ Makefile
 @@ -1,11 +1,11 @@
 -GCLDIR := $(if $(GCLDIR),$(GCLDIR),../gclib)
@@ -18,7 +18,7 @@ $NetBSD$
  
  LDFLAGS := $(if $(LDFLAGS),$(LDFLAGS),-g)
  
-@@ -15,7 +15,7 @@ BASEFLAGS  := -Wall -Wextra -std=c++11 ${SEARCHDIRS} -
+@@ -15,7 +15,7 @@ BASEFLAGS  := -Wall -Wextra -std=c++11 $
  
  GCCV8 := $(shell expr `${CXX} -dumpversion | cut -f1 -d.` \>= 8)
  ifeq "$(GCCV8)" "1"
@@ -36,20 +36,19 @@ $NetBSD$
    endif
    ifneq (,$(filter %memcheck %memdebug, $(MAKECMDGOALS)))
       #use sanitizer in gcc 4.9+
-@@ -79,11 +79,8 @@ OBJS := ${GCLDIR}/GBase.o ${GCLDIR}/GArgs.o ${GCLDIR}/
+@@ -79,10 +79,7 @@ OBJS := ${GCLDIR}/GBase.o ${GCLDIR}/GArg
   
  .PHONY : all
  
 -all static release debug memcheck memdebug profile gprof prof: ../gclib gffread
-+all static release debug memcheck memdebug profile gprof prof: ${GCLDIR} gffread
- 
+-
 -../gclib:
 -	git clone https://github.com/gpertea/gclib.git ../gclib
--
++all static release debug memcheck memdebug profile gprof prof: ${GCLDIR} gffread
+ 
  $(OBJS) : $(GCLDIR)/GBase.h $(GCLDIR)/gff.h
  gffread.o : gff_utils.h $(GCLDIR)/GBase.h $(GCLDIR)/gff.h
- gff_utils.o : gff_utils.h $(GCLDIR)/gff.h
-@@ -97,9 +94,19 @@ gffread: $(OBJS) gffread.o
+@@ -97,9 +94,21 @@ gffread: $(OBJS) gffread.o
  
  # target for removing all object files
  
@@ -60,13 +59,15 @@ $NetBSD$
  	@${RM} gffread gffread.o* gffread.exe $(OBJS)
  	@${RM} core.*
  
++MKDIR	?= mkdir
 +INSTALL	?= install
 +STRIP	?= strip
 +PREFIX	?= /usr/local
 +DESTDIR	?= .
- 
++
 +install:
++	${MKDIR} -p ${DESTDIR}${PREFIX}/bin
 +	${INSTALL} -c gffread ${DESTDIR}${PREFIX}/bin
-+
+ 
 +install-strip: install
 +	${STRIP} ${DESTDIR}${PREFIX}/bin/gffread