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
cvs diff -r1.3 -r1.4 pkgsrc/emulators/retroarch/Makefile (expand / switch to unified diff)

--- 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,33 +1,37 @@ @@ -1,33 +1,37 @@
1# $NetBSD: Makefile,v 1.3 2015/02/05 16:38:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2015/02/05 16:46:17 wiz Exp $
2 2
3DISTNAME= retroarch-20150203 3DISTNAME= retroarch-20150203
4PKGNAME= retroarch-0.0.20150203 4PKGNAME= retroarch-0.0.20150203
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/jmcneill/retroarch/ 6MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/jmcneill/retroarch/
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.libretro.com/ 10HOMEPAGE= http://www.libretro.com/
11COMMENT= Official reference frontend for the libretro API 11COMMENT= Official reference frontend for the libretro API
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14WRKSRC= ${WRKDIR}/RetroArch-master 14WRKSRC= ${WRKDIR}/RetroArch-master
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16CONFIGURE_ARGS+=--global-config-dir=${PKG_SYSCONFDIR} 16CONFIGURE_ARGS+=--global-config-dir=${PKG_SYSCONFDIR}
 17CONFIGURE_ENV+= MAN_DIR=${PREFIX}/${PKGMANDIR}/man1/
17CONFIG_SHELL= bash 18CONFIG_SHELL= bash
18USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
19USE_TOOLS+= bash pkg-config gmake 20USE_TOOLS+= bash pkg-config gmake
20 21
 22PYTHON_VERSIONS_INCOMPATIBLE= 26 27
 23REPLACE_PYTHON= tools/cg2glsl.py
 24
21EGDIR= ${PREFIX}/share/examples/retroarch 25EGDIR= ${PREFIX}/share/examples/retroarch
22CONF_FILES+= ${EGDIR}/retroarch.cfg ${PKG_SYSCONFDIR}/retroarch.cfg 26CONF_FILES+= ${EGDIR}/retroarch.cfg ${PKG_SYSCONFDIR}/retroarch.cfg
23 27
24SUBST_CLASSES+= qb 28SUBST_CLASSES+= qb
25SUBST_STAGE.qb= pre-configure 29SUBST_STAGE.qb= pre-configure
26SUBST_MESSAGE.qb= Fixing path to true(1) in configure scripts. 30SUBST_MESSAGE.qb= Fixing path to true(1) in configure scripts.
27SUBST_FILES.qb= qb/qb.libs.sh 31SUBST_FILES.qb= qb/qb.libs.sh
28SUBST_SED.qb+= -e 's;/bin/true;${TRUE};' 32SUBST_SED.qb+= -e 's;/bin/true;${TRUE};'
29 33
30SUBST_CLASSES+= vc 34SUBST_CLASSES+= vc
31SUBST_STAGE.vc= pre-configure 35SUBST_STAGE.vc= pre-configure
32SUBST_MESSAGE.vc= Fixing path to VideoCore libraries. 36SUBST_MESSAGE.vc= Fixing path to VideoCore libraries.
33SUBST_FILES.vc= qb/config.libs.sh 37SUBST_FILES.vc= qb/config.libs.sh
@@ -35,23 +39,24 @@ SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX}; @@ -35,23 +39,24 @@ SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};
35 39
36SUBST_CLASSES+= cfg 40SUBST_CLASSES+= cfg
37SUBST_STAGE.cfg= pre-configure 41SUBST_STAGE.cfg= pre-configure
38SUBST_MESSAGE.cfg= Setting paths in sample config. 42SUBST_MESSAGE.cfg= Setting paths in sample config.
39SUBST_FILES.cfg= retroarch.cfg 43SUBST_FILES.cfg= retroarch.cfg
40SUBST_SED.cfg+= -e 's;.*libretro_directory =.*;libretro_directory = "${PREFIX}/lib/libretro";' 44SUBST_SED.cfg+= -e 's;.*libretro_directory =.*;libretro_directory = "${PREFIX}/lib/libretro";'
41 45
42post-install: 46post-install:
43 ${INSTALL_PROGRAM} ${WRKSRC}/tools/retroarch-joyconfig \ 47 ${INSTALL_PROGRAM} ${WRKSRC}/tools/retroarch-joyconfig \
44 ${DESTDIR}${PREFIX}/bin/retroarch-joyconfig 48 ${DESTDIR}${PREFIX}/bin/retroarch-joyconfig
45 49
46.include "options.mk" 50.include "options.mk"
47 51
 52.include "../../lang/python/application.mk"
48.include "../../devel/zlib/buildlink3.mk" 53.include "../../devel/zlib/buildlink3.mk"
49.include "../../textproc/libxml2/buildlink3.mk" 54.include "../../textproc/libxml2/buildlink3.mk"
50.include "../../graphics/freetype2/buildlink3.mk" 55.include "../../graphics/freetype2/buildlink3.mk"
51.include "../../x11/libX11/buildlink3.mk" 56.include "../../x11/libX11/buildlink3.mk"
52.include "../../x11/libXext/buildlink3.mk" 57.include "../../x11/libXext/buildlink3.mk"
53.include "../../x11/libXinerama/buildlink3.mk" 58.include "../../x11/libXinerama/buildlink3.mk"
54.include "../../x11/libXv/buildlink3.mk" 59.include "../../x11/libXv/buildlink3.mk"
55.include "../../x11/libXxf86vm/buildlink3.mk" 60.include "../../x11/libXxf86vm/buildlink3.mk"
56#.include "../../x11/libxkbcommon/buildlink3.mk" 61#.include "../../x11/libxkbcommon/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/emulators/retroarch/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.1 2015/02/04 22:56:43 jmcneill Exp $ 1$NetBSD: distinfo,v 1.2 2015/02/05 16:46:17 wiz Exp $
2 2
3SHA1 (retroarch-20150203.zip) = 46f9493f3ab09fd185345e6bab797c4e882c5262 3SHA1 (retroarch-20150203.zip) = 46f9493f3ab09fd185345e6bab797c4e882c5262
4RMD160 (retroarch-20150203.zip) = 76c4ae4f7edb5c866f606cb23e5550a5b7c285b4 4RMD160 (retroarch-20150203.zip) = 76c4ae4f7edb5c866f606cb23e5550a5b7c285b4
5Size (retroarch-20150203.zip) = 10043939 bytes 5Size (retroarch-20150203.zip) = 10043939 bytes
6SHA1 (patch-Makefile) = 1c4af8253eb3ad3c209fab8919ecd78526163b86 6SHA1 (patch-Makefile) = 41a8de7bc2d992cae1799935c5d3a61774c6be88
7SHA1 (patch-Makefile.common) = 3a2157e04dfacadc48f421106760b0194586677e 7SHA1 (patch-Makefile.common) = 3a2157e04dfacadc48f421106760b0194586677e
8SHA1 (patch-qb_config.libs.sh) = 4eccb74e9f31d0f8ff3eeb6c6ded03ac148b2808 8SHA1 (patch-qb_config.libs.sh) = 4eccb74e9f31d0f8ff3eeb6c6ded03ac148b2808
9SHA1 (patch-qb_qb.libs.sh) = 00689ff9d4b6afc9313938e2921e90f01640420f 9SHA1 (patch-qb_qb.libs.sh) = 00689ff9d4b6afc9313938e2921e90f01640420f
cvs diff -r1.1 -r1.2 pkgsrc/emulators/retroarch/patches/patch-Makefile (expand / switch to unified diff)

--- 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,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-Makefile,v 1.1 2015/02/04 22:56:43 jmcneill Exp $ 1$NetBSD: patch-Makefile,v 1.2 2015/02/05 16:46:17 wiz Exp $
2 2
3--- Makefile.orig 2015-02-03 06:43:44.000000000 +0000 3--- Makefile.orig 2015-02-03 06:43:44.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -137,12 +137,12 @@ $(OBJDIR)/%.o: %.rc $(HEADERS) 5@@ -137,12 +137,12 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
6 install: $(TARGET) 6 install: $(TARGET)
7 rm -f $(OBJDIR)/git_version.o 7 rm -f $(OBJDIR)/git_version.o
8 mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true 8 mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
9- mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true 9- mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
10- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true 10- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true
11+ mkdir -p $(DESTDIR)$(PREFIX)/share/examples/retroarch 2>/dev/null || /bin/true 11+ mkdir -p $(DESTDIR)$(PREFIX)/share/examples/retroarch 2>/dev/null || /bin/true
12+ mkdir -p $(DESTDIR)$(PREFIX)/man/man1 2>/dev/null || /bin/true 12+ mkdir -p $(DESTDIR)$(MAN_DIR) 2>/dev/null || /bin/true
13 mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true 13 mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
14 install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin  14 install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
15 install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl 15 install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
16- install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg 16- install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
17+ install -m644 retroarch.cfg $(DESTDIR)$(PREFIX)/share/examples/retroarch/retroarch.cfg 17+ install -m644 retroarch.cfg $(DESTDIR)$(PREFIX)/share/examples/retroarch/retroarch.cfg
18 install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR) 18 install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
19 install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR) 19 install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)
20 install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR) 20 install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR)
21@@ -153,10 +153,10 @@ uninstall: 21@@ -153,10 +153,10 @@ uninstall:
22 rm -f $(DESTDIR)$(PREFIX)/bin/retroarch 22 rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
23 rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-joyconfig 23 rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-joyconfig
24 rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl 24 rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
25- rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg 25- rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg