pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

nanosaur2: Avoid needing git-package.mk by manually installing required submodule



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Tue Jan 17 19:06:55 2023 -0800
Changeset:	65b89aa3ac081a370cb3610f888d99f516ccdae1

Modified Files:
	nanosaur2/Makefile
Added Files:
	nanosaur2/distinfo
Removed Files:
	nanosaur2/TODO

Log Message:
nanosaur2: Avoid needing git-package.mk by manually installing required submodule

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

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

diffstat:
 nanosaur2/Makefile | 17 +++++++++++++----
 nanosaur2/TODO     |  4 ----
 nanosaur2/distinfo | 10 ++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diffs:
diff --git a/nanosaur2/Makefile b/nanosaur2/Makefile
index dddcd56aaf..0ac78c8ce3 100644
--- a/nanosaur2/Makefile
+++ b/nanosaur2/Makefile
@@ -2,8 +2,12 @@
 
 DISTNAME=	nanosaur2-2.1.0
 CATEGORIES=	games
-GIT_REPO=	https://github.com/jorio/Nanosaur2.git
-GIT_TAG=	v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=jorio/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+DISTFILES+=	${DEFAULT_DISTFILES} ${POMME}
+
+POMME=		6e4ea042ba9e7e525d3930e45662be15605153c4.tar.gz
+SITES.${POMME}=	${MASTER_SITE_GITHUB:=jorio/}Pomme/archive/
 
 MAINTAINER=	charlotte%NetBSD.org@localhost
 HOMEPAGE=	https://jorio.itch.io/nanosaur2
@@ -12,12 +16,18 @@ LICENSE=	cc-by-nc-sa-v4.0-license
 
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pax pkg-config
+
+WRKSRC=		${WRKDIR}/Nanosaur2-${PKGVERSION_NOREV}
 
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	libexec
 INSTALLATION_DIRS+=	share/nanosaur2/Data
 
+post-extract:
+	${RM} -rf ${WRKSRC}/extern/Pomme
+	${LN} -sf ${WRKDIR}/Pomme-${POMME:S/.tar.gz//} ${WRKSRC}/extern/Pomme
+
 pre-configure:
 	${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
 		${FILESDIR}/nanosaur2.template > ${WRKDIR}/nanosaur2
@@ -28,5 +38,4 @@ do-install:
 	(cd ${WRKSRC}/Data && ${PAX} -r -w . ${DESTDIR}${PREFIX}/share/nanosaur2/Data)
 
 .include "../../devel/SDL2/buildlink3.mk"
-.include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/nanosaur2/TODO b/nanosaur2/TODO
deleted file mode 100644
index 0705affa95..0000000000
--- a/nanosaur2/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-nanosaur2 TODO:
-
-- We depend on wip/mk/git-package.git because we need the Git submodules
-  (GitHub's 'archive' feature doesn't recurse into submodules)
diff --git a/nanosaur2/distinfo b/nanosaur2/distinfo
new file mode 100644
index 0000000000..bf96769f75
--- /dev/null
+++ b/nanosaur2/distinfo
@@ -0,0 +1,10 @@
+$NetBSD$
+
+SHA1 (6e4ea042ba9e7e525d3930e45662be15605153c4.tar.gz) = 0445d03ab85b4a489c51418cc3182d519c3658a9
+RMD160 (6e4ea042ba9e7e525d3930e45662be15605153c4.tar.gz) = f9e476a2ecd6ea91d83bbe4ad6b07953e8b8c3cd
+SHA512 (6e4ea042ba9e7e525d3930e45662be15605153c4.tar.gz) = dc150d0e3912ffbd03155eecbeef9b71acb312ed46f9324d9bb81a2f7f5f67191cb7a13755e45a9b8b6a12e12ff2b0cf59643df8d16fad8178c7451a99807f78
+Size (6e4ea042ba9e7e525d3930e45662be15605153c4.tar.gz) = 148244 bytes
+SHA1 (nanosaur2-2.1.0.tar.gz) = 98d6ade9b95be49bc0264d524287700789d544ae
+RMD160 (nanosaur2-2.1.0.tar.gz) = a5c2dec5c8becbfffd747a286020df49ecf94138
+SHA512 (nanosaur2-2.1.0.tar.gz) = 7c548d4c12bfb527f0ce8c3522636c860b52d70c8e38cdf454c809c60da1f351a1c7608f4c02699f8262ab7912cc5e6d63ac634848caf25c745ca6a9ac050fea
+Size (nanosaur2-2.1.0.tar.gz) = 120774044 bytes


Home | Main Index | Thread Index | Old Index