diff options
author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2019-03-21 14:20:40 +0000 |
---|---|---|
committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2019-03-21 14:20:40 +0000 |
commit | 6c90c56585bf8ec64c7722f57b4429e12f653124 (patch) | |
tree | 9c13e8e69ae30ef1492bd71077539f90b714e723 /audio/goattracker | |
parent | 2986869cbb166c9afaf5a82339f0e9ed16a1bf05 (diff) | |
download | ports-6c90c56585bf8ec64c7722f57b4429e12f653124.tar.gz ports-6c90c56585bf8ec64c7722f57b4429e12f653124.zip |
Notes
Diffstat (limited to 'audio/goattracker')
-rw-r--r-- | audio/goattracker/Makefile | 16 | ||||
-rw-r--r-- | audio/goattracker/distinfo | 6 | ||||
-rw-r--r-- | audio/goattracker/files/patch-src_bme_makefile | 20 | ||||
-rw-r--r-- | audio/goattracker/files/patch-src_makefile | 14 | ||||
-rw-r--r-- | audio/goattracker/files/patch-src_makefile.common | 50 | ||||
-rw-r--r-- | audio/goattracker/pkg-plist | 1 |
6 files changed, 19 insertions, 88 deletions
diff --git a/audio/goattracker/Makefile b/audio/goattracker/Makefile index 1f90e9ed9e7d..16be1e8cc18f 100644 --- a/audio/goattracker/Makefile +++ b/audio/goattracker/Makefile @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= goattracker -PORTVERSION= 2.74 +PORTVERSION= 2.75 CATEGORIES= audio -MASTER_SITES= SF/goattracker2/GoatTracker%202/${PORTVERSION} +MASTER_SITES= SF/goattracker2/GoatTracker%202/${PORTVERSION} \ + LOCAL/ehaupt DISTNAME= GoatTracker_${PORTVERSION} MAINTAINER= ehaupt@FreeBSD.org @@ -13,11 +14,9 @@ COMMENT= Crossplatform music editor for creating Commodore 64 music LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/copying -USES= dos2unix gmake zip +USES= dos2unix gmake sdl zip USE_SDL= sdl -EXTRACT_AFTER_ARGS= -d ${WRKSRC} - MAKEFILE= makefile OPTIONS_DEFINE= DOCS EXAMPLES @@ -29,12 +28,17 @@ DESKTOP_ENTRIES="GoatTracker 2" \ "" \ false +WRKSRC= ${WRKDIR}/goattrk2 + +post-extract: + @${FIND} ${WRKSRC} -name '*.o' -type f -exec ${RM} -f {} \+ + 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 +.for f in goattrk2 gt2reloc ins2snd2 mod2sng sngspli2 ${INSTALL_PROGRAM} ${WRKSRC}/linux/${f} ${STAGEDIR}${PREFIX}/bin .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/audio/goattracker/distinfo b/audio/goattracker/distinfo index bbe8fdc768cd..3dfb4a357ab4 100644 --- a/audio/goattracker/distinfo +++ b/audio/goattracker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535794368 -SHA256 (GoatTracker_2.74.zip) = 91a859a70e0f3524adebce2d28f00289db1a93344f126b5da6e22a8bd646f249 -SIZE (GoatTracker_2.74.zip) = 1228568 +TIMESTAMP = 1553163526 +SHA256 (GoatTracker_2.75.zip) = 93f6bec01b822093f2fb4f1f220d72d09cba98e5c9c8420bc3666e7ca83da9ce +SIZE (GoatTracker_2.75.zip) = 1516416 diff --git a/audio/goattracker/files/patch-src_bme_makefile b/audio/goattracker/files/patch-src_bme_makefile deleted file mode 100644 index baeb28ad5db2..000000000000 --- a/audio/goattracker/files/patch-src_bme_makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- src/bme/makefile.orig 2018-09-01 09:19:43 UTC -+++ src/bme/makefile -@@ -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) $(LIBS) -o dat2inc dat2inc.c - strip dat2inc - diff --git a/audio/goattracker/files/patch-src_makefile b/audio/goattracker/files/patch-src_makefile deleted file mode 100644 index 929356310b86..000000000000 --- a/audio/goattracker/files/patch-src_makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- src/makefile.orig 2018-09-01 09:01:40 UTC -+++ src/makefile -@@ -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 diff --git a/audio/goattracker/files/patch-src_makefile.common b/audio/goattracker/files/patch-src_makefile.common index 2073241513ce..308f9cd7455c 100644 --- a/audio/goattracker/files/patch-src_makefile.common +++ b/audio/goattracker/files/patch-src_makefile.common @@ -1,49 +1,11 @@ ---- src/makefile.common.orig 2018-09-01 09:14:51 UTC +--- src/makefile.common.orig 2019-03-21 10:51:16 UTC +++ src/makefile.common -@@ -1,9 +1,9 @@ - # common makefile directives for linux and win32 build +@@ -2,7 +2,7 @@ --CC=gcc --CXX=g++ --CFLAGS+=-O3 -Wall -Ibme -Iasm -fpermissive --CXXFLAGS=$(CFLAGS) -+CC?=gcc -+CXX?=g++ + CC?=gcc + CXX?=g++ +-CFLAGS+=-Ibme -Iasm -O3 -fpermissive +CFLAGS+=-Ibme -Iasm -+CXXFLAGS+=$(CFLAGS) + CXXFLAGS+=$(CFLAGS) EXE= $(PREFIX)goattrk2$(SUFFIX) \ - $(PREFIX)gt2reloc$(SUFFIX) \ -@@ -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 *~ diff --git a/audio/goattracker/pkg-plist b/audio/goattracker/pkg-plist index df7601fad95f..ff864c79c27f 100644 --- a/audio/goattracker/pkg-plist +++ b/audio/goattracker/pkg-plist @@ -1,4 +1,3 @@ -bin/betaconv bin/goattrk2 bin/gt2reloc bin/ins2snd2 |