pkgsrc-WIP-changes archive

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

ottomatic: 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 20:09:40 2023 -0800
Changeset:	154282613c6ff81dd84460290f0408a80871f807

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

Log Message:
ottomatic: 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=154282613c6ff81dd84460290f0408a80871f807

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

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

diffs:
diff --git a/ottomatic/Makefile b/ottomatic/Makefile
index d6b28e37d6..111786d56d 100644
--- a/ottomatic/Makefile
+++ b/ottomatic/Makefile
@@ -2,8 +2,12 @@
 
 DISTNAME=	ottomatic-4.0.0
 CATEGORIES=	games
-GIT_REPO=	https://github.com/jorio/OttoMatic.git
-GIT_TAG=	${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=jorio/}
+GIT_TAG=	${PKGVERSION_NOREV} ${POMME}
+DISTFILES+=	${DEFAULT_DISTFILES} ${POMME}
+
+POMME=		b9ddab06cdc0b9e4a8085e50974213b6c9625436.tar.gz
+SITES.${POMME}=	${MASTER_SITE_GITHUB:=jorio/}Pomme/archive/
 
 MAINTAINER=	charlotte%NetBSD.org@localhost
 HOMEPAGE=	https://pangeasoft.net/otto/
@@ -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}/OttoMatic-${PKGVERSION_NOREV}
 
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	libexec
 INSTALLATION_DIRS+=	share/ottomatic/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}/ottomatic.template > ${WRKDIR}/ottomatic
@@ -28,5 +38,4 @@ do-install:
 	(cd ${WRKSRC}/Data && ${PAX} -r -w . ${DESTDIR}${PREFIX}/share/ottomatic/Data)
 
 .include "../../devel/SDL2/buildlink3.mk"
-.include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ottomatic/TODO b/ottomatic/TODO
deleted file mode 100644
index 5ff921f06d..0000000000
--- a/ottomatic/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-ottomatic 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/ottomatic/distinfo b/ottomatic/distinfo
index afc76512f4..963cf2f7e3 100644
--- a/ottomatic/distinfo
+++ b/ottomatic/distinfo
@@ -1,2 +1,10 @@
 $NetBSD$
 
+SHA1 (b9ddab06cdc0b9e4a8085e50974213b6c9625436.tar.gz) = a47f786bff3d34f3e940a7da71d14fcd5a31d6f3
+RMD160 (b9ddab06cdc0b9e4a8085e50974213b6c9625436.tar.gz) = 9b7d1e315a346034203fd295b60281a07c376841
+SHA512 (b9ddab06cdc0b9e4a8085e50974213b6c9625436.tar.gz) = ae7b152cf6b2fed749664b15dcac7db116ff8d52183442ecc76af312f09d6c04a4143d8f90e41d24b4acf147467e28dcf5c2a14d9d069fb7554ec23673f0b1b9
+Size (b9ddab06cdc0b9e4a8085e50974213b6c9625436.tar.gz) = 122173 bytes
+SHA1 (ottomatic-4.0.0.tar.gz) = e5edd3119e9f8c5505bbbf0868682057e25beb5f
+RMD160 (ottomatic-4.0.0.tar.gz) = 68706ba83a933a6633c355d69eabf39b839d2e09
+SHA512 (ottomatic-4.0.0.tar.gz) = 5e3d4a78c1ad6d1ff0d67d45e5232a93de1509e1a28307be8e64e6419faa497fc0ff05d2f8a2ac4f3a57ea0d843adf02ec4c6b935e2f93b35323036836a4d6af
+Size (ottomatic-4.0.0.tar.gz) = 150808790 bytes


Home | Main Index | Thread Index | Old Index