frogatto: Update, and avoid using git-package.mk

[Charlotte Koch <charlotte%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Tue Jan 17 21:34:20 2023 -0800
Changeset:	240b4bb6970b6c4ad78789f9d2a4155feef7f06f

Modified Files:
	frogatto/Makefile
	frogatto/distinfo
Removed Files:
	frogatto/TODO

Log Message:
frogatto: Update, and avoid using git-package.mk

Manually install the Git submodules to avoid needing git-package.mk

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

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

diffstat:
 frogatto/Makefile | 59 +++++++++++++++++++++++++++++++------------------------
 frogatto/TODO     |  4 ----
 frogatto/distinfo | 16 +++++++++++----
 3 files changed, 45 insertions(+), 34 deletions(-)

diffs:
diff --git a/frogatto/Makefile b/frogatto/Makefile
index 0af991e758..1996d07d71 100644
--- a/frogatto/Makefile
+++ b/frogatto/Makefile
@@ -1,16 +1,21 @@
 # $NetBSD$
 
+DISTNAME=		anura-0
 PKGNAME=		frogatto-0
 CATEGORIES=		games
-GIT_REPOSITORIES=	anura frogatto
+MASTER_SITES=		${MASTER_SITE_GITHUB:=anura-engine/}
+GITHUB_PROJECT=		anura
+GITHUB_TAG=		cdb63c9c7b500c1bdf61b405d659851c9903c101
 
-GIT_REPO.anura=		https://github.com/anura-engine/anura.git
-GIT_REVISION.anura=	e837e63ea88b8426dafd9414f0fdd7f30ab58102
-GIT_BRANCH.anura=	trunk
+FROGATTO_SHA=		ffea5dcfe0faad22c2840fb239cb6e9c6746b7d6
+IMGUI_SHA=		2379a8b3f21642f715a18749fbd0345c4acafa79
 
-GIT_REPO.frogatto=	https://github.com/frogatto/frogatto.git
-GIT_REVISION.frogatto=	8b0351854518af25b553c7fd50f6f2afb6d5e71b
-GIT_BRANCH.frogatto=	master
+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
@@ -18,14 +23,15 @@ LICENSE=	modified-bsd AND mit AND zlib # XXX not true, + cc-by-v3.0 also
 
 USE_LANGUAGES=	c c++
 GCC_REQD+=	4.8
-USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=	gmake pax pkg-config
 
 # Anura provides the game engine, which needs to be compiled. Frogatto is
 # simply the game data, no compiliation needed.
-WRKSRC=		${WRKDIR}/anura
+WRKSRC=		${WRKDIR}/anura-${GITHUB_TAG}
 
 CFLAGS+=	-Wno-sign-compare
 CFLAGS+=	-Wno-deprecated-declarations
+CFLAGS+=	-Wno-strict-aliasing
 
 .if "${OPSYS}" == "NetBSD"
 LDFLAGS+=	-lexecinfo
@@ -53,12 +59,10 @@ FROGATTO_DIRS+=	sounds_wav
 FROGATTO_FILES+=	master-config.cfg
 FROGATTO_FILES+=	module.cfg
 
-# The call to pax(1) from wip/mk/git-package.mk complains of file names that
-# are too long, related to the Xcode project in the MacOS directory. So, use
-# this opportunity to remove that and tons of other inessential files.
-post-fetch:
-	${RM} -rf ${WRKDIR}/anura/MacOS
-	${RM} -rf ${WRKDIR}/anura/vs2013
+# 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.
@@ -68,34 +72,37 @@ pre-configure:
 # Copy Frogatto's data into the Anura distribution, but install it as just
 # one complete "Frogatto."
 pre-install:
-	${MKDIR} ${WRKDIR}/anura/modules/frogatto4
-	for dir in ${FROGATTO_DIRS}; do										\
-		${MKDIR} ${WRKDIR}/anura/modules/frogatto4/$${dir};						\
-		cd ${WRKDIR}/frogatto/$${dir} && ${PAX} -r -w . ${WRKDIR}/anura/modules/frogatto4/$${dir};	\
+	${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/$${file} ${WRKDIR}/anura/modules/frogatto4/$${file};	\
+	for file in ${FROGATTO_FILES}; do										\
+		${INSTALL_DATA} ${WRKDIR}/frogatto-${FROGATTO_SHA}/$${file} ${WRKSRC}/modules/frogatto4/$${file};	\
 	done
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/frogatto-launcher ${DESTDIR}${PREFIX}/bin/frogatto
-	${INSTALL_PROGRAM} ${WRKDIR}/anura/anura ${DESTDIR}${PREFIX}/libexec/frogatto/anura
-	for dir in ${ANURA_DIRS}; do										\
-		${MKDIR} ${DESTDIR}${PREFIX}/share/frogatto/$${dir};						\
-		cd ${WRKDIR}/anura/$${dir} && ${PAX} -r -w . ${DESTDIR}${PREFIX}/share/frogatto/$${dir};	\
+	${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};	\
 	done
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/glm/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-.include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/frogatto/TODO b/frogatto/TODO
deleted file mode 100644
index 3fdc315d20..0000000000
--- a/frogatto/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-frogatto TODO:
-
-- relies on wip/git-package.mk
-- anura repo's "imgui" submodule is NOT pinned to a specific version
diff --git a/frogatto/distinfo b/frogatto/distinfo
index 282e58aa03..535f7227d9 100644
--- a/frogatto/distinfo
+++ b/frogatto/distinfo
@@ -1,6 +1,14 @@
 $NetBSD$
 
-SHA1 (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = 043d711ebd5a1ed29f29b2574f781db2583872a3
-RMD160 (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = a890fe1e95a318da9769d95d7d15c366fe7705b8
-SHA512 (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = 15c33d298ee038e28c6a39c63d2058d2b6182b1463fb35015d029e07377b8b33e01340a07b338f9cd990bc66a4685b609055c530adb0192815bb02c75eb0e79b
-Size (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = 606979149 bytes
+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
+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