frogatto: Major update

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: frogatto: Major update
From: Charlotte Koch <charlotte%NetBSD.org@localhost>
Date: Fri, 10 Mar 2023 06:21:02 +0000
Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Thu Mar 9 22:21:02 2023 -0800
Changeset:	9b042695d56e88176a58d9f2bad2307b4212659c

Modified Files:
	frogatto/Makefile
	frogatto/PLIST
	frogatto/distinfo

Log Message:
frogatto: Major update

- Use GITHUB_SUBMODULES
- Use my personal fork for easier access to the version number (upstream
  does not a good job with releng)
- Install the LICENSE file
- Regen distinfo

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9b042695d56e88176a58d9f2bad2307b4212659c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 frogatto/Makefile | 95 ++++++++++++++++++++++++++-----------------------------
 frogatto/PLIST    |  3 +-
 frogatto/distinfo | 17 ++++------
 3 files changed, 52 insertions(+), 63 deletions(-)

diffs:
diff --git a/frogatto/Makefile b/frogatto/Makefile
index 1996d07d71..fdb47ad69f 100644
--- a/frogatto/Makefile
+++ b/frogatto/Makefile
@@ -1,25 +1,23 @@
 # $NetBSD$
 
 DISTNAME=		anura-0
-PKGNAME=		frogatto-0
+PKGNAME=		frogatto-4.28
 CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_GITHUB:=anura-engine/}
+MASTER_SITES=		${MASTER_SITE_GITHUB:=dressupgeekout/}
 GITHUB_PROJECT=		anura
 GITHUB_TAG=		cdb63c9c7b500c1bdf61b405d659851c9903c101
 
-FROGATTO_SHA=		ffea5dcfe0faad22c2840fb239cb6e9c6746b7d6
-IMGUI_SHA=		2379a8b3f21642f715a18749fbd0345c4acafa79
-
-FROGATTO=		${FROGATTO_SHA}.tar.gz
-IMGUI=			${IMGUI_SHA}.tar.gz
-DISTFILES+=		${DEFAULT_DISTFILES} ${FROGATTO} ${IMGUI}
-
-SITES.${FROGATTO}+=	${MASTER_SITE_GITHUB:=frogatto/}frogatto/archive/
-SITES.${IMGUI}+=	${MASTER_SITE_GITHUB:=anura-engine/}imgui/archive/
-
 MAINTAINER=	charlotte%NetBSD.org@localhost
 COMMENT=	The Frogatto and Friends game
-LICENSE=	modified-bsd AND mit AND zlib # XXX not true, + cc-by-v3.0 also
+LICENSE=	modified-bsd AND mit AND zlib # XXX + cc-by-v3.0 also
+
+GITHUB_SUBMODULES+=	\
+	anura-engine imgui 2379a8b3f21642f715a18749fbd0345c4acafa79 imgui
+
+# The Frogatto data files aren't actually a submodule of Anura, but they need
+# to end up "inside" the Anura source anyway, so this works well.
+GITHUB_SUBMODULES+=	\
+	dressupgeekout frogatto dressupgeekout-${PKGVERSION_NOREV} modules/frogatto4
 
 USE_LANGUAGES=	c c++
 GCC_REQD+=	4.8
@@ -41,52 +39,47 @@ INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	libexec/frogatto
 INSTALLATION_DIRS+=	share/frogatto
 
-ANURA_DIRS+=	data
-ANURA_DIRS+=	images
-ANURA_DIRS+=	modules
-ANURA_DIRS+=	music
-ANURA_DIRS+=	update
-
-FROGATTO_DIRS+=	data
-FROGATTO_DIRS+=	images
-FROGATTO_DIRS+=	locale
-FROGATTO_DIRS+=	music
-FROGATTO_DIRS+=	music_aac
-FROGATTO_DIRS+=	po
-FROGATTO_DIRS+=	sounds
-FROGATTO_DIRS+=	sounds_wav
+ANURA_SHARE_DEST=	${DESTDIR}${PREFIX}/share/frogatto
+FROGATTO_MODULE_DEST=	${ANURA_SHARE_DEST}/modules/frogatto4
+
+ANURA_DIRS+=		data
+ANURA_DIRS+=		images
+ANURA_DIRS+=		music
+ANURA_DIRS+=		update
+ANURA_DIRS+=		modules/gui
+ANURA_DIRS+=		modules/icons
+ANURA_DIRS+=		modules/lib_2d
+ANURA_DIRS+=		modules/tbs
+
+FROGATTO_DIRS+=		data
+FROGATTO_DIRS+=		images
+FROGATTO_DIRS+=		locale
+FROGATTO_DIRS+=		music
+FROGATTO_DIRS+=		music_aac
+FROGATTO_DIRS+=		po
+FROGATTO_DIRS+=		sounds
+FROGATTO_DIRS+=		sounds_wav
 
 FROGATTO_FILES+=	master-config.cfg
 FROGATTO_FILES+=	module.cfg
+FROGATTO_FILES+=	LICENSE
 
-# Imgui is a submodule of Anura.
-post-extract:
-	${RM} -rf ${WRKSRC}/imgui
-	${LN} -sf ${WRKDIR}/imgui-${IMGUI:S/.tar.gz//} ${WRKSRC}/imgui
-
-# Called frogatto-launcher on purpose to avoid conflict with source code repo
-# for Frogatto.
 pre-configure:
-	${SED} -e 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/frogatto.template > ${WRKDIR}/frogatto-launcher
-
-# Copy Frogatto's data into the Anura distribution, but install it as just
-# one complete "Frogatto."
-pre-install:
-	${MKDIR} ${WRKSRC}/modules/frogatto4
-	for dir in ${FROGATTO_DIRS}; do											\
-		${MKDIR} ${WRKSRC}/modules/frogatto4/$${dir};								\
-		cd ${WRKDIR}/frogatto-${FROGATTO_SHA}/$${dir} && ${PAX} -r -w . ${WRKSRC}/modules/frogatto4/$${dir};	\
-	done
-	for file in ${FROGATTO_FILES}; do										\
-		${INSTALL_DATA} ${WRKDIR}/frogatto-${FROGATTO_SHA}/$${file} ${WRKSRC}/modules/frogatto4/$${file};	\
-	done
+	${SED} -e 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/frogatto.template > ${WRKDIR}/frogatto
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/frogatto-launcher ${DESTDIR}${PREFIX}/bin/frogatto
+	${INSTALL_SCRIPT} ${WRKDIR}/frogatto ${DESTDIR}${PREFIX}/bin/frogatto
 	${INSTALL_PROGRAM} ${WRKSRC}/anura ${DESTDIR}${PREFIX}/libexec/frogatto/anura
-	for dir in ${ANURA_DIRS}; do									\
-		${MKDIR} ${DESTDIR}${PREFIX}/share/frogatto/$${dir};					\
-		cd ${WRKSRC}/$${dir} && ${PAX} -r -w . ${DESTDIR}${PREFIX}/share/frogatto/$${dir};	\
+	for dir in ${ANURA_DIRS}; do							\
+		${MKDIR} ${ANURA_SHARE_DEST}/$${dir};					\
+		cd ${WRKSRC}/$${dir} && ${PAX} -r -w . ${ANURA_SHARE_DEST}/$${dir};	\
+	done
+	for dir in ${FROGATTO_DIRS}; do										\
+		${MKDIR} ${FROGATTO_MODULE_DEST}/$${dir};							\
+		cd ${WRKSRC}/modules/frogatto4/$${dir} && ${PAX} -r -w . ${FROGATTO_MODULE_DEST}/$${dir};	\
+	done
+	for file in ${FROGATTO_FILES}; do							\
+		${INSTALL_DATA} ${WRKSRC}/modules/frogatto4/$${file} ${FROGATTO_MODULE_DEST};	\
 	done
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
diff --git a/frogatto/PLIST b/frogatto/PLIST
index 55ff30fe59..4e55826db7 100644
--- a/frogatto/PLIST
+++ b/frogatto/PLIST
@@ -132,7 +132,7 @@ share/frogatto/images/slider_handle.svg
 share/frogatto/images/white2x2.png
 share/frogatto/images/window-icon-large.png
 share/frogatto/images/window-icon.png
-share/frogatto/modules/empty_test_module/module.cfg
+share/frogatto/modules/frogatto4/LICENSE
 share/frogatto/modules/frogatto4/data/achievements.cfg
 share/frogatto/modules/frogatto4/data/backgrounds/air-stage1.cfg
 share/frogatto/modules/frogatto4/data/backgrounds/arcade.cfg
@@ -4980,7 +4980,6 @@ share/frogatto/modules/frogatto4/sounds_wav/wingflap2.wav
 share/frogatto/modules/frogatto4/sounds_wav/wingflap3.wav
 share/frogatto/modules/frogatto4/sounds_wav/wingflap4.wav
 share/frogatto/modules/frogatto4/sounds_wav/wingflap5.wav
-share/frogatto/modules/frogatto4_dependant_test_module/module.cfg
 share/frogatto/modules/gui/data/classes/easing.cfg
 share/frogatto/modules/gui/data/classes/font.cfg
 share/frogatto/modules/gui/data/classes/gui.cfg
diff --git a/frogatto/distinfo b/frogatto/distinfo
index 535f7227d9..830a974f8a 100644
--- a/frogatto/distinfo
+++ b/frogatto/distinfo
@@ -1,14 +1,11 @@
 $NetBSD$
 
-SHA1 (2379a8b3f21642f715a18749fbd0345c4acafa79.tar.gz) = f2efbf222ad2bf6b62692b5eaec44b0a1151c45d
-RMD160 (2379a8b3f21642f715a18749fbd0345c4acafa79.tar.gz) = fe9e3da657ee17c95f1e7ee5dc02ef4187943284
-SHA512 (2379a8b3f21642f715a18749fbd0345c4acafa79.tar.gz) = 9e724ff476a7c60a9259d34d93711a762136c89e9608368e1dd0b73bcb8a5d781a4cad6fd38dc525233517b4ff94616c0a3bc11cf8bc79518c33f92f141b1c9e
-Size (2379a8b3f21642f715a18749fbd0345c4acafa79.tar.gz) = 1213100 bytes
-SHA1 (anura-0-cdb63c9c7b500c1bdf61b405d659851c9903c101.tar.gz) = a47140d97e42d9418bc3160bcbfe879578403dcc
-RMD160 (anura-0-cdb63c9c7b500c1bdf61b405d659851c9903c101.tar.gz) = 6af127e18d42b29799be5827d4cb4b83af0fd9c0
+BLAKE2s (anura-0-cdb63c9c7b500c1bdf61b405d659851c9903c101.tar.gz) = 731d7929d498a44f9b59f6aaf5c86b951ccf7d78f3f122b4d9938f1fab4c2342
 SHA512 (anura-0-cdb63c9c7b500c1bdf61b405d659851c9903c101.tar.gz) = 8a9693c7a794916eacab5a963978068de6b8638150fb927e34b04d6334764bede58608141bde48a5d4599cd774256c526bd5c08472c8e4e013244c07a5728ee7
 Size (anura-0-cdb63c9c7b500c1bdf61b405d659851c9903c101.tar.gz) = 56257447 bytes
-SHA1 (ffea5dcfe0faad22c2840fb239cb6e9c6746b7d6.tar.gz) = b3a6131b1b67be7536818b5ae55468d5cabc3bc2
-RMD160 (ffea5dcfe0faad22c2840fb239cb6e9c6746b7d6.tar.gz) = 233c75840a3cdffdbe95beca2b01590c826cb01a
-SHA512 (ffea5dcfe0faad22c2840fb239cb6e9c6746b7d6.tar.gz) = e03d176fc21a120169d72fbead92e8ec796fb423c1676635eeb6793ac8e8c31fed294f641b9c95b18c4d99db683a8174c41582a70b59deeb19391f37c34894a3
-Size (ffea5dcfe0faad22c2840fb239cb6e9c6746b7d6.tar.gz) = 607038959 bytes
+BLAKE2s (anura-engine-imgui-2379a8b3f21642f715a18749fbd0345c4acafa79.tar.gz) = f8416963113e4362eceaac6a2fac2296bd3b7bc1c147cda7e6d47b7a5e6870bf
+SHA512 (anura-engine-imgui-2379a8b3f21642f715a18749fbd0345c4acafa79.tar.gz) = 9e724ff476a7c60a9259d34d93711a762136c89e9608368e1dd0b73bcb8a5d781a4cad6fd38dc525233517b4ff94616c0a3bc11cf8bc79518c33f92f141b1c9e
+Size (anura-engine-imgui-2379a8b3f21642f715a18749fbd0345c4acafa79.tar.gz) = 1213100 bytes
+BLAKE2s (dressupgeekout-frogatto-dressupgeekout-4.28.tar.gz) = 4dbe0dcbe7e64f8595c86db50f5c8975ef2fa3d76355bd3a6b971e54b28767d0
+SHA512 (dressupgeekout-frogatto-dressupgeekout-4.28.tar.gz) = 64c55ca83c46c85c71bd9494fa17b608f262b7b074af3a54509ba359f74272c8c64472675bd29844ee49ecb7c0dd39f5a649218e85c365729b74fd180ec6a1ba
+Size (dressupgeekout-frogatto-dressupgeekout-4.28.tar.gz) = 607020519 bytes
Prev by Date: wip: Add py-mdformat
Next by Date: glusterfs: simplify bash dependency
Previous by Thread: wip: Add py-mdformat
Next by Thread: glusterfs: simplify bash dependency
Indexes:
Home | Main Index | Thread Index | Old Index