On Mon, Dec 06, 2021 at 05:30:02AM -0700, Anthony J. Bentley wrote:
> Tom Murphy writes:
> > Here is a diff to update games/starfighter v1.7 to v2.4.
>
> Thanks! Some comments:
>
> - Life is easier if you don't reindent WANTLIB. Just use the output
> from make port-lib-depends-check.
>
> - No need to set MODPY_VERSION, Python 3 is already default.
>
> - Since Python is just used for the build, set MODPY_RUNDEP=No.
>
> - Actually, according to README locales don't need to be rebuilt if
> we're using release tarballs, which we are. So just drop the Python
> stuff completely.
>
> - Drop glib2 and harfbuzz from LIB_DEPENDS, they are brought in by pango.
>
> - It looks like MAKE_FLAGS, FAKE_FLAGS, and post-install are no longer
> necessary and can be deleted.
Hi! Thanks for the feedback!
Please find the new diff below. portcheck still gives the message:
Python module without compiled version, consider using
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py: share/starfighter/locale/build.py
However, the locale files are in the PLIST so this should be OK?
-Tom
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/starfighter/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 12 Jul 2019 20:46:25 -0000 1.9
+++ Makefile 10 Dec 2021 20:27:54 -0000
@@ -2,44 +2,37 @@
COMMENT = sidescrolling space shmup
-V = 1.7
+V = 2.4
DISTNAME = starfighter-$V-src
PKGNAME = starfighter-$V
-REVISION = 1
CATEGORIES = games
-HOMEPAGE = http://starfighter.nongnu.org/
+HOMEPAGE = https://pr-starfighter.github.io/
MAINTAINER = Anthony J. Bentley <[email protected]>
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += SDL2 SDL2_image SDL2_mixer c m pthread ${COMPILER_LIBCXX}
+WANTLIB += SDL2 SDL2_image SDL2_mixer SDL2_ttf c glib-2.0 gobject-2.0
+WANTLIB += harfbuzz intl m pango-1.0 pthread
+
+MASTER_SITES =
https://github.com/pr-starfighter/starfighter/releases/download/v${V}/
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES = ${MASTER_SITE_SAVANNAH:=starfighter/$V/}
+LIB_DEPENDS = devel/pango \
+ devel/sdl2-image \
+ devel/sdl2-mixer \
+ devel/sdl2-ttf
-LIB_DEPENDS = devel/sdl2-image \
- devel/sdl2-mixer
RUN_DEPENDS = devel/desktop-file-utils
-MAKE_FLAGS = CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS} \
- `pkg-config --cflags sdl2 SDL2_image SDL2_mixer`" \
- BINDIR="${PREFIX}/bin/" \
- DATADIR="${PREFIX}/share/starfighter/"
-FAKE_FLAGS = PREFIX=${TRUEPREFIX}
-
CONFIGURE_STYLE = gnu
USE_GMAKE = Yes
NO_TEST = Yes
-
-post-install:
- chmod ${SHAREMODE} ${PREFIX}/share/starfighter/*/*
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/starfighter/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 15 May 2018 07:10:42 -0000 1.3
+++ distinfo 10 Dec 2021 20:27:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (starfighter-1.7-src.tar.gz) =
W4xT7mgK0pVY4kS1k0X7x8IQClQtKDnddOIvhOWFhpg=
-SIZE (starfighter-1.7-src.tar.gz) = 46178626
+SHA256 (starfighter-2.4-src.tar.gz) =
Jae/Dz7hfAJpjHGtZGnEf+K1pgZqYkmM4sg3PWQ6+kY=
+SIZE (starfighter-2.4-src.tar.gz) = 50431362
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/starfighter/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:49 -0000 1.4
+++ pkg/PLIST 10 Dec 2021 20:27:54 -0000
@@ -1,28 +1,18 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/27 21:03:49 espie Exp $
@bin bin/starfighter
+@man man/man6/starfighter.6
share/applications/starfighter.desktop
share/doc/starfighter/
share/doc/starfighter/COPYING
share/doc/starfighter/LICENSES
share/doc/starfighter/README.txt
-share/doc/starfighter/docs/
-share/doc/starfighter/docs/COPYING
-share/doc/starfighter/docs/arrowNorthEast.png
-share/doc/starfighter/docs/dollar.png
-share/doc/starfighter/docs/heart.png
-share/doc/starfighter/docs/index.html
-share/doc/starfighter/docs/plasmaAmmo.png
-share/doc/starfighter/docs/plasmaDamage.png
-share/doc/starfighter/docs/plasmaRate.png
-share/doc/starfighter/docs/rocket.png
-share/doc/starfighter/docs/rocketAmmo.png
-share/doc/starfighter/docs/sflogo.png
-share/doc/starfighter/docs/superCharge.png
share/pixmaps/
share/pixmaps/starfighter.png
share/starfighter/
share/starfighter/data/
+share/starfighter/data/TakaoPGothic.ttf
share/starfighter/data/credits.txt
+share/starfighter/data/ipa_font_license.txt
share/starfighter/gfx/
share/starfighter/gfx/aimFighter1.png
share/starfighter/gfx/aimFighter2.png
@@ -213,6 +203,22 @@ share/starfighter/gfx/tug2.png
share/starfighter/gfx/ursulaText.png
share/starfighter/gfx/wingmate1.png
share/starfighter/gfx/wingmate2.png
+share/starfighter/locale/
+share/starfighter/locale/build.py
+share/starfighter/locale/en/
+share/starfighter/locale/en.po
+share/starfighter/locale/en/LC_MESSAGES/
+share/starfighter/locale/en/LC_MESSAGES/pr-starfighter.mo
+share/starfighter/locale/genpot.sh
+share/starfighter/locale/ja/
+share/starfighter/locale/ja.po
+share/starfighter/locale/ja/LC_MESSAGES/
+share/starfighter/locale/ja/LC_MESSAGES/pr-starfighter.mo
+share/starfighter/locale/nl/
+share/starfighter/locale/nl.po
+share/starfighter/locale/nl/LC_MESSAGES/
+share/starfighter/locale/nl/LC_MESSAGES/pr-starfighter.mo
+share/starfighter/locale/pr-starfighter.pot
share/starfighter/music/
share/starfighter/music/RE.ogg
share/starfighter/music/death.ogg
