Index: head/audio/goattracker/Makefile
===================================================================
--- head/audio/goattracker/Makefile	(revision 478701)
+++ head/audio/goattracker/Makefile	(revision 478702)
@@ -1,50 +1,47 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	goattracker
-PORTVERSION=	2.73
+PORTVERSION=	2.74
 CATEGORIES=	audio
 MASTER_SITES=	SF/goattracker2/GoatTracker%202/${PORTVERSION}
 DISTNAME=	GoatTracker_${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Crossplatform music editor for creating Commodore 64 music
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying
 
 USES=		dos2unix gmake zip
 USE_SDL=	sdl
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
 MAKEFILE=	makefile
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
-
-CFLAGS+=	`sdl-config --cflags`
-LIBS+=		`sdl-config --libs`
 
 DESKTOP_ENTRIES="GoatTracker 2" \
 		"${COMMENT}" \
 		"${PREFIX}/share/pixmaps/goattrk2.ico" \
 		"goattrk2" \
 		"" \
 		false
 
 do-build:
 	@cd ${WRKSRC}/src/bme; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 	@cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 .for f in betaconv goattrk2 gt2reloc ins2snd2 mod2sng sngspli2
 	${INSTALL_PROGRAM} ${WRKSRC}/linux/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/src/goattrk2.ico ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.sng ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/audio/goattracker/distinfo
===================================================================
--- head/audio/goattracker/distinfo	(revision 478701)
+++ head/audio/goattracker/distinfo	(revision 478702)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493416360
-SHA256 (GoatTracker_2.73.zip) = 4d24c5919f47c69791ea7b457586849621e205a20e4c3ad5eb37d1a0cbcf9563
-SIZE (GoatTracker_2.73.zip) = 1168212
+TIMESTAMP = 1535794368
+SHA256 (GoatTracker_2.74.zip) = 91a859a70e0f3524adebce2d28f00289db1a93344f126b5da6e22a8bd646f249
+SIZE (GoatTracker_2.74.zip) = 1228568

Property changes on: head/audio/goattracker/distinfo
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/audio/goattracker/files/patch-src_bme_makefile
===================================================================
--- head/audio/goattracker/files/patch-src_bme_makefile	(revision 478701)
+++ head/audio/goattracker/files/patch-src_bme_makefile	(revision 478702)
@@ -1,15 +1,20 @@
---- src/bme/makefile.orig	2017-04-29 15:05:37 UTC
+--- src/bme/makefile.orig	2018-09-01 09:19:43 UTC
 +++ src/bme/makefile
-@@ -1,10 +1,10 @@
+@@ -1,10 +1,15 @@
++CC?=gcc
++CFLAGS+=`sdl-config --cflags`
++LIBS+=`sdl-config --libs`
++
++
  all: dat2inc datafile
  
  datafile: datafile.c bme_end.c
 -	gcc -o datafile datafile.c bme_end.c
 +	$(CC) $(CFLAGS) -o datafile datafile.c bme_end.c
  	strip datafile
  
  dat2inc: dat2inc.c
 -	gcc -o dat2inc dat2inc.c
-+	$(CC) $(CFLAGS) -o dat2inc dat2inc.c
++	$(CC) $(LIBS) -o dat2inc dat2inc.c
  	strip dat2inc
  

Property changes on: head/audio/goattracker/files/patch-src_bme_makefile
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/audio/goattracker/files/patch-src_makefile
===================================================================
--- head/audio/goattracker/files/patch-src_makefile	(revision 478701)
+++ head/audio/goattracker/files/patch-src_makefile	(revision 478702)
@@ -1,12 +1,14 @@
---- src/makefile.orig	2017-04-29 15:05:37 UTC
+--- src/makefile.orig	2018-09-01 09:01:40 UTC
 +++ src/makefile
-@@ -2,9 +2,7 @@
+@@ -2,9 +2,9 @@
  # Linux makefile
  #
  
 -CFLAGS=`sdl-config --cflags`
++CFLAGS+=`sdl-config --cflags`
  PREFIX=../linux/
  SUFFIX=
 -LIBS=`sdl-config --libs`
++LIBS+=`sdl-config --libs`
  
  include makefile.common

Property changes on: head/audio/goattracker/files/patch-src_makefile
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/audio/goattracker/files/patch-src_makefile.common
===================================================================
--- head/audio/goattracker/files/patch-src_makefile.common	(revision 478701)
+++ head/audio/goattracker/files/patch-src_makefile.common	(revision 478702)
@@ -1,49 +1,49 @@
---- src/makefile.common.orig	2017-04-29 15:05:37 UTC
+--- src/makefile.common.orig	2018-09-01 09:14:51 UTC
 +++ src/makefile.common
 @@ -1,9 +1,9 @@
  # common makefile directives for linux and win32 build
  
 -CC=gcc
 -CXX=g++
--CFLAGS+=-O3 -Wall -Ibme -Iasm
+-CFLAGS+=-O3 -Wall -Ibme -Iasm -fpermissive
 -CXXFLAGS=$(CFLAGS)
 +CC?=gcc
 +CXX?=g++
 +CFLAGS+=-Ibme -Iasm
 +CXXFLAGS+=$(CFLAGS)
  
  EXE=	$(PREFIX)goattrk2$(SUFFIX) \
  	$(PREFIX)gt2reloc$(SUFFIX) \
-@@ -48,26 +48,26 @@ bme/bme_gfx.o bme/bme_snd.o bme/bme_win.
+@@ -43,26 +43,26 @@ bme/bme_gfx.o bme/bme_snd.o bme/bme_win.
  	strip $@
  	
  $(PREFIX)mod2sng$(SUFFIX): mod2sng.o bme/bme_end.o
 -	gcc -o $@ $^
 +	$(CC) -o $@ $^
  	strip $@
  
  $(PREFIX)ins2snd2$(SUFFIX): ins2snd2.o bme/bme_end.o
 -	gcc -o $@ $^
 +	$(CC) -o $@ $^
  	strip $@
  
  $(PREFIX)sngspli2$(SUFFIX): sngspli2.o bme/bme_end.o
 -	gcc -o $@ $^
 +	$(CC) -o $@ $^
  	strip $@
  
  $(PREFIX)betaconv$(SUFFIX): betaconv.o bme/bme_end.o
 -	gcc -o $@ $^
 +	$(CC) -o $@ $^
  	strip $@
  
  goattrk2.dat: player.s altplayer.s chargen.bin palette.bin cursor.bin goattrk2.bmp goattrk2.seq
 -	datafile $@ goattrk2.seq
 +	./bme/datafile $@ goattrk2.seq
  
  goatdata.c: goattrk2.dat
 -	dat2inc $< $@
 +	./bme/dat2inc $< $@
  
  clean:
  	$(RM) *.o *~

Property changes on: head/audio/goattracker/files/patch-src_makefile.common
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property