From owner-svn-ports-all@freebsd.org Thu Mar 21 14:20:41 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85BF81541F90; Thu, 21 Mar 2019 14:20:41 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2DD8C8D8DB; Thu, 21 Mar 2019 14:20:41 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CC309EE5; Thu, 21 Mar 2019 14:20:41 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2LEKegj086349; Thu, 21 Mar 2019 14:20:40 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2LEKeBA086346; Thu, 21 Mar 2019 14:20:40 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201903211420.x2LEKeBA086346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Thu, 21 Mar 2019 14:20:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496463 - in head/audio/goattracker: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/audio/goattracker: . files X-SVN-Commit-Revision: 496463 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2DD8C8D8DB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Mar 2019 14:20:41 -0000 Author: ehaupt Date: Thu Mar 21 14:20:40 2019 New Revision: 496463 URL: https://svnweb.freebsd.org/changeset/ports/496463 Log: Update to 2.75 Deleted: head/audio/goattracker/files/patch-src_bme_makefile head/audio/goattracker/files/patch-src_makefile Modified: head/audio/goattracker/Makefile head/audio/goattracker/distinfo head/audio/goattracker/files/patch-src_makefile.common head/audio/goattracker/pkg-plist (contents, props changed) Modified: head/audio/goattracker/Makefile ============================================================================== --- head/audio/goattracker/Makefile Thu Mar 21 14:10:41 2019 (r496462) +++ head/audio/goattracker/Makefile Thu Mar 21 14:20:40 2019 (r496463) @@ -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 Commo 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} Modified: head/audio/goattracker/distinfo ============================================================================== --- head/audio/goattracker/distinfo Thu Mar 21 14:10:41 2019 (r496462) +++ head/audio/goattracker/distinfo Thu Mar 21 14:20:40 2019 (r496463) @@ -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 Modified: head/audio/goattracker/files/patch-src_makefile.common ============================================================================== --- head/audio/goattracker/files/patch-src_makefile.common Thu Mar 21 14:10:41 2019 (r496462) +++ head/audio/goattracker/files/patch-src_makefile.common Thu Mar 21 14:20:40 2019 (r496463) @@ -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 *~ Modified: head/audio/goattracker/pkg-plist ============================================================================== --- head/audio/goattracker/pkg-plist Thu Mar 21 14:10:41 2019 (r496462) +++ head/audio/goattracker/pkg-plist Thu Mar 21 14:20:40 2019 (r496463) @@ -1,4 +1,3 @@ -bin/betaconv bin/goattrk2 bin/gt2reloc bin/ins2snd2