ports/121082: [PATCH] Update emulators/wine-doors from 0.1 to 0.1.2
Conor McDermottroe
ports at mcdermottroe.com
Mon Feb 25 17:00:06 UTC 2008
>Number: 121082
>Category: ports
>Synopsis: [PATCH] Update emulators/wine-doors from 0.1 to 0.1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 25 17:00:05 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Conor McDermottroe
>Release: FreeBSD 6.2-RELEASE-p9 i386
>Organization:
>Environment:
>Description:
Update emulators/wine-doors from 0.1 to 0.1.2
>How-To-Repeat:
>Fix:
diff -ruN wine-doors.orig/Makefile wine-doors/Makefile
--- wine-doors.orig/Makefile Mon Feb 18 17:30:56 2008
+++ wine-doors/Makefile Mon Feb 18 19:11:29 2008
@@ -6,7 +6,7 @@
#
PORTNAME= wine-doors
-PORTVERSION= 0.1
+PORTVERSION= 0.1.2
CATEGORIES= emulators
MASTER_SITES= http://www.wine-doors.org/releases/
@@ -29,8 +29,7 @@
SUB_FILES= preferences.xml
post-patch:
- @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/setup.py
- @${REINPLACE_CMD} 's|/etc/wine-doors|${PREFIX}/etc/wine-doors|g' \
+ @${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|'
@@ -38,7 +37,7 @@
do-install:
${MKDIR} ${PREFIX}/etc/${PORTNAME}
${INSTALL_DATA} ${WRKDIR}/preferences.xml ${PREFIX}/etc/${PORTNAME}
- ${PYTHON_CMD} ${WRKSRC}/setup.py install
+ ${PYTHON_CMD} ${WRKSRC}/setup.py install --prefix=${PREFIX}
.include <bsd.port.pre.mk>
diff -ruN wine-doors.orig/distinfo wine-doors/distinfo
--- wine-doors.orig/distinfo Mon Feb 18 17:30:56 2008
+++ wine-doors/distinfo Mon Feb 18 17:41:25 2008
@@ -1,3 +1,3 @@
-MD5 (wine-doors-0.1.tar.gz) = 0f95c9b15f2d74255279d9f33488f384
-SHA256 (wine-doors-0.1.tar.gz) = ca5dcc50020804f30974ab43e711c81a269675e3794f23a51713d32ba9bfbff0
-SIZE (wine-doors-0.1.tar.gz) = 2553737
+MD5 (wine-doors-0.1.2.tar.gz) = de4af9b78210b328eebe17cff2f78b94
+SHA256 (wine-doors-0.1.2.tar.gz) = 7ec60e8e7eaa91a92f172b81c76a6e0ec23e4b1e60c1af866e735e10285269af
+SIZE (wine-doors-0.1.2.tar.gz) = 267430
diff -ruN wine-doors.orig/files/patch-setup.py wine-doors/files/patch-setup.py
--- wine-doors.orig/files/patch-setup.py Mon Feb 18 17:30:56 2008
+++ wine-doors/files/patch-setup.py Mon Feb 18 19:28:26 2008
@@ -1,44 +1,48 @@
---- setup.py.orig Fri Jul 13 20:24:48 2007
-+++ setup.py Fri Jul 13 20:29:51 2007
-@@ -89,24 +89,14 @@
- if argument.startswith( "-S" ):
- sysinstall = True
+--- 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:
-- final = prefix
-- prefix = temp + prefix
-- prefix_bin = prefix + "/usr/bin/"
-- prefix_data = prefix + "/usr/share/"
-- prefix_conf = prefix + "/etc/" + wine_doors + "/"
-- winedoors_data = prefix_data + wine_doors + "/"
--
-- final_data = final + "usr/share/wine-doors/"
-- final_conf = prefix_conf
+- 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:
-- prefix_bin = prefix + "bin/"
-- prefix_data = prefix + ".local/share/"
-- prefix_conf = prefix + ".wine/wine-doors/"
-- winedoors_data = prefix_data + wine_doors + "/"
--
-- final_data = winedoors_data
-- final_conf = prefix_conf
-+ prefix = "%%PREFIX%%/"
-+ prefix_bin = prefix + "bin/"
-+ prefix_data = prefix + "share/"
-+ prefix_conf = prefix + "etc/wine-doors/"
-+ winedoors_data = prefix_data + "wine-doors/"
-+ final = prefix
-+ final_data = winedoors_data
-+ final_conf = prefix_conf
-
+- 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
-@@ -198,7 +188,7 @@
+@@ -208,7 +202,7 @@
# Fix perms
if sysinstall:
print "Setting permissions"
-- os.system( "chmod og+r -R "+winedoors_data )
-+ os.system( "chmod -R og+r "+winedoors_data )
+- os.system( "chmod og+r -R "+winedoors_path )
++ os.system( "chmod -R og+r "+winedoors_path )
# Write preferences.xml
print "Creating initial preferences"
diff -ruN wine-doors.orig/pkg-plist wine-doors/pkg-plist
--- wine-doors.orig/pkg-plist Mon Feb 18 17:30:56 2008
+++ wine-doors/pkg-plist Mon Feb 18 19:51:59 2008
@@ -4,49 +4,14 @@
share/applications/wine-doors.desktop
share/pixmaps/wine-doors.png
share/pixmaps/wine-doors.svg
-%%DATADIR%%/base.repo/arial-1.wdi
-%%DATADIR%%/base.repo/arial_bold-1.wdi
-%%DATADIR%%/base.repo/autohotkey-1.0.46.08.wdi
-%%DATADIR%%/base.repo/comicsans-1.wdi
-%%DATADIR%%/base.repo/courier_new-1.wdi
-%%DATADIR%%/base.repo/mozcontrol-1.7.wdi
-%%DATADIR%%/base.repo/packlist.xml.gz
-%%DATADIR%%/base.repo/times_new_roman-1.wdi
-%%DATADIR%%/base.repo/vc-6.wdi
-%%DATADIR%%/base.repo/webdings-1.wdi
-%%DATADIR%%/base.repo/winegecko-0.1.wdi
- at dirrm %%DATADIR%%/base.repo
-%%DATADIR%%/pixmaps/ahk.png
-%%DATADIR%%/pixmaps/ahk.svg
-%%DATADIR%%/pixmaps/cdex.png
+%%DATADIR%%/dtd/applicationpack.dtd
+%%DATADIR%%/dtd/packlist.dtd
+%%DATADIR%%/dtd/config.dtd
+ at dirrm %%DATADIR%%/dtd
%%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/gnome-dock-design.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.png
-%%DATADIR%%/pixmaps/quicktime.svg
%%DATADIR%%/pixmaps/rating.bronze.svg
%%DATADIR%%/pixmaps/rating.garbage.svg
%%DATADIR%%/pixmaps/rating.gold.png
@@ -54,9 +19,6 @@
%%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
@@ -82,11 +44,9 @@
%%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
%%DATADIR%%/pixmaps/wine-doors.png
%%DATADIR%%/pixmaps/wine-doors.svg
@@ -94,10 +54,6 @@
%%DATADIR%%/pixmaps/wine-doors16.gif
%%DATADIR%%/pixmaps/wine-doors16.png
%%DATADIR%%/pixmaps/wine-doors16.xpm
-%%DATADIR%%/pixmaps/wmp.png
-%%DATADIR%%/pixmaps/wmp.svg
-%%DATADIR%%/pixmaps/wow.png
-%%DATADIR%%/pixmaps/wow.svg
@dirrm %%DATADIR%%/pixmaps
%%DATADIR%%/registry/audio-alsa.reg
%%DATADIR%%/registry/audio-oss.reg
@@ -107,7 +63,11 @@
%%DATADIR%%/registry/winver-win98.reg
%%DATADIR%%/registry/winver-winxp.reg
@dirrm %%DATADIR%%/registry
+%%DATADIR%%/src/antivirus.py
%%DATADIR%%/src/application.py
+%%DATADIR%%/src/autorun.py
+%%DATADIR%%/src/build-repos.sh
+%%DATADIR%%/src/build-repos.sh.bak
%%DATADIR%%/src/cedega.svg
%%DATADIR%%/src/const.py
%%DATADIR%%/src/create-packs.sh
@@ -120,9 +80,8 @@
%%DATADIR%%/src/preferences.py.bak
%%DATADIR%%/src/preferences.pyc
%%DATADIR%%/src/queue.py
-%%DATADIR%%/src/runlog
-%%DATADIR%%/src/test_import.py
-%%DATADIR%%/src/testcd.py
+%%DATADIR%%/src/setdefaultxkbmap.sh
+%%DATADIR%%/src/setdefaultxkbmap.sh.bak
%%DATADIR%%/src/ui.py
%%DATADIR%%/src/utils.py
%%DATADIR%%/src/wine-doors.128.png
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list