--- Makefile (revision 434211) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= atanks -PORTVERSION= 5.9 -PORTREVISION= 1 +PORTVERSION= 6.5 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/ @@ -10,30 +9,23 @@ MAINTAINER= jessefrgsmith@yahoo.ca COMMENT= 2D tank game with large, cartoonish weapons -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liballeg.so:devel/allegro USES= gmake -MAKE_ARGS+= PREFIX=${PREFIX}/ -MAKE_ARGS+= CC=${CC} CPP=${CXX} LD=${LD} -PATCH_DEBUG= 1 PORTDOCS= Changelog README README_ru.txt credits.txt + OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} '/^LDFLAGS =/s/$$/ -pthread/' ${WRKSRC}/src/Makefile.bsd - @${REINPLACE_CMD} -e \ - 's/int Filter_File( struct dirent/int Filter_File( const struct dirent/' \ - ${WRKSRC}/src/files.cpp - post-install: - ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + ${LN} -sf ../../share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - ${LN} -sf ${DOCSDIR}/credits.txt ${STAGEDIR}${DATADIR} .include --- distinfo (revision 434211) +++ distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (atanks-5.9.tar.gz) = d3e4c765ed942ceac1f60e4d5e24b33acbb3fbc64cc2f227ce2a031ae16b1a6d -SIZE (atanks-5.9.tar.gz) = 3123202 +TIMESTAMP = 1487252244 +SHA256 (atanks-6.5.tar.gz) = 32182b2752a77ff362c378fc04b7c51fc15345caa4c8deaad59cc850dad2322e +SIZE (atanks-6.5.tar.gz) = 6059648 --- files/patch-Makefile (revision 434211) +++ files/patch-Makefile (working copy) @@ -1,46 +1,50 @@ ---- Makefile.orig 2014-03-29 15:11:25 UTC +--- Makefile.orig 2016-11-02 14:44:56 UTC +++ Makefile -@@ -4,27 +4,27 @@ - BINPREFIX = $(PREFIX) +@@ -39,7 +39,7 @@ PREFIX ?= /usr + DESTDIR ?= + BINPREFIX ?= $(PREFIX) + BINDIR ?= ${BINPREFIX}/bin +-INSTALLDIR ?= ${PREFIX}/share/games/atanks ++INSTALLDIR ?= ${PREFIX}/share/atanks - BINDIR = ${BINPREFIX}bin/ --INSTALLDIR = ${PREFIX}share/games/atanks -+INSTALLDIR = ${PREFIX}share/atanks - export VERSION - export PREFIX - export INSTALLDIR + # ------------------------------------ +@@ -232,7 +232,6 @@ ifeq (YES,$(DEBUG)) + endif - FILENAME=atanks-${VERSION} --INSTALL=$(PREFIX)bin/install -c -+INSTALL=install - DISTCOMMON=atanks/*.dat atanks/COPYING atanks/README atanks/TODO atanks/Changelog atanks/BUGS atanks/*.txt --INCOMMON=COPYING README TODO Changelog *.txt unicode.dat -+INCOMMON=unicode.dat + else +- CXXFLAGS := -march=native ${CXXFLAGS} -O2 + endif - all: -- FLAGS=-DLINUX $(MAKE) -C src -+ FLAGS=-DMACOSX $(MAKE) -C src -f Makefile.bsd - install: - mkdir -p $(DESTDIR)${BINDIR} +@@ -255,7 +254,7 @@ DISTCOMMON := \ + atanks/*.dat atanks/COPYING atanks/README atanks/TODO \ + atanks/Changelog atanks/BUGS atanks/*.txt + +-INCOMMON := COPYING README TODO Changelog *.txt unicode.dat ++INCOMMON := credits.txt unicode.dat + + # ------------------------------------ + # Default target +@@ -301,11 +300,11 @@ endif + # ------------------------------------ + install: $(TARGET) + $(INSTALL) -d $(DESTDIR)${BINDIR} - $(INSTALL) -m 755 atanks $(DESTDIR)${BINDIR} -- mkdir -p $(DESTDIR)/usr/share/applications -- $(INSTALL) -m 644 atanks.desktop $(DESTDIR)/usr/share/applications -- mkdir -p $(DESTDIR)/usr/share/icons/hicolor/48x48/apps -- $(INSTALL) -m 644 atanks.png $(DESTDIR)/usr/share/icons/hicolor/48x48/apps + $(BSD_INSTALL_PROGRAM) atanks $(DESTDIR)${BINDIR} -+ mkdir -p $(DESTDIR)/usr/local/share/applications -+ $(INSTALL) -m 644 atanks.desktop $(DESTDIR)/usr/local/share/applications -+ mkdir -p $(DESTDIR)/usr/local/share/icons/hicolor/48x48/apps -+ $(INSTALL) -m 644 atanks.png $(DESTDIR)/usr/local/share/icons/hicolor/48x48/apps - mkdir -p $(DESTDIR)${INSTALLDIR} - mkdir -p $(DESTDIR)${INSTALLDIR}/button - mkdir -p $(DESTDIR)${INSTALLDIR}/misc -@@ -35,16 +35,16 @@ - mkdir -p $(DESTDIR)${INSTALLDIR}/tankgun - mkdir -p $(DESTDIR)${INSTALLDIR}/title - mkdir -p $(DESTDIR)${INSTALLDIR}/text + $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/applications +- $(INSTALL) -m 644 atanks.desktop $(DESTDIR)$(PREFIX)/share/applications ++ $(BSD_INSTALL_DATA) atanks.desktop $(DESTDIR)$(PREFIX)/share/applications + $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps +- $(INSTALL) -m 644 atanks.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps ++ $(BSD_INSTALL_DATA) atanks.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps + $(INSTALL) -d $(DESTDIR)${INSTALLDIR} + $(INSTALL) -d $(DESTDIR)${INSTALLDIR}/button + $(INSTALL) -d $(DESTDIR)${INSTALLDIR}/misc +@@ -316,16 +315,16 @@ install: $(TARGET) + $(INSTALL) -d $(DESTDIR)${INSTALLDIR}/tankgun + $(INSTALL) -d $(DESTDIR)${INSTALLDIR}/title + $(INSTALL) -d $(DESTDIR)${INSTALLDIR}/text - $(INSTALL) -m 644 $(INCOMMON) $(DESTDIR)${INSTALLDIR} - $(INSTALL) -m 644 button/* $(DESTDIR)${INSTALLDIR}/button - $(INSTALL) -m 644 misc/* $(DESTDIR)${INSTALLDIR}/misc @@ -51,16 +55,16 @@ - $(INSTALL) -m 644 tankgun/* $(DESTDIR)${INSTALLDIR}/tankgun - $(INSTALL) -m 644 title/* $(DESTDIR)${INSTALLDIR}/title - $(INSTALL) -m 644 text/* $(DESTDIR)${INSTALLDIR}/text -+ $(INSTALL) -m 444 $(INCOMMON) $(DESTDIR)${INSTALLDIR} -+ $(INSTALL) -m 444 button/* $(DESTDIR)${INSTALLDIR}/button -+ $(INSTALL) -m 444 misc/* $(DESTDIR)${INSTALLDIR}/misc -+ $(INSTALL) -m 444 missile/* $(DESTDIR)${INSTALLDIR}/missile -+ $(INSTALL) -m 444 sound/* $(DESTDIR)${INSTALLDIR}/sound -+ $(INSTALL) -m 444 stock/* $(DESTDIR)${INSTALLDIR}/stock -+ $(INSTALL) -m 444 tank/* $(DESTDIR)${INSTALLDIR}/tank -+ $(INSTALL) -m 444 tankgun/* $(DESTDIR)${INSTALLDIR}/tankgun -+ $(INSTALL) -m 444 title/* $(DESTDIR)${INSTALLDIR}/title -+ $(INSTALL) -m 444 text/* $(DESTDIR)${INSTALLDIR}/text ++ $(BSD_INSTALL_DATA) -m 644 $(INCOMMON) $(DESTDIR)${INSTALLDIR} ++ $(BSD_INSTALL_DATA) -m 644 button/* $(DESTDIR)${INSTALLDIR}/button ++ $(BSD_INSTALL_DATA) -m 644 misc/* $(DESTDIR)${INSTALLDIR}/misc ++ $(BSD_INSTALL_DATA) -m 644 missile/* $(DESTDIR)${INSTALLDIR}/missile ++ $(BSD_INSTALL_DATA) -m 644 sound/* $(DESTDIR)${INSTALLDIR}/sound ++ $(BSD_INSTALL_DATA) -m 644 stock/* $(DESTDIR)${INSTALLDIR}/stock ++ $(BSD_INSTALL_DATA) -m 644 tank/* $(DESTDIR)${INSTALLDIR}/tank ++ $(BSD_INSTALL_DATA) -m 644 tankgun/* $(DESTDIR)${INSTALLDIR}/tankgun ++ $(BSD_INSTALL_DATA) -m 644 title/* $(DESTDIR)${INSTALLDIR}/title ++ $(BSD_INSTALL_DATA) -m 644 text/* $(DESTDIR)${INSTALLDIR}/text - user: - INSTALLDIR=./ FLAGS=-DLINUX $(MAKE) -C src + $(TARGET): $(MODULES) + $(LD) -o $@ $(MODULES) $(CPPFLAGS) $(LDFLAGS) $(CXXFLAGS) --- pkg-plist (revision 434211) +++ pkg-plist (working copy) @@ -78,19 +78,31 @@ %%DATADIR%%/missile/7.bmp %%DATADIR%%/missile/8.bmp %%DATADIR%%/missile/9.bmp -%%DATADIR%%/sound/0.wav -%%DATADIR%%/sound/1.wav +%%DATADIR%%/sound/00.wav +%%DATADIR%%/sound/01.wav +%%DATADIR%%/sound/02.wav +%%DATADIR%%/sound/03.wav +%%DATADIR%%/sound/04.wav +%%DATADIR%%/sound/05.wav +%%DATADIR%%/sound/06.wav +%%DATADIR%%/sound/07.wav %%DATADIR%%/sound/10.wav %%DATADIR%%/sound/11.wav %%DATADIR%%/sound/12.wav -%%DATADIR%%/sound/2.wav -%%DATADIR%%/sound/3.wav -%%DATADIR%%/sound/4.wav -%%DATADIR%%/sound/5.wav -%%DATADIR%%/sound/6.wav -%%DATADIR%%/sound/7.wav -%%DATADIR%%/sound/8.wav -%%DATADIR%%/sound/9.wav +%%DATADIR%%/sound/13.wav +%%DATADIR%%/sound/14.wav +%%DATADIR%%/sound/15.wav +%%DATADIR%%/sound/16.wav +%%DATADIR%%/sound/17.wav +%%DATADIR%%/sound/18.wav +%%DATADIR%%/sound/19.wav +%%DATADIR%%/sound/20.wav +%%DATADIR%%/sound/21.wav +%%DATADIR%%/sound/22.wav +%%DATADIR%%/sound/30.wav +%%DATADIR%%/sound/31.wav +%%DATADIR%%/sound/32.wav +%%DATADIR%%/sound/40.wav %%DATADIR%%/stock/0.bmp %%DATADIR%%/stock/1.bmp %%DATADIR%%/stock/10.bmp @@ -236,6 +248,14 @@ %%DATADIR%%/text/kamikaze_it.txt %%DATADIR%%/text/kamikaze_ru.txt %%DATADIR%%/text/kamikaze_sk.txt +%%DATADIR%%/text/panic.pt_BR.txt +%%DATADIR%%/text/panic.txt +%%DATADIR%%/text/panic_ES.txt +%%DATADIR%%/text/panic_de.txt +%%DATADIR%%/text/panic_fr.txt +%%DATADIR%%/text/panic_it.txt +%%DATADIR%%/text/panic_ru.txt +%%DATADIR%%/text/panic_sk.txt %%DATADIR%%/text/retaliation.pt_BR.txt %%DATADIR%%/text/retaliation.txt %%DATADIR%%/text/retaliation_ES.txt