Attachment 146330 Details for Bug 193032 – emulators_wine-doors.diff

[patch] emulators_wine-doors.diff

emulators_wine-doors.diff (text/plain), 10.98 KB, created by tkato432 on 2014-08-26 18:34:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-26 18:34:36 UTC

Size: 10.98 KB

patch

obsolete

>diff -urN /usr/ports/emulators/wine-doors/Makefile emulators/wine-doors/Makefile
>--- /usr/ports/emulators/wine-doors/Makefile	2014-07-03 06:37:12.000000000 +0900
>+++ emulators/wine-doors/Makefile	2014-08-27 00:00:00.000000000 +0900
>@@ -2,39 +2,68 @@
> # $FreeBSD: head/emulators/wine-doors/Makefile 360256 2014-07-02 20:22:55Z antoine $
> 
> PORTNAME=	wine-doors
>-PORTVERSION=	0.1.2
>-PORTREVISION=	7
>+PORTVERSION=	0.1.3
>+DISTVERSIONPREFIX=	src-
> CATEGORIES=	emulators
>-MASTER_SITES=	http://www.wine-doors.org/releases/
>+MASTER_SITES=	SF/${PORTNAME:S/-//}/archive
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Windows application management for the GNOME Desktop
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
>-		${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
>-		${PYTHON_SITELIBDIR}/gtk-2.0/gtksourceview.so:${PORTSDIR}/x11-toolkits/py-gnome-desktop \
>-		bash:${PORTSDIR}/shells/bash \
>-		cabextract:${PORTSDIR}/archivers/cabextract \
>+LICENSE=	GPLv2 # (or later)
>+
>+RUN_DEPENDS=	cabextract:${PORTSDIR}/archivers/cabextract \
> 		orange:${PORTSDIR}/archivers/liborange \
> 		unzip:${PORTSDIR}/archivers/unzip \
>-		wine:${PORTSDIR}/emulators/wine
>-
>-USE_PYTHON=	yes
>+		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
>+		${PYTHON_PKGNAMEPREFIX}cairo>0:${PORTSDIR}/graphics/py-cairo \
>+		bash:${PORTSDIR}/shells/bash
> 
>+NO_ARCH=	yes
> NO_BUILD=	yes
>+NO_WRKSUBDIR=	yes
>+
>+USES=		python:run shebangfix
>+python_OLD_CMD=	/usr/bin/env python
>+python_CMD=	${PYTHON_CMD}
>+SHEBANG_FILES=	src/winedoors.py
>+USE_GNOME=	pygnomedesktop:run
> 
> SUB_FILES=	preferences.xml
> 
>-NO_STAGE=	yes
>+.include <bsd.port.options.mk>
>+
>+.if ${ARCH} == i386
>+RUN_DEPENDS+=	wine>0:${PORTSDIR}/emulators/wine
>+.else
>+RUN_DEPENDS+=	i386-wine>0:${PORTSDIR}/emulators/i386-wine
>+.endif
>+
> post-patch:
>-	@${REINPLACE_CMD} 's|/etc/${PORTNAME}|${PREFIX}/etc/${PORTNAME}|g' \
>-		${WRKSRC}/src/preferences.py
>-	@${GREP} -lr '^#!/bin/bash' ${WRKDIR} | ${XARGS} \
>-		${REINPLACE_CMD} 's|^#!/bin/bash|#!${LOCALBASE}/bin/bash|'
>+	@${REINPLACE_CMD} -e \
>+		's|"/etc/wine-doors|"${ETCDIR}|' ${WRKSRC}/src/preferences.py
>+	@${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} \
>+		${REINPLACE_CMD} -e \
>+		's|^#!/bin/bash|#!${LOCALBASE}/bin/bash|'
> 
> do-install:
>-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
>-	${INSTALL_DATA} ${WRKDIR}/preferences.xml ${PREFIX}/etc/${PORTNAME}
>-	${PYTHON_CMD} ${WRKSRC}/setup.py install --prefix=${PREFIX}
>+	@${MKDIR} ${STAGEDIR}${ETCDIR}
>+	(cd ${WRKDIR} && ${INSTALL_DATA} preferences.xml \
>+		${STAGEDIR}${ETCDIR})
>+	(cd ${WRKSRC}/dist && ${INSTALL_DATA} wine-doors.desktop \
>+		${STAGEDIR}${PREFIX}/share/applications)
>+	@${MKDIR} ${STAGEDIR}${DATADIR}
>+.for i in dtd pixmaps registry src
>+	@${TAR} -C ${WRKSRC} --exclude "*.bak" -cf - ${i} | \
>+		${TAR} -C ${STAGEDIR}${DATADIR} --unlink -xf -
>+.endfor
>+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
>+		-d ${DATADIR} -f ${DATADIR_REL})
>+	@${LN} -sf ${DATADIR}/src/winedoors.py \
>+		${STAGEDIR}${PREFIX}/bin/wine-doors
>+	@${LN} -sf ${DATADIR}/pixmaps/wine-doors.png \
>+		${STAGEDIR}${PREFIX}/share/pixmaps/wine-doors.png
>+	@${LN} -sf ${DATADIR}/pixmaps/wine-doors.svg \
>+		${STAGEDIR}${PREFIX}/share/pixmaps/wine-doors.svg
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/emulators/wine-doors/distinfo emulators/wine-doors/distinfo
>--- /usr/ports/emulators/wine-doors/distinfo	2014-06-21 17:48:07.000000000 +0900
>+++ emulators/wine-doors/distinfo	2014-08-27 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (wine-doors-0.1.2.tar.gz) = 7ec60e8e7eaa91a92f172b81c76a6e0ec23e4b1e60c1af866e735e10285269af
>-SIZE (wine-doors-0.1.2.tar.gz) = 267430
>+SHA256 (wine-doors-src-0.1.3.tar.gz) = e5214d86afbd95d0cb4a7b07c2bd60ed39595f0310d506f4519cff80b8a54ab5
>+SIZE (wine-doors-src-0.1.3.tar.gz) = 24361309
>diff -urN /usr/ports/emulators/wine-doors/files/patch-setup.py emulators/wine-doors/files/patch-setup.py
>--- /usr/ports/emulators/wine-doors/files/patch-setup.py	2014-06-21 17:48:07.000000000 +0900
>+++ emulators/wine-doors/files/patch-setup.py	1970-01-01 09:00:00.000000000 +0900
>@@ -1,48 +0,0 @@
>---- setup.py.orig	Mon Feb 18 18:49:23 2008
>-+++ setup.py	Mon Feb 18 19:08:38 2008
>-@@ -75,24 +75,18 @@
>-     if os.getuid() == 0:
>-         sysinstall = True
>- 
>--    if sysinstall:
>--        if not install_root:
>--            install_root = "/"
>--        if not prefix:
>--            prefix = install_root + "usr/"
>--        bin_path = prefix + "bin/"
>--        data_path = prefix + "share/"
>--        conf_path = install_root + "etc/" + wine_doors + "/"
>--        winedoors_path = data_path + wine_doors + "/"
>--        real_winedoors_path = "/usr/share/"+wine_doors+"/"
>--    else:
>--        install_root = os.path.expanduser( "~/")
>--        prefix = os.path.expanduser( "~/.local" )
>--        bin_path = install_root + "bin/"
>--        data_path = prefix + "share/"
>--        conf_path = os.getenv('WINEPREFIX', install_root + ".wine") + "/wine-doors"
>--        winedoors_path = data_path + wine_doors + "/"
>--        real_winedoors_path = winedoors_path
>-+    if prefix == None:
>-+        print "You must provide a --prefix"
>-+        sys.exit(1)
>-+
>-+    if not prefix.endswith("/"):
>-+        prefix = prefix + "/"
>-+
>-+    bin_path = prefix + "bin/"
>-+    data_path = prefix + "share/"
>-+    conf_path = prefix + "etc/" + wine_doors + "/"
>-+    winedoors_path = data_path + wine_doors + "/"
>-+    real_winedoors_path = winedoors_path
>- 
>-     if command in ("install", "uninstall"):
>-         from preferences import preferences
>-@@ -208,7 +202,7 @@
>-         # Fix perms
>-         if sysinstall:
>-             print "Setting permissions"
>--            os.system( "chmod og+r -R "+winedoors_path )
>-+            os.system( "chmod -R og+r "+winedoors_path )
>-         
>-         # Write preferences.xml
>-         print "Creating initial preferences"
>diff -urN /usr/ports/emulators/wine-doors/pkg-descr emulators/wine-doors/pkg-descr
>--- /usr/ports/emulators/wine-doors/pkg-descr	2014-06-21 17:48:07.000000000 +0900
>+++ emulators/wine-doors/pkg-descr	2014-08-27 00:00:00.000000000 +0900
>@@ -1,7 +1,7 @@
>-Wine-doors is an application designed to make installing windows software on
>-Linux, Solaris or other Unix systems easier. Wine-doors is essentially a
>-package management tool for windows software on Linux systems. Most Linux
>-desktop users are familiar with package management style application delivery,
>-so it made sense to apply this model to windows software.
>+Wine-doors is an application designed to make installing windows
>+software on Unix systems easier. Wine-doors is essentially a package
>+management tool for windows software on Unix systems. Most Unix
>+desktop users are familiar with package management style application
>+delivery, so it made sense to apply this model to windows software.
> 
>-WWW: http://www.wine-doors.org/
>+WWW: http://sourceforge.net/projects/winedoors/
>diff -urN /usr/ports/emulators/wine-doors/pkg-plist emulators/wine-doors/pkg-plist
>--- /usr/ports/emulators/wine-doors/pkg-plist	2014-06-21 17:48:07.000000000 +0900
>+++ emulators/wine-doors/pkg-plist	2014-08-27 00:00:00.000000000 +0900
>@@ -1,17 +1,40 @@
> bin/wine-doors
>-etc/wine-doors/preferences.xml
>-@dirrm etc/wine-doors
>+%%ETCDIR%%/preferences.xml
> share/applications/wine-doors.desktop
> share/pixmaps/wine-doors.png
> share/pixmaps/wine-doors.svg
> %%DATADIR%%/dtd/applicationpack.dtd
>-%%DATADIR%%/dtd/packlist.dtd
> %%DATADIR%%/dtd/config.dtd
>-@dirrm %%DATADIR%%/dtd
>+%%DATADIR%%/dtd/packlist.dtd
>+%%DATADIR%%/pixmaps/ahk.png
>+%%DATADIR%%/pixmaps/ahk.svg
>+%%DATADIR%%/pixmaps/cdex.png
> %%DATADIR%%/pixmaps/cedega.svg
>+%%DATADIR%%/pixmaps/cod.png
>+%%DATADIR%%/pixmaps/cod.svg
> %%DATADIR%%/pixmaps/crossover.svg
>+%%DATADIR%%/pixmaps/directx.png
>+%%DATADIR%%/pixmaps/directx.svg
>+%%DATADIR%%/pixmaps/dreamweaver.svg
>+%%DATADIR%%/pixmaps/eudora.png
>+%%DATADIR%%/pixmaps/firefox.png
>+%%DATADIR%%/pixmaps/firefox.svg
>+%%DATADIR%%/pixmaps/flash.svg
>+%%DATADIR%%/pixmaps/font.png
>+%%DATADIR%%/pixmaps/gecko.png
>+%%DATADIR%%/pixmaps/gecko.svg
>+%%DATADIR%%/pixmaps/ie.png
>+%%DATADIR%%/pixmaps/ie.svg
> %%DATADIR%%/pixmaps/installed.png
> %%DATADIR%%/pixmaps/installed.svg
>+%%DATADIR%%/pixmaps/microsoft-library.svg
>+%%DATADIR%%/pixmaps/mozcontrol.png
>+%%DATADIR%%/pixmaps/mozcontrol.svg
>+%%DATADIR%%/pixmaps/ms-library.png
>+%%DATADIR%%/pixmaps/opera.png
>+%%DATADIR%%/pixmaps/prey.png
>+%%DATADIR%%/pixmaps/prey.svg
>+%%DATADIR%%/pixmaps/quicktime.svg
> %%DATADIR%%/pixmaps/rating.bronze.svg
> %%DATADIR%%/pixmaps/rating.garbage.svg
> %%DATADIR%%/pixmaps/rating.gold.png
>@@ -19,6 +42,9 @@
> %%DATADIR%%/pixmaps/rating.platinum.png
> %%DATADIR%%/pixmaps/rating.platinum.svg
> %%DATADIR%%/pixmaps/rating.silver.svg
>+%%DATADIR%%/pixmaps/roguespear.png
>+%%DATADIR%%/pixmaps/roguespear.svg
>+%%DATADIR%%/pixmaps/tc.png
> %%DATADIR%%/pixmaps/throbber.0.png
> %%DATADIR%%/pixmaps/throbber.0.svg
> %%DATADIR%%/pixmaps/throbber.1.png
>@@ -44,7 +70,10 @@
> %%DATADIR%%/pixmaps/throbber.9.png
> %%DATADIR%%/pixmaps/throbber.9.svg
> %%DATADIR%%/pixmaps/upgrade.svg
>+%%DATADIR%%/pixmaps/winamp.png
>+%%DATADIR%%/pixmaps/winamp.svg
> %%DATADIR%%/pixmaps/windows-logo.svg
>+%%DATADIR%%/pixmaps/wine-doors-0.0.9.svg
> %%DATADIR%%/pixmaps/wine-doors-0.1.svg
> %%DATADIR%%/pixmaps/wine-doors-header.svg
> %%DATADIR%%/pixmaps/wine-doors.128.png
>@@ -54,7 +83,10 @@
> %%DATADIR%%/pixmaps/wine-doors16.gif
> %%DATADIR%%/pixmaps/wine-doors16.png
> %%DATADIR%%/pixmaps/wine-doors16.xpm
>-@dirrm %%DATADIR%%/pixmaps
>+%%DATADIR%%/pixmaps/wmp.png
>+%%DATADIR%%/pixmaps/wmp.svg
>+%%DATADIR%%/pixmaps/wow.png
>+%%DATADIR%%/pixmaps/wow.svg
> %%DATADIR%%/registry/audio-alsa.reg
> %%DATADIR%%/registry/audio-oss.reg
> %%DATADIR%%/registry/fakeie6.reg
>@@ -62,36 +94,44 @@
> %%DATADIR%%/registry/winver-win2k.reg
> %%DATADIR%%/registry/winver-win98.reg
> %%DATADIR%%/registry/winver-winxp.reg
>-@dirrm %%DATADIR%%/registry
>-%%DATADIR%%/src/antivirus.py
> %%DATADIR%%/src/application.py
>+%%DATADIR%%/src/application.pyc
> %%DATADIR%%/src/autorun.py
>+%%DATADIR%%/src/autorun.pyc
> %%DATADIR%%/src/build-repos.sh
>-%%DATADIR%%/src/build-repos.sh.bak
> %%DATADIR%%/src/cedega.svg
> %%DATADIR%%/src/const.py
>-%%DATADIR%%/src/create-packs.sh
>-%%DATADIR%%/src/create-packs.sh.bak
>+%%DATADIR%%/src/const.pyc
> %%DATADIR%%/src/crossover.svg
> %%DATADIR%%/src/ctile.py
>+%%DATADIR%%/src/ctile.pyc
> %%DATADIR%%/src/log.py
>+%%DATADIR%%/src/log.pyc
> %%DATADIR%%/src/packlist.py
>+%%DATADIR%%/src/packlist.pyc
> %%DATADIR%%/src/preferences.py
>-%%DATADIR%%/src/preferences.py.bak
> %%DATADIR%%/src/preferences.pyc
> %%DATADIR%%/src/queue.py
>-%%DATADIR%%/src/setdefaultxkbmap.sh
>-%%DATADIR%%/src/setdefaultxkbmap.sh.bak
>+%%DATADIR%%/src/queue.pyc
> %%DATADIR%%/src/ui.py
>+%%DATADIR%%/src/ui.pyc
> %%DATADIR%%/src/utils.py
>+%%DATADIR%%/src/utils.pyc
> %%DATADIR%%/src/wine-doors.128.png
> %%DATADIR%%/src/wine-doors.png
> %%DATADIR%%/src/wine-doors16.png
> %%DATADIR%%/src/wine.py
>+%%DATADIR%%/src/wine.pyc
> %%DATADIR%%/src/winedoors-header.png
> %%DATADIR%%/src/winedoors.glade
> %%DATADIR%%/src/winedoors.gladep
> %%DATADIR%%/src/winedoors.py
>+%%DATADIR%%/src/winedoors.pyc
> %%DATADIR%%/src/wtparser.py
>+%%DATADIR%%/src/wtparser.pyc
> @dirrm %%DATADIR%%/src
>+@dirrm %%DATADIR%%/registry
>+@dirrm %%DATADIR%%/pixmaps
>+@dirrm %%DATADIR%%/dtd
> @dirrm %%DATADIR%%
>+@dirrm %%ETCDIR%%

Actions: View | Diff

Attachments on bug 193032: 146330