goattracker: update to 2.73 since previous version no longer available

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Nov 12 20:04:21 2015 +0100
Changeset:	0c97e045374a1d05b0ed06d3cc3d6c9b28699a78

Modified Files:
	goattracker/Makefile
	goattracker/distinfo
	goattracker/patches/patch-aa

Log Message:
goattracker: update to 2.73 since previous version no longer available

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

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

diffstat:
 goattracker/Makefile         |  4 ++--
 goattracker/distinfo         | 11 ++++++-----
 goattracker/patches/patch-aa | 43 ++++++++++++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 24 deletions(-)

diffs:
diff --git a/goattracker/Makefile b/goattracker/Makefile
index dbc36e7..0dcdeef 100644
--- a/goattracker/Makefile
+++ b/goattracker/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	goattrk2
-PKGNAME=	goattracker-2.70
+PKGNAME=	goattracker-2.73
 CATEGORIES=	audio
 MASTER_SITES=	http://cadaver.homeftp.net/tools/
 EXTRACT_SUFX=	.zip
@@ -15,7 +15,7 @@ CFLAGS=			-I{PREFIX}/include -D_GNU_SOURCE=1 -D_REENTRANT -D_THREAD_SAFE
 WRKSRC=			${WRKDIR}/src
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
-MAKE_FILE=		makefile.common
+MAKE_FILE=		makefile
 INSTALLATION_DIRS=	bin share/examples/goattracker share/doc/goattracker
 
 do-install:
diff --git a/goattracker/distinfo b/goattracker/distinfo
index f8517e1..f9a4ac7 100644
--- a/goattracker/distinfo
+++ b/goattracker/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.2 2010/03/14 12:02:38 rodo6510 Exp $
+$NetBSD$
 
-SHA1 (goattrk2.zip) = 9d5cef499d4a0220a959e8e6a6f49b33f16bd5cd
-RMD160 (goattrk2.zip) = 60f957be08cb2259218a373a2f8d9532e040df9e
-Size (goattrk2.zip) = 806545 bytes
-SHA1 (patch-aa) = cdf39c6213a03c359fd469c231ec0359059ab969
+SHA1 (goattrk2.zip) = 48963dc001faadaecafd91be850dc0c68b7a418b
+RMD160 (goattrk2.zip) = 53e655986cf15f3b8eb4734fa792001a831639a1
+SHA512 (goattrk2.zip) = 29c6473e9e97e3a2aab27aecc7b7bac0c6ac1d9190422513b6f17cfdcddde5c9b2358475441cbd077954ca2fb6dec24741bae3ae0bd871f9d534491fa3ea78c1
+Size (goattrk2.zip) = 1168212 bytes
+SHA1 (patch-aa) = d54d628fe4b0612bfda1ba669b9aea9a1b3a4540
diff --git a/goattracker/patches/patch-aa b/goattracker/patches/patch-aa
index b1709ce..29aa217 100644
--- a/goattracker/patches/patch-aa
+++ b/goattracker/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2009/10/12 10:13:57 rodo6510 Exp $
+$NetBSD$
 
---- makefile.common	2009-01-03 00:22:58.000000000 +0100
-+++ /home/nikon/makefile.common_goat
-@@ -4,16 +4,17 @@ CC=gcc
- CXX=g++
+--- makefile.common.orig	2014-07-23 21:58:44.000000000 +0000
++++ makefile.common
+@@ -5,16 +5,16 @@ CXX=g++
  CFLAGS+=-O3 -Wall -Ibme -Iasm
  CXXFLAGS=$(CFLAGS)
-+LIBS=`sdl-config --libs`
  
 -EXE=	$(PREFIX)goattrk2$(SUFFIX) \
+-	$(PREFIX)gt2reloc$(SUFFIX) \
 -	$(PREFIX)ins2snd2$(SUFFIX) \
 -	$(PREFIX)sngspli2$(SUFFIX) \
 -	$(PREFIX)betaconv$(SUFFIX) \
 -	$(PREFIX)mod2sng$(SUFFIX)
 +EXE=	goattrk2 \
++	gt2reloc \
 +	ins2snd2 \
 +	sngspli2 \
 +	betaconv \
@@ -27,10 +27,19 @@ $NetBSD: patch-aa,v 1.2 2009/10/12 10:13:57 rodo6510 Exp $
  gfile.o greloc.o ghelp.o gsound.o gconsole.o gsid.o \
  resid/envelope.o resid/extfilt.o resid/filter.o resid/pot.o resid/sid.o resid/wave.o resid/wave6581__ST.o \
  resid/wave6581_P_T.o resid/wave6581_PS_.o resid/wave6581_PST.o resid/wave8580__ST.o resid/wave8580_P_T.o \
-@@ -27,27 +28,35 @@ bme/bme_gfx.o bme/bme_snd.o bme/bme_win.
- 	$(CXX) -o $@ $^ $(LIBS)
+@@ -34,7 +34,7 @@ greloc2.o: greloc.c
+ 	
+ # it would be nice not having to link things like resid, however the source is
+ # not ready for that
+-$(PREFIX)gt2reloc$(SUFFIX): goatdata.o gt2reloc.o gsong.o gorder.o gpattern.o ginstr.o gtable.o gplay.o gdisplay.o \
++gt2reloc: goatdata.o gt2reloc.o gsong.o gorder.o gpattern.o ginstr.o gtable.o gplay.o gdisplay.o \
+ gfile.o greloc2.o ghelp.o gsound.o gconsole.o gsid.o \
+ resid/envelope.o resid/extfilt.o resid/filter.o resid/pot.o resid/sid.o resid/wave.o resid/wave6581__ST.o \
+ resid/wave6581_P_T.o resid/wave6581_PS_.o resid/wave6581_PST.o resid/wave8580__ST.o resid/wave8580_P_T.o \
+@@ -47,27 +47,35 @@ bme/bme_gfx.o bme/bme_snd.o bme/bme_win.
+ 	$(CXX) -DGT2RELOC -o $@ $^ $(LIBS)
  	strip $@
- 
+ 	
 -$(PREFIX)mod2sng$(SUFFIX): mod2sng.o bme/bme_end.o
 +mod2sng: mod2sng.o bme/bme_end.o
  	gcc -o $@ $^
@@ -48,16 +57,16 @@ $NetBSD: patch-aa,v 1.2 2009/10/12 10:13:57 rodo6510 Exp $
  
 -$(PREFIX)betaconv$(SUFFIX): betaconv.o bme/bme_end.o
 +betaconv: betaconv.o bme/bme_end.o
- 	gcc -o $@ $^
- 	strip $@
-+datafile: bme/datafile.c bme/bme_end.c
-+	gcc -o ./datafile bme/datafile.c bme/bme_end.c $(LIBS)
-+	strip ./datafile
++	gcc -o $@ $^
++	strip $@
 +
-+dat2inc: bme/dat2inc.c
-+	gcc -o ./dat2inc bme/dat2inc.c
-+	strip ./dat2inc
++datafile: bme/datafile.o bme/bme_end.o
++	gcc -o $@ $^ $(LIBS)
++	strip $@
 +
++dat2inc: bme/dat2inc.o
+ 	gcc -o $@ $^
+ 	strip $@
  
  goattrk2.dat: player.s altplayer.s chargen.bin palette.bin cursor.bin goattrk2.bmp goattrk2.seq
 -	datafile $@ goattrk2.seq