Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 1 Sep 2018 14:40:59 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478702 - in head/audio/goattracker: . files
Message-ID:  <201809011440.w81EexGW084758@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ehaupt
Date: Sat Sep  1 14:40:59 2018
New Revision: 478702
URL: https://svnweb.freebsd.org/changeset/ports/478702

Log:
  Update to 2.74

Modified:
  head/audio/goattracker/Makefile
  head/audio/goattracker/distinfo   (contents, props changed)
  head/audio/goattracker/files/patch-src_bme_makefile   (contents, props changed)
  head/audio/goattracker/files/patch-src_makefile   (contents, props changed)
  head/audio/goattracker/files/patch-src_makefile.common   (contents, props changed)

Modified: head/audio/goattracker/Makefile
==============================================================================
--- head/audio/goattracker/Makefile	Sat Sep  1 14:24:14 2018	(r478701)
+++ head/audio/goattracker/Makefile	Sat Sep  1 14:40:59 2018	(r478702)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	goattracker
-PORTVERSION=	2.73
+PORTVERSION=	2.74
 CATEGORIES=	audio
 MASTER_SITES=	SF/goattracker2/GoatTracker%202/${PORTVERSION}
 DISTNAME=	GoatTracker_${PORTVERSION}
@@ -21,9 +21,6 @@ EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 MAKEFILE=	makefile
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
-
-CFLAGS+=	`sdl-config --cflags`
-LIBS+=		`sdl-config --libs`
 
 DESKTOP_ENTRIES="GoatTracker 2" \
 		"${COMMENT}" \

Modified: head/audio/goattracker/distinfo
==============================================================================
--- head/audio/goattracker/distinfo	Sat Sep  1 14:24:14 2018	(r478701)
+++ head/audio/goattracker/distinfo	Sat Sep  1 14:40:59 2018	(r478702)
@@ -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

Modified: head/audio/goattracker/files/patch-src_bme_makefile
==============================================================================
--- head/audio/goattracker/files/patch-src_bme_makefile	Sat Sep  1 14:24:14 2018	(r478701)
+++ head/audio/goattracker/files/patch-src_bme_makefile	Sat Sep  1 14:40:59 2018	(r478702)
@@ -1,6 +1,11 @@
---- 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
@@ -10,6 +15,6 @@
  
  dat2inc: dat2inc.c
 -	gcc -o dat2inc dat2inc.c
-+	$(CC) $(CFLAGS) -o dat2inc dat2inc.c
++	$(CC) $(LIBS) -o dat2inc dat2inc.c
  	strip dat2inc
  

Modified: head/audio/goattracker/files/patch-src_makefile
==============================================================================
--- head/audio/goattracker/files/patch-src_makefile	Sat Sep  1 14:24:14 2018	(r478701)
+++ head/audio/goattracker/files/patch-src_makefile	Sat Sep  1 14:40:59 2018	(r478702)
@@ -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

Modified: head/audio/goattracker/files/patch-src_makefile.common
==============================================================================
--- head/audio/goattracker/files/patch-src_makefile.common	Sat Sep  1 14:24:14 2018	(r478701)
+++ head/audio/goattracker/files/patch-src_makefile.common	Sat Sep  1 14:40:59 2018	(r478702)
@@ -1,11 +1,11 @@
---- 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++
@@ -14,7 +14,7 @@
  
  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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809011440.w81EexGW084758>