Index: head/audio/goattracker/Makefile =================================================================== --- head/audio/goattracker/Makefile (revision 496462) +++ head/audio/goattracker/Makefile (revision 496463) @@ -1,47 +1,51 @@ # Created by: Emanuel Haupt # $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 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 DESKTOP_ENTRIES="GoatTracker 2" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/goattrk2.ico" \ "goattrk2" \ "" \ 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} @${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 Index: head/audio/goattracker/distinfo =================================================================== --- head/audio/goattracker/distinfo (revision 496462) +++ head/audio/goattracker/distinfo (revision 496463) @@ -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 Index: head/audio/goattracker/files/patch-src_makefile =================================================================== --- head/audio/goattracker/files/patch-src_makefile (revision 496462) +++ head/audio/goattracker/files/patch-src_makefile (nonexistent) @@ -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 Property changes on: head/audio/goattracker/files/patch-src_makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/goattracker/files/patch-src_bme_makefile =================================================================== --- head/audio/goattracker/files/patch-src_bme_makefile (revision 496462) +++ head/audio/goattracker/files/patch-src_bme_makefile (nonexistent) @@ -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 - Property changes on: head/audio/goattracker/files/patch-src_bme_makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/goattracker/files/patch-src_makefile.common =================================================================== --- head/audio/goattracker/files/patch-src_makefile.common (revision 496462) +++ head/audio/goattracker/files/patch-src_makefile.common (revision 496463) @@ -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 *~ Index: head/audio/goattracker/pkg-plist =================================================================== --- head/audio/goattracker/pkg-plist (revision 496462) +++ head/audio/goattracker/pkg-plist (revision 496463) @@ -1,22 +1,21 @@ -bin/betaconv bin/goattrk2 bin/gt2reloc bin/ins2snd2 bin/mod2sng bin/sngspli2 share/pixmaps/goattrk2.ico %%PORTDOCS%%%%DOCSDIR%%/readme.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/2xtest.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cabrinigreen.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/consultant.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dojo.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/everlasting.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/funktest.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ghosttrackers.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyperspace.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sanction.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sixpack.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tempo2test.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/transylvanian.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/unleash.sng %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wavecmdtest.sng Property changes on: head/audio/goattracker/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property