Update to 2.74

This commit is contained in:
Emanuel Haupt 2018-09-01 14:40:59 +00:00
parent 87362f0a37
commit 1fa88f7e17
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=478702
5 changed files with 19 additions and 15 deletions

View file

@ -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}
@ -22,9 +22,6 @@ MAKEFILE= makefile
OPTIONS_DEFINE= DOCS EXAMPLES
CFLAGS+= `sdl-config --cflags`
LIBS+= `sdl-config --libs`
DESKTOP_ENTRIES="GoatTracker 2" \
"${COMMENT}" \
"${PREFIX}/share/pixmaps/goattrk2.ico" \

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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