Thu Feb 5 16:46:17 2015 UTC ()
Fix installation. Replace interpreter in an installed python script,
and depend on python for it.
(wiz)
diff -r1.3 -r1.4 pkgsrc/emulators/retroarch/Makefile
diff -r1.1 -r1.2 pkgsrc/emulators/retroarch/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/retroarch/patches/patch-Makefile
--- pkgsrc/emulators/retroarch/Makefile 2015/02/05 16:38:47 1.3
+++ pkgsrc/emulators/retroarch/Makefile 2015/02/05 16:46:17 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/02/05 16:38:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/05 16:46:17 wiz Exp $
DISTNAME= retroarch-20150203
PKGNAME= retroarch-0.0.20150203
@@ -14,10 +14,14 @@
WRKSRC= ${WRKDIR}/RetroArch-master
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=--global-config-dir=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+= MAN_DIR=${PREFIX}/${PKGMANDIR}/man1/
CONFIG_SHELL= bash
USE_LANGUAGES= c c++
USE_TOOLS+= bash pkg-config gmake
+PYTHON_VERSIONS_INCOMPATIBLE= 26 27
+REPLACE_PYTHON= tools/cg2glsl.py
+
EGDIR= ${PREFIX}/share/examples/retroarch
CONF_FILES+= ${EGDIR}/retroarch.cfg ${PKG_SYSCONFDIR}/retroarch.cfg
@@ -45,6 +49,7 @@
.include "options.mk"
+.include "../../lang/python/application.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
--- pkgsrc/emulators/retroarch/distinfo 2015/02/04 22:56:43 1.1
+++ pkgsrc/emulators/retroarch/distinfo 2015/02/05 16:46:17 1.2
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2015/02/04 22:56:43 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2015/02/05 16:46:17 wiz Exp $
SHA1 (retroarch-20150203.zip) = 46f9493f3ab09fd185345e6bab797c4e882c5262
RMD160 (retroarch-20150203.zip) = 76c4ae4f7edb5c866f606cb23e5550a5b7c285b4
Size (retroarch-20150203.zip) = 10043939 bytes
-SHA1 (patch-Makefile) = 1c4af8253eb3ad3c209fab8919ecd78526163b86
+SHA1 (patch-Makefile) = 41a8de7bc2d992cae1799935c5d3a61774c6be88
SHA1 (patch-Makefile.common) = 3a2157e04dfacadc48f421106760b0194586677e
SHA1 (patch-qb_config.libs.sh) = 4eccb74e9f31d0f8ff3eeb6c6ded03ac148b2808
SHA1 (patch-qb_qb.libs.sh) = 00689ff9d4b6afc9313938e2921e90f01640420f
--- pkgsrc/emulators/retroarch/patches/patch-Makefile 2015/02/04 22:56:43 1.1
+++ pkgsrc/emulators/retroarch/patches/patch-Makefile 2015/02/05 16:46:17 1.2
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2015/02/04 22:56:43 jmcneill Exp $
+$NetBSD: patch-Makefile,v 1.2 2015/02/05 16:46:17 wiz Exp $
--- Makefile.orig 2015-02-03 06:43:44.000000000 +0000
+++ Makefile
@@ -9,7 +9,7 @@
- mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true
+ mkdir -p $(DESTDIR)$(PREFIX)/share/examples/retroarch 2>/dev/null || /bin/true
-+ mkdir -p $(DESTDIR)$(PREFIX)/man/man1 2>/dev/null || /bin/true
++ mkdir -p $(DESTDIR)$(MAN_DIR) 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl