Attachment 195992 Details for Bug 230445 – Update

[patch] Update

fs-uae-launcher (text/plain), 4.74 KB, created by Nathan on 2018-08-07 23:10:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-08-07 23:10:40 UTC

Size: 4.74 KB

patch

obsolete

>Index: emulators/fs-uae-launcher/Makefile
>===================================================================
>--- emulators/fs-uae-launcher/Makefile	(revision 476546)
>+++ emulators/fs-uae-launcher/Makefile	(working copy)
>@@ -2,23 +2,22 @@
> # $FreeBSD$
> 
> PORTNAME=	fs-uae-launcher
>-PORTVERSION=	2.4.1
>+PORTVERSION=	2.8.4
> CATEGORIES=	emulators
> MASTER_SITES=	http://fs-uae.net/fs-uae/stable/${PORTVERSION}/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	ndowens@yahoo.com
> COMMENT=	GUI launcher for the FS-UAE Amiga emulator
> 
>-LICENSE=	GPLv2
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gettext gmake pathfix python:2.7 shebangfix
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
> 
>+USES=		gettext gmake pathfix python:3.4+ pyqt:5
>+USE_PYTHON=	distutils autoplist
>+USE_PYQT=	core sip gui widgets opengl
> INSTALLS_ICONS=	yes
>-MAKE_ARGS=	DESTDIR=${STAGEDIR} prefix=${PREFIX}
>+MAKE_ARGS=	DESTDIR=${STAGEDIR} prefix=${PREFIX} PYTHON=${PYTHON_CMD}
> 
>-do-build:
>-	(cd ${WRKSRC} && ${PYTHON_CMD} setup.py build)
>-	(cd ${WRKSRC} && ${PYTHON_CMD} \
>-		setup.py install --root ${STAGEDIR} --prefix ${PREFIX})
>-
> .include <bsd.port.mk>
>Index: emulators/fs-uae-launcher/distinfo
>===================================================================
>--- emulators/fs-uae-launcher/distinfo	(revision 476546)
>+++ emulators/fs-uae-launcher/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (fs-uae-launcher-2.4.1.tar.gz) = 77a22a7a2dee7eef42fc5eb735624bf5760488df1628431e4fbc05da90ee04dd
>-SIZE (fs-uae-launcher-2.4.1.tar.gz) = 8069483
>+TIMESTAMP = 1533616420
>+SHA256 (fs-uae-launcher-2.8.4.tar.gz) = a7d7dcfc028041aaf89962e541dc542802d323884f5524964e464ae0e10c312d
>+SIZE (fs-uae-launcher-2.8.4.tar.gz) = 8791728
>Index: emulators/fs-uae-launcher/files/patch-Makefile
>===================================================================
>--- emulators/fs-uae-launcher/files/patch-Makefile	(nonexistent)
>+++ emulators/fs-uae-launcher/files/patch-Makefile	(working copy)
>@@ -0,0 +1,26 @@
>+--- Makefile.orig	2018-08-07 05:14:24 UTC
>++++ Makefile
>+@@ -2,7 +2,7 @@ version := $(strip $(shell cat VERSION))
>+ build_dir := "."
>+ dist_name = fs-uae-launcher-$(version)
>+ dist_dir := $(build_dir)/$(dist_name)
>+-
>++PYTHON =
>+ DESTDIR :=
>+ prefix := /usr/local
>+ 
>+@@ -103,12 +103,12 @@ mo: $(catalogs)
>+ 
>+ install-program:
>+ ifeq ($(DESTDIR),)
>+-	python3 setup.py install	 --install-lib=$(prefix)/share/fs-uae-launcher	 --install-scripts=$(prefix)/share/fs-uae-launcher
>++	$(PYTHON) setup.py install	 --install-lib=$(prefix)/share/fs-uae-launcher	 --install-scripts=$(prefix)/share/fs-uae-launcher
>+ 	install -d $(DESTDIR)$(prefix)/bin
>+ 	rm -f $(DESTDIR)$(prefix)/bin/fs-uae-launcher
>+ 	ln -s ../share/fs-uae-launcher/fs-uae-launcher	 $(DESTDIR)$(prefix)/bin/fs-uae-launcher
>+ else
>+-	python3 setup.py install	 --root=$(DESTDIR)	 --install-lib=$(prefix)/share/fs-uae-launcher	 --install-scripts=$(prefix)/share/fs-uae-launcher
>++	$(PYTHON) setup.py install	 --root=$(DESTDIR)	 --install-lib=$(prefix)/share/fs-uae-launcher	 --install-scripts=$(prefix)/share/fs-uae-launcher
>+ 	install -d $(DESTDIR)$(prefix)/bin
>+ 	rm -f $(DESTDIR)$(prefix)/bin/fs-uae-launcher
>+ 	ln -s ../share/fs-uae-launcher/fs-uae-launcher	 $(DESTDIR)$(prefix)/bin/fs-uae-launcher
>
>Property changes on: emulators/fs-uae-launcher/files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/fs-uae-launcher/files/patch-setup.py
>===================================================================
>--- emulators/fs-uae-launcher/files/patch-setup.py	(nonexistent)
>+++ emulators/fs-uae-launcher/files/patch-setup.py	(working copy)
>@@ -0,0 +1,15 @@
>+--- setup.py.orig	2018-08-07 05:29:07 UTC
>++++ setup.py
>+@@ -9,12 +9,6 @@ if "install" in sys.argv:
>+     for arg in sys.argv:
>+         if arg.startswith("--install-lib="):
>+             break
>+-    else:
>+-        print("ERROR: You should not install FS-UAE Launcher to the default ")
>+-        print("python library location. Instead, use --install-lib to ")
>+-        print("install to a custom location, e.g.:")
>+-        print("python3 setup.py --install-lib=/usr/share/fs-uae-launcher install")
>+-        sys.exit(1)
>+ 
>+ title = "FS-UAE Launcher"
>+ name = "fs-uae-launcher"
>
>Property changes on: emulators/fs-uae-launcher/files/patch-setup.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

ndowens04: maintainer-approval+

Actions: View | Diff

Attachments on bug 230445: 195992 | 196398 | 196729