Re: glkgit: remove

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Dear miwarin,

On 2018-05-26, miwarin wrote:
> Module Name:	pkgsrc-wip
> Committed By:	miwarin <miwarin%gmail.com@localhost>
> Pushed By:	miwarin
> Date:		Sat May 26 19:15:42 2018 +0900
> Changeset:	78fdc634651393ff440b5c3934768c8243e3b79e
> 
> Modified Files:
> 	Makefile
> Removed Files:
> 	glkgit/DESCR
> 	glkgit/Makefile
> 	glkgit/PLIST
> 	glkgit/TODO
> 	glkgit/distinfo
> 	glkgit/patches/patch-aa
> 
> Log Message:
> glkgit: remove
> 
> MASTER_SITES not found
> 
> To see a diff of this commit:
> https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78fdc634651393ff440b5c3934768c8243e3b79e
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.

Instead of removing glkgit, may we consider upgrading? Patch to original below.

-- 
Kind regards,

Yorick Hardy

diff --git a/glkgit/Makefile b/glkgit/Makefile
index edcb922653..a8bb9596c4 100644
--- a/glkgit/Makefile
+++ b/glkgit/Makefile
@@ -1,17 +1,19 @@
 # $NetBSD: Makefile,v 1.10 2012/12/12 10:44:37 thomasklausner Exp $
 #
 
-DISTNAME=		git-110
-PKGNAME=		glkgit-1.1.0
+GITHUB_PROJECT=		Git
+DISTNAME=		${GITHUB_TAG}
+PKGNAME=		glkgit-1.3.5
 CATEGORIES=		games
-MASTER_SITES=		http://diden.net/if/git/releases/
-EXTRACT_SUFX=		.zip
+MASTER_SITES=		${MASTER_SITE_GITHUB:=DavidKinder/}
+DIST_SUBDIR=		${GITHUB_PROJECT}
+GITHUB_TAG=		v${PKGVERSION_NOREV}
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://diden.net/if/git/
+HOMEPAGE=		${MASTER_SITE_GITHUB:=DavidKinder/Git/}
 COMMENT=		Interpreter for Glulx interactive fiction
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/glk//}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/glkg/G/}
 MAKE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
 
 INSTALLATION_DIRS+=	bin
diff --git a/glkgit/distinfo b/glkgit/distinfo
index ff7d3df070..6cc62e6453 100644
--- a/glkgit/distinfo
+++ b/glkgit/distinfo
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.3 2005/03/07 15:24:22 dillo Exp $
 
-SHA1 (git-110.zip) = b7ec9196f2f155d5f23eefe9be6b4a7587b36110
-RMD160 (git-110.zip) = b968540a22ff484deb01a0cfb145086ec74eef74
-Size (git-110.zip) = 76928 bytes
-SHA1 (patch-aa) = 30f21ee0d8caf26ba05b314186c45c83c0dd8b33
+SHA1 (Git/v1.3.5.tar.gz) = 792f20b674a3e24cea279f1465b137aefd1db8ae
+RMD160 (Git/v1.3.5.tar.gz) = faead686350689f6751f584176215d73fe49ceef
+SHA512 (Git/v1.3.5.tar.gz) = c2f8ab8a7b9e550614c0da83ccd91020a442960802af1a8c6c2762db0ba548c2b797bdfd94af236a599f26a38e9e7f97f7f627ba0d0a1d484b154e1d094d151e
+Size (Git/v1.3.5.tar.gz) = 92364 bytes
+SHA1 (patch-aa) = ce4cd7b3bdb0f6c3fbb8c372434611cf6eb5a496
diff --git a/glkgit/patches/patch-aa b/glkgit/patches/patch-aa
index fb366da32e..58d3e0186c 100644
--- a/glkgit/patches/patch-aa
+++ b/glkgit/patches/patch-aa
@@ -1,6 +1,6 @@
 $NetBSD: patch-aa,v 1.3 2005/03/07 15:24:23 dillo Exp $
 
---- Makefile.orig	2004-12-22 15:34:43.000000000 +0100
+--- Makefile.orig	2015-06-13 19:59:51.000000000 +0000
 +++ Makefile
 @@ -9,16 +9,16 @@ GLK = cheapglk
  #GLK = glkterm
@@ -18,31 +18,27 @@ $NetBSD: patch-aa,v 1.3 2005/03/07 15:24:23 dillo Exp $
  
  # Generic C compiler
 -CC = cc -O2
--OPTIONS =
+-OPTIONS = 
 +#CC = cc -O2
-+OPTIONS =-rdynamic
++OPTIONS = -rdynamic
  
  # Best settings for GCC 2.95. This generates faster code than
  # GCC 3, so you should use this setup if possible.
-@@ -37,7 +37,7 @@ OPTIONS =
- # -----------------------------------------------------------------
- # Step 3: decide where you want to install the compiled executable.
- 
--INSTALLDIR = /usr/local/bin
-+INSTALLDIR = $(PREFIX)/bin
- 
- # -----------------------------------------------------------------
- # You shouldn't have to change anything from here on down.
-@@ -46,7 +46,7 @@ MAJOR = 1
- MINOR = 1
- PATCH = 0
+@@ -46,11 +46,11 @@ MAJOR = 1
+ MINOR = 3
+ PATCH = 4
  
 -include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
 +include $(BUILDLINK_DIR)/include/glk/$(GLKMAKEFILE)
  
  CFLAGS = $(OPTIONS) -I$(GLKINCLUDEDIR)
  
-@@ -69,7 +69,7 @@ git: $(OBJS)
+-LIBS = -L$(GLKLIBDIR) $(GLKLIB) $(LINKLIBS) 
++LIBS = -L$(GLKLIBDIR) $(GLKLIB) $(LINKLIBS) -lm
+ 
+ HEADERS = version.h git.h config.h compiler.h \
+ 	memory.h opcodes.h labels.inc
+@@ -73,7 +73,7 @@ git: $(OBJS)
  	$(CC) $(OPTIONS) -o git $(OBJS) $(LIBS)
  
  install: git
@@ -50,4 +46,4 @@ $NetBSD: patch-aa,v 1.3 2005/03/07 15:24:23 dillo Exp $
 +	$(BSD_INSTALL_PROGRAM) git $(INSTALLDIR)/git
  
  clean:
- 	rm -f *~ *.o git
+ 	rm -f *~ *.o git test/*.tmp