Date: Tue, 30 Oct 2012 16:30:00 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/172141: [PATCH] deskutils/q4wine: update to 0.121, OptionsNG, check for Wine on !i386 Message-ID: <201210301630.q9UGU0cG004476@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/172141; it has been noted by GNATS.
From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/172141: [PATCH] deskutils/q4wine: update to 0.121,
OptionsNG, check for Wine on !i386
Date: Tue, 30 Oct 2012 17:29:05 +0100
--MP_/noJM6sSN6o7Y.O4rYcYR7.E
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Added as for emulators/swine
Makefile:
ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == "i386"
RUN_DEPENDS+= wine:${PORTSDIR}/emulators/wine-devel
.endif
pkg-message:
FreeBSD/amd64 users:
You need to manually install Wine 32bit binary from:
http://www.mediafire.com/wine_fbsd64
For more info about running wine on FreeBSD please see:
http://wiki.freebsd.org/Wine
--MP_/noJM6sSN6o7Y.O4rYcYR7.E
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=q4wine.diff
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/Makefile ./Makefile
--- /usr/ports/deskutils/q4wine/Makefile 2012-06-06 08:43:27.000000000 +0200
+++ ./Makefile 2012-10-30 17:11:27.000000000 +0100
@@ -5,43 +5,50 @@
# $FreeBSD: ports/deskutils/q4wine/Makefile,v 1.12 2012/06/06 06:43:27 miwi Exp $
PORTNAME= q4wine
-PORTVERSION= 0.120
-PORTREVISION= 1
+PORTVERSION= 0.121
CATEGORIES= deskutils emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= sergey.dyatko@gmail.com
COMMENT= QT4 front-end for WINE
+LICENSE= GPLv3
+
BUILD_DEPENDS= icotool:${PORTSDIR}/graphics/icoutils
RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo \
- wine:${PORTSDIR}/emulators/wine \
wget:${PORTSDIR}/ftp/wget \
cabextract:${PORTSDIR}/archivers/cabextract \
icotool:${PORTSDIR}/graphics/icoutils
+USE_CMAKE= yes
+CMAKE_ARGS+= -DMANPAGE_ENTRY_PATH=${MANPREFIX}/man/
+USE_LDCONFIG= yes
USE_QT4= qmake_build rcc_build moc_build uic_build \
linguist_build corelib gui sql network
-
-ONLY_FOR_ARCHS= i386
-ONLY_FOR_ARCHS_REASON= depends on wine which is only available for i386
+ONLY_FOR_ARCHS= i386 amd64
MAN1= q4wine-cli.1 q4wine-helper.1 q4wine.1
-USE_CMAKE= yes
-CMAKE_ARGS+= -DMANPAGE_ENTRY_PATH=${MANPREFIX}/man/
-
-OPTIONS= DBUS "Enable DBus notification support" on
+OPTIONS_DEFINE= DBUS
+OPTIONS_DEFAULT=DBUS
.include <bsd.port.options.mk>
-.if defined(WITHOUT_DBUS)
-CMAKE_ARGS+= -DWITH_DBUS:BOOL=OFF
-.else
+.if ${ARCH} == "i386"
+RUN_DEPENDS+= wine:${PORTSDIR}/emulators/wine-devel
+.endif
+
+.if ${PORT_OPTIONS:MDBUS}
USE_QT4+= dbus
+.else
+CMAKE_ARGS+= -DWITH_DBUS:BOOL=OFF
.endif
post-install:
@-update-desktop-database
+ @${ECHO_CMD}
+ @${CAT} ${PKGMESSAGE}
+ @${ECHO_CMD}
+
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/distinfo ./distinfo
--- /usr/ports/deskutils/q4wine/distinfo 2011-03-20 13:48:39.000000000 +0100
+++ ./distinfo 2012-10-30 17:10:40.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (q4wine-0.120.tar.gz) = 9db9cc021722403709e6f2bb81318e285cfad9eba24d1343532b0fa32f823996
-SIZE (q4wine-0.120.tar.gz) = 836328
+SHA256 (q4wine-0.121.tar.gz) = 3d4905132e44cfdb13e2f297efae6750dabb7240a3df2d1863ad4bade9cd7b3b
+SIZE (q4wine-0.121.tar.gz) = 884771
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/pkg-message ./pkg-message
--- /usr/ports/deskutils/q4wine/pkg-message 2010-10-29 00:24:57.000000000 +0200
+++ ./pkg-message 2012-10-30 17:25:09.000000000 +0100
@@ -1,8 +1,15 @@
################################################################################
-This programm will attempt to obtain some system information by accessing files
-in procfs. You must mount procfs filesystem for this to work correctly. This can
-be accomplished by adding the following line to your /etc/fstab file:
+FreeBSD/amd64 users:
+You need to manually install Wine 32bit binary from:
+http://www.mediafire.com/wine_fbsd64
+
+For more info about running wine on FreeBSD please see:
+http://wiki.freebsd.org/Wine
+
+This program will attempt to obtain some system information by accessing files
+in procfs. You must mount procfs filesystem for this to work correctly.
+This can be accomplished by adding the following line to your /etc/fstab file:
# Device Mountpoint FStype Options Dump Pass#
proc /proc procfs rw 0 0
@@ -11,7 +18,7 @@
mount /proc
-Also you need passwordless sudo for mdconfig, mount_cd9660, umount commands for
+Also you need passwordless sudo for mdconfig, mount_cd9660, umount commands for
work with ISO images
################################################################################
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/pkg-plist ./pkg-plist
--- /usr/ports/deskutils/q4wine/pkg-plist 2010-10-29 00:24:57.000000000 +0200
+++ ./pkg-plist 2012-09-26 13:34:54.000000000 +0200
@@ -5,9 +5,12 @@
share/applications/q4wine.desktop
share/pixmaps/q4wine.png
%%DATADIR%%/i18n/cs_cz.qm
+%%DATADIR%%/i18n/de_de.qm
%%DATADIR%%/i18n/en_us.qm
%%DATADIR%%/i18n/es_es.qm
+%%DATADIR%%/i18n/he_il.qm
%%DATADIR%%/i18n/it_it.qm
+%%DATADIR%%/i18n/pl_pl.qm
%%DATADIR%%/i18n/pt_br.qm
%%DATADIR%%/i18n/ru_ru.qm
%%DATADIR%%/i18n/uk_ua.qm
===> Done
--MP_/noJM6sSN6o7Y.O4rYcYR7.E--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210301630.q9UGU0cG004476>