From nobody Fri Mar 04 17:52:12 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C544C19F80D4; Fri, 4 Mar 2022 17:52:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K9FmY0xNzz4Ztt; Fri, 4 Mar 2022 17:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646416333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4qA20p+OczixZVpaQgwUweFPdZHI1kCGem/e+x2QRg=; b=hzTJloF7ioT5SUkXeO7eczOK9UmH/Hhn0tw4iEJYM18ANKrHdwb3Lyf3lfxTPPFQ7ax5cE BYbK4hb4Y8otoWXg94WIU37CtZx3Au11Md691JOGmTQM/jAvrKu9DAWy7VVoysqsAci1hC 7/VBmIS7/GqV9b2UvO17EsugWk6jatW0GX3InwPZj/LL3+0GcSSnZDbnJu2I2PoU+o+YbJ I53ueStP4OVtqrEHAt0JseMLEHVLMreJmQakHLLUw0GntHx6DAVh9An1Pn4srG8y0Edb2o BTsP0nqRUjGtGfwnF4uN3MBTd9T7gW5t25pj4oH8P7vBGbKVe14x1SVEgGQaWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8398810E40; Fri, 4 Mar 2022 17:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 224HqCBt019669; Fri, 4 Mar 2022 17:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 224HqClr019668; Fri, 4 Mar 2022 17:52:12 GMT (envelope-from git) Date: Fri, 4 Mar 2022 17:52:12 GMT Message-Id: <202203041752.224HqClr019668@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 2df6f2a7e3c6 - main - =?utf-8?Q?games/toppler: update 1.1.6 =E2=86=92 1.3?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2df6f2a7e3c67f80d01a34a90987f7699c8a8f35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646416333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4qA20p+OczixZVpaQgwUweFPdZHI1kCGem/e+x2QRg=; b=Z45Z6BVo0JDmYwlxi4b/mP40ubpny/6QIH90qURMdogQPUFyLNjg2nYUR5R6sBaOdSurLq HlZNYWsl12ucKV5tkJVUYiVcVUhAjLh+JuN3EgQ7DZgiSR2nuFwwFHZO72vQyaWJoZhN4S 42QZyaF/emAzg2xrAIK0vi+DjYlUPeYl9YspXdFZpsDbV8uxsoSVaUk1MTQTlxFjHn026h vjXxhEKehQ5e4G6aP6cWgC/DCBfF5KbfwhF8tXQOe5DYCH5E9hHj23UtkInhB0bbuzzK+p cTJ8RtLn44vndBz2WAWFHgLEVkhWrNHZnLZ5dQIHGX5pJA82yN1fxACdmdqNjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646416333; a=rsa-sha256; cv=none; b=UhQ2OlZSj+GuhJg0pjme2mUSa+5Fm/4bJTkOvWeDIFueQ5oSwumPK9HIRIoiM8aeCJyzTN sZedz9UIxeLhWLTlTXZeD0UpBGCaBvt4PcXjNEsUB3BqYAPyx7VYYBFDkC9w/xSPFZPX9b X98TIGaS4FSaqzDbxs0YUva9ttevc2GNQGxaCP8grMnXYzicV6ruzEsZXJTZE1B3wTsH5D HtvwwOn1VhwDZDLbpdYkk3fp8AVMqFqDsmEYY7PiwQjJAeD0T7IsIcH8yMQ8g8zWxA6Pyq 6quRbMF7ol1QJlLN6tadXxeCQuG4Xl7Y4JhSwLYuInNp+DzG87NfW8HbMPQt+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=2df6f2a7e3c67f80d01a34a90987f7699c8a8f35 commit 2df6f2a7e3c67f80d01a34a90987f7699c8a8f35 Author: Dmitry Marakasov AuthorDate: 2022-03-02 12:07:49 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-04 17:51:26 +0000 games/toppler: update 1.1.6 → 1.3 --- games/toppler/Makefile | 40 ++++++++++++----- games/toppler/distinfo | 6 +-- games/toppler/files/patch-Makefile | 55 +++++++++++++++++++++++ games/toppler/files/patch-Makefile.in | 26 ----------- games/toppler/files/patch-dist_toppler.desktop.in | 16 +++++++ games/toppler/files/patch-highscore.cc | 10 ----- games/toppler/files/patch-main.cc | 12 ----- games/toppler/files/patch-src_decl.cc | 14 ++++++ games/toppler/files/patch-src_highscore.cc | 25 +++++++++++ games/toppler/files/patch-src_main.cc | 11 +++++ games/toppler/pkg-descr | 2 +- games/toppler/pkg-plist | 2 +- 12 files changed, 156 insertions(+), 63 deletions(-) diff --git a/games/toppler/Makefile b/games/toppler/Makefile index 2375f5d5d34c..c2c4aba19e74 100644 --- a/games/toppler/Makefile +++ b/games/toppler/Makefile @@ -1,22 +1,25 @@ # Created by: Dom Mitchell PORTNAME= toppler -PORTVERSION= 1.1.6 +PORTVERSION= 1.3 CATEGORIES= games -MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= Climb a tower and avoid monsters -LICENSE= GPLv2+ +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake localbase sdl -USE_SDL= mixer sdl -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var/games +LIB_DEPENDS= libpng.so:graphics/png +BUILD_DEPENDS= gimp:graphics/gimp-app \ + povray:graphics/povray-meta \ + convert:graphics/ImageMagick7 -SCOREFILE= /var/games/toppler/toppler.hsc +USES= gmake sdl pkgconfig +USE_GITLAB= yes +GL_ACCOUNT= roever +GL_COMMIT= 5e3e581bb7b58098f54df9b634c7bd4a23ba66b5 +USE_SDL= sdl2 image2 mixer2 PORTDOCS= * PORTDATA= * @@ -24,10 +27,27 @@ PORTDATA= * OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -NLS_CONFIGURE_ENABLE= nls +NLS_LIBS= -L${LOCALBASE}/lib -lintl NLS_USES= gettext +NLS_USES_OFF= gettext-tools + +post-extract: + @${MV} ${WRKSRC}/src/version ${WRKSRC} + +post-patch-NLS-off: + @${REINPLACE_CMD} -e 's|ENABLE_NLS=1|ENABLE_NLS=0|' ${WRKSRC}/Makefile post-install: - @${MV} ${STAGEDIR}${SCOREFILE} ${STAGEDIR}${SCOREFILE}.sample + @${MKDIR} ${STAGEDIR}/var/games/toppler + @${TOUCH} ${STAGEDIR}/var/games/toppler/toppler.hsc.sample + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/toppler + ${INSTALL_DATA} ${WRKSRC}/dist/toppler.xpm ${STAGEDIR}${PREFIX}/share/pixmaps + @${SED} -e 's|@prefix@|${PREFIX}|' \ + < ${WRKSRC}/dist/toppler.desktop.in \ + > ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ .include diff --git a/games/toppler/distinfo b/games/toppler/distinfo index cebda3038a0f..dce5390757ed 100644 --- a/games/toppler/distinfo +++ b/games/toppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485788372 -SHA256 (toppler-1.1.6.tar.gz) = 7dbc2905389c2adba0f8c459f3319cf04045ba53ed407e273a50a3a67564cc45 -SIZE (toppler-1.1.6.tar.gz) = 2117137 +TIMESTAMP = 1644266275 +SHA256 (roever-toppler-5e3e581bb7b58098f54df9b634c7bd4a23ba66b5_GL0.tar.gz) = 1e42d91af1f7a47b92532bc02da7d768dfcfe8cefa699ba4827356f198752c14 +SIZE (roever-toppler-5e3e581bb7b58098f54df9b634c7bd4a23ba66b5_GL0.tar.gz) = 3600621 diff --git a/games/toppler/files/patch-Makefile b/games/toppler/files/patch-Makefile new file mode 100644 index 000000000000..3b33e7dfd760 --- /dev/null +++ b/games/toppler/files/patch-Makefile @@ -0,0 +1,55 @@ +--- Makefile.orig 2022-02-06 08:35:59 UTC ++++ Makefile +@@ -18,10 +18,10 @@ + # along with this program; if not, write to the Free Software + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA + +-PREFIX = /usr ++PREFIX ?= /usr + BINDIR = $(PREFIX)/bin + DATADIR = $(PREFIX)/share +-STATEDIR = /var/toppler ++STATEDIR = /var/games/toppler + LOCALEDIR = $(DATADIR)/locale + MANDIR = $(DATADIR)/man + PKGDATADIR = $(DATADIR)/toppler +@@ -29,9 +29,9 @@ DESTDIR = + CROSS = + + CONVERT = convert +-CXX = $(CROSS)$(CXX_NATIVE) +-CXX_NATIVE = g++ +-CXXFLAGS = -Wall -Wextra -g -O2 -std=c++17 ++CXX_NATIVE = $(CXX) ++CXXFLAGS ?= -g -O2 ++CXXFLAGS += -Wall -Wextra -std=c++17 + EXEEXT = $(if $(filter %-w64-mingw32.static-,$(CROSS)),.exe,) + INSTALL = install + LDFLAGS = +@@ -50,7 +50,7 @@ MSGID_BUGS_ADDRESS := roever@users.sf.net + .PHONY: default + default: all + +-VERSION := $(shell cat src/version) ++VERSION := $(shell cat version) + ALL_SOURCES := $(wildcard src/*) + + PKGS += SDL2_mixer +@@ -63,7 +63,7 @@ PKGS_NATIVE += libpng + PKGS_NATIVE += SDL2_image + + PKG_CFLAGS_NATIVE = $$($(PKG_CONFIG_NATIVE) --cflags $(PKGS_NATIVE)) +-PKG_LIBS_NATIVE = $$($(PKG_CONFIG_NATIVE) --libs $(PKGS_NATIVE)) ++PKG_LIBS_NATIVE = $$($(PKG_CONFIG_NATIVE) --libs $(PKGS_NATIVE)) -lintl + + DEFS += -DVERSION='"$(VERSION)"' + DEFS += -DTOP_DATADIR='"$(PKGDATADIR)"' +@@ -75,7 +75,7 @@ FILES_H := $(wildcard src/*.h) + FILES_CPP := $(wildcard src/*.cc) + FILES_O := $(patsubst src/%,_build/$(CROSS)/%.o,$(FILES_CPP)) + .SECONDARY: $(FILES_O) +-_build/$(CROSS)/%.o: src/% src/version $(FILES_H) ++_build/$(CROSS)/%.o: src/% version $(FILES_H) + @mkdir -p $(dir $@) + $(CXX) $(CXXFLAGS) $$($(PKG_CONFIG) --cflags $(PKGS)) $(DEFS) -c -o $@ $< + diff --git a/games/toppler/files/patch-Makefile.in b/games/toppler/files/patch-Makefile.in deleted file mode 100644 index 483a2cc60b63..000000000000 --- a/games/toppler/files/patch-Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile.in.orig 2011-03-06 20:00:43 UTC -+++ Makefile.in -@@ -359,7 +359,7 @@ - dist_pixmaps_DATA = $(PACKAGE).xpm - applications_DATA = $(PACKAGE).desktop - dist_man_MANS = toppler.6 --dist_pkgdoc_DATA = AUTHORS COPYING ChangeLog NEWS README -+dist_pkgdoc_DATA = AUTHORS ChangeLog README - dist_pkgdata_DATA = \ - toppler.dat toppler.ogg \ - m1.ttm m2.ttm ball1.ttm ball2.ttm ball3.ttm abc.ttm pasi2.ttm david1.ttm -@@ -1086,14 +1086,12 @@ - install-dist_pkgdataDATA install-dist_pkgdocDATA \ - install-dist_pkglocalstateDATA install-man - @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-recursive - - install-dvi-am: - - install-exec-am: install-binPROGRAMS - @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - install-html: install-html-recursive - - install-html-am: diff --git a/games/toppler/files/patch-dist_toppler.desktop.in b/games/toppler/files/patch-dist_toppler.desktop.in new file mode 100644 index 000000000000..ff9eebcec29e --- /dev/null +++ b/games/toppler/files/patch-dist_toppler.desktop.in @@ -0,0 +1,16 @@ +--- dist/toppler.desktop.in.orig 2022-02-06 08:35:59 UTC ++++ dist/toppler.desktop.in +@@ -2,11 +2,11 @@ + Encoding=UTF-8 + Categories=Application;Game;ArcadeGame; + X-Desktop-File-Install-Version=0.2 +-Name=@FULLNAME@ ++Name=Tower Toppler + Comment=A clone of the 'Nebulus' game on old 8 and 16 bit machines. + Comment[de]=Klon des alten Spiels 'Nebulus' + Comment[cs]=Klon hry 'Nebulus' z dob 8 a 16 bitovÃœch počítačů. +-Icon=@prefix@/pixmaps/@PACKAGE@.xpm ++Icon=@prefix@/share/pixmaps/toppler.xpm + Exec=@prefix@/bin/toppler + Terminal=0 + Type=Application diff --git a/games/toppler/files/patch-highscore.cc b/games/toppler/files/patch-highscore.cc deleted file mode 100644 index e926fce62381..000000000000 --- a/games/toppler/files/patch-highscore.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- highscore.cc.orig 2009-10-11 08:46:06.000000000 +0900 -+++ highscore.cc 2009-11-16 01:09:40.000000000 +0900 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #ifdef __QNXNTO__ diff --git a/games/toppler/files/patch-main.cc b/games/toppler/files/patch-main.cc deleted file mode 100644 index fcf7d9921954..000000000000 --- a/games/toppler/files/patch-main.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- main.cc.orig 2012-12-22 11:02:06 UTC -+++ main.cc -@@ -96,7 +96,8 @@ int main(int argc, char *argv[]) { - - DIR *dir = opendir("locale"); - bindtextdomain("toppler", dir == NULL ? LOCALEDIR : "locale"); -- closedir(dir); -+ if (dir) -+ closedir(dir); - textdomain("toppler"); - #endif - diff --git a/games/toppler/files/patch-src_decl.cc b/games/toppler/files/patch-src_decl.cc new file mode 100644 index 000000000000..cb8fa8694596 --- /dev/null +++ b/games/toppler/files/patch-src_decl.cc @@ -0,0 +1,14 @@ +--- src/decl.cc.orig 2022-02-06 08:35:59 UTC ++++ src/decl.cc +@@ -119,9 +119,9 @@ static void checkdir(void) { + + if (!d) { + mkdir(n.c_str(), S_IRWXU); ++ } else { ++ closedir(d); + } +- +- closedir(d); + #endif + + } diff --git a/games/toppler/files/patch-src_highscore.cc b/games/toppler/files/patch-src_highscore.cc new file mode 100644 index 000000000000..bc1055a1c9d0 --- /dev/null +++ b/games/toppler/files/patch-src_highscore.cc @@ -0,0 +1,25 @@ +--- src/highscore.cc.orig 2022-02-06 08:35:59 UTC ++++ src/highscore.cc +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + #ifndef _WIN32 + #include +@@ -221,12 +222,12 @@ void hsc_init(void) { + } + else + { +- debugprintf(2, "could not open create the lock file, no write access to global hiscore directory\n", fname); ++ debugprintf(2, "could not open create the lock file, no write access to global hiscore directory\n", fname.c_str()); + } + } + else + { +- debugprintf(2, "could not open global highscore file %s\n", fname); ++ debugprintf(2, "could not open global highscore file %s\n", fname.c_str()); + } + + #else diff --git a/games/toppler/files/patch-src_main.cc b/games/toppler/files/patch-src_main.cc new file mode 100644 index 000000000000..774fcaa28c0c --- /dev/null +++ b/games/toppler/files/patch-src_main.cc @@ -0,0 +1,11 @@ +--- src/main.cc.orig 2022-02-06 08:35:59 UTC ++++ src/main.cc +@@ -33,6 +33,8 @@ + #include + #endif + ++#include ++ + static void printhelp(void) { + printf(_("\n\tOptions:\n\n -f\tEnable fullscreen mode\n -s\tSilence, disable all sound\n -dX\tSet debug level to X (default: %i)\n").c_str(), config.debug_level()); + } diff --git a/games/toppler/pkg-descr b/games/toppler/pkg-descr index b2d1ff2d9008..4e20a27a3eb9 100644 --- a/games/toppler/pkg-descr +++ b/games/toppler/pkg-descr @@ -12,4 +12,4 @@ The only weapon of defence you have is to throw a little snowball. But most of the other creatures just don't care about this. So you must avoid them. -WWW: http://toppler.sourceforge.net/ +WWW: https://gitlab.com/roever/toppler/ diff --git a/games/toppler/pkg-plist b/games/toppler/pkg-plist index 76ed8264859d..ddcadec6f1f7 100644 --- a/games/toppler/pkg-plist +++ b/games/toppler/pkg-plist @@ -1,6 +1,6 @@ @(,games,2555) bin/toppler -man/man6/toppler.6.gz share/applications/toppler.desktop +share/man/man6/toppler.6.gz %%NLS%%share/locale/cs/LC_MESSAGES/toppler.mo %%NLS%%share/locale/de/LC_MESSAGES/toppler.mo %%NLS%%share/locale/eu/LC_MESSAGES/toppler.mo