ports/172141: [PATCH] deskutils/q4wine: update to 0.121, OptionsNG, check for Wine on !i386
nemysis
nemysis at gmx.ch
Tue Oct 2 09:10:07 UTC 2012
The following reply was made to PR ports/172141; it has been noted by GNATS.
From: nemysis <nemysis at gmx.ch>
To: "Sergey V. Dyatko" <tiger at agava.com>, bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/172141: [PATCH] deskutils/q4wine: update to 0.121,
OptionsNG, check for Wine on !i386
Date: Tue, 2 Oct 2012 11:06:23 +0200
--MP_/d1yI5KDoBgavNvE/MVHdIiy
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
On Tue, 2 Oct 2012 11:17:58 +0300
"Sergey V. Dyatko" <tiger at agava.com> wrote:
> Hi,
>
> Ok.
> Well, feel free to commit it
>
Hi
Yes thanks.
But pkg-message should be in Port self not as in files/pkg-message.in
Sorry for Mistake.
Here is new shar.
--MP_/d1yI5KDoBgavNvE/MVHdIiy
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-02 11:01:03.000000000 +0200
@@ -5,43 +5,62 @@
# $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 at 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 \
+ wine:${PORTSDIR}/emulators/wine-devel \
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
-
MAN1= q4wine-cli.1 q4wine-helper.1 q4wine.1
-USE_CMAKE= yes
-CMAKE_ARGS+= -DMANPAGE_ENTRY_PATH=${MANPREFIX}/man/
+OPTIONS_DEFINE= DBUS
-OPTIONS= DBUS "Enable DBus notification support" on
+OPTIONS_DEFAULT= DBUS
.include <bsd.port.options.mk>
-.if defined(WITHOUT_DBUS)
-CMAKE_ARGS+= -DWITH_DBUS:BOOL=OFF
-.else
+.if ${PORT_OPTIONS:MDBUS}
USE_QT4+= dbus
+.else
+CMAKE_ARGS+= -DWITH_DBUS:BOOL=OFF
+.endif
+
+pre-build:
+.if !exists(${LOCALBASE}/bin/wine) && ${ARCH} != "i386"
+ @${ECHO_MSG}
+ @${ECHO_MSG} "Depends on Wine Port which is only available for i386"
+ @${ECHO_MSG}
+ @${ECHO_MSG} " http://wiki.freebsd.org/Wine"
+ @${ECHO_MSG}
+ @${ECHO_MSG} "FreeBSD/amd64 works with Wine 32bit binary from"
+ @${ECHO_MSG}
+ @${ECHO_MSG} " http://www.mediafire.com/wine_fbsd64"
+ @${ECHO_MSG}
+ exit 1
.endif
post-install:
@-update-desktop-database
+# pkg-message
+ @${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-09-26 13:18:37.000000000 +0200
@@ -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-09-28 12:02:56.000000000 +0200
@@ -1,8 +1,8 @@
################################################################################
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:
+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 +11,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
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/q4wine/Makefile ./q4wine/Makefile
--- /usr/ports/deskutils/q4wine/q4wine/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ ./q4wine/Makefile 2012-10-02 10:54:42.000000000 +0200
@@ -0,0 +1,68 @@
+# New ports collection makefile for: q4wine
+# Date created: 05 Feb 2009
+# Whom: Sergey V. Dyatko <sergey.dyatko at gmail.com>
+#
+# $FreeBSD: ports/deskutils/q4wine/Makefile,v 1.12 2012/06/06 06:43:27 miwi Exp $
+
+PORTNAME= q4wine
+PORTVERSION= 0.121
+CATEGORIES= deskutils emulators
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
+
+MAINTAINER= sergey.dyatko at 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-devel \
+ 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
+
+MAN1= q4wine-cli.1 q4wine-helper.1 q4wine.1
+
+#SUB_FILES= pkg-message
+
+OPTIONS_DEFINE= DBUS
+
+OPTIONS_DEFAULT= DBUS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDBUS}
+USE_QT4+= dbus
+.else
+CMAKE_ARGS+= -DWITH_DBUS:BOOL=OFF
+.endif
+
+pre-build:
+.if !exists(${LOCALBASE}/bin/wine) && ${ARCH} != "i386"
+ @${ECHO_MSG}
+ @${ECHO_MSG} "Depends on Wine Port which is only available for i386"
+ @${ECHO_MSG}
+ @${ECHO_MSG} " http://wiki.freebsd.org/Wine"
+ @${ECHO_MSG}
+ @${ECHO_MSG} "FreeBSD/amd64 works with Wine 32bit binary from"
+ @${ECHO_MSG}
+ @${ECHO_MSG} " http://www.mediafire.com/wine_fbsd64"
+ @${ECHO_MSG}
+ exit 1
+.endif
+
+post-install:
+ @-update-desktop-database
+
+# pkg-message
+ @${ECHO_CMD}
+ @${CAT} ${PKGMESSAGE}
+ @${ECHO_CMD}
+
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/q4wine/distinfo ./q4wine/distinfo
--- /usr/ports/deskutils/q4wine/q4wine/distinfo 1970-01-01 01:00:00.000000000 +0100
+++ ./q4wine/distinfo 2012-09-26 13:18:37.000000000 +0200
@@ -0,0 +1,2 @@
+SHA256 (q4wine-0.121.tar.gz) = 3d4905132e44cfdb13e2f297efae6750dabb7240a3df2d1863ad4bade9cd7b3b
+SIZE (q4wine-0.121.tar.gz) = 884771
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/q4wine/pkg-descr ./q4wine/pkg-descr
--- /usr/ports/deskutils/q4wine/q4wine/pkg-descr 1970-01-01 01:00:00.000000000 +0100
+++ ./q4wine/pkg-descr 2010-10-29 00:24:57.000000000 +0200
@@ -0,0 +1,16 @@
+Q4wine is an Qt4 (http://www.qtsoftware.com/) GUI for wine (http://winehq.org/).
+It will help you to manage wine prefixes and installed applications.
+
+General features:
+ - Exports QT color theme into wine colors settings
+ - Works with different wine versions at same time
+ - Creates, deletes and manages prefixes (WINEPREFIX)
+ - Easy controlling wine process
+ - Autostart icons support
+ - Easy CD image usage
+ - Supports extraction of icons from PE files (.exe, .dll)
+ - Easy backup and restore for managed prefixes
+ - Winetricks support
+ - More
+
+WWW: http://q4wine.brezblock.org.ua/
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/q4wine/pkg-message ./q4wine/pkg-message
--- /usr/ports/deskutils/q4wine/q4wine/pkg-message 1970-01-01 01:00:00.000000000 +0100
+++ ./q4wine/pkg-message 2012-09-28 12:02:56.000000000 +0200
@@ -0,0 +1,17 @@
+################################################################################
+
+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:
+
+# Device Mountpoint FStype Options Dump Pass#
+proc /proc procfs rw 0 0
+
+and then, as root, executing the command:
+
+mount /proc
+
+Also you need passwordless sudo for mdconfig, mount_cd9660, umount commands for
+work with ISO images
+
+################################################################################
diff -ruN --exclude=CVS /usr/ports/deskutils/q4wine/q4wine/pkg-plist ./q4wine/pkg-plist
--- /usr/ports/deskutils/q4wine/q4wine/pkg-plist 1970-01-01 01:00:00.000000000 +0100
+++ ./q4wine/pkg-plist 2012-09-26 13:34:54.000000000 +0200
@@ -0,0 +1,52 @@
+bin/q4wine
+bin/q4wine-cli
+bin/q4wine-helper
+lib/q4wine/libq4wine-core.so
+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
+%%DATADIR%%/icons/eject.png
+%%DATADIR%%/icons/exec_wine.png
+%%DATADIR%%/icons/explorer.png
+%%DATADIR%%/icons/notepad.png
+%%DATADIR%%/icons/regedit.png
+%%DATADIR%%/icons/uninstaller.png
+%%DATADIR%%/icons/winecfg.png
+%%DATADIR%%/icons/wineconsole.png
+%%DATADIR%%/scripts/mount_image.sh
+%%DATADIR%%/scripts/umount.sh
+%%DATADIR%%/theme/nuvola/data/configure.png
+%%DATADIR%%/theme/nuvola/data/down.png
+%%DATADIR%%/theme/nuvola/data/edit.png
+%%DATADIR%%/theme/nuvola/data/exec.png
+%%DATADIR%%/theme/nuvola/data/exec_wine.png
+%%DATADIR%%/theme/nuvola/data/exit.png
+%%DATADIR%%/theme/nuvola/data/folder.png
+%%DATADIR%%/theme/nuvola/data/folder_open.png
+%%DATADIR%%/theme/nuvola/data/kill.png
+%%DATADIR%%/theme/nuvola/data/power.png
+%%DATADIR%%/theme/nuvola/data/prefix.png
+%%DATADIR%%/theme/nuvola/data/rebuild.png
+%%DATADIR%%/theme/nuvola/data/reload.png
+%%DATADIR%%/theme/nuvola/data/stop.png
+%%DATADIR%%/theme/nuvola/data/up.png
+%%DATADIR%%/theme/nuvola/data/wine.png
+%%DATADIR%%/theme/nuvola/data/wizard.png
+ at dirrm %%DATADIR%%/theme/nuvola/data
+ at dirrm %%DATADIR%%/theme/nuvola
+ at dirrm %%DATADIR%%/theme
+ at dirrm %%DATADIR%%/scripts
+ at dirrm %%DATADIR%%/icons
+ at dirrm %%DATADIR%%/i18n
+ at dirrm %%DATADIR%%
+ at dirrmtry share/applications
+ at dirrm lib/q4wine
===> Done
--MP_/d1yI5KDoBgavNvE/MVHdIiy--
More information about the freebsd-ports-bugs
mailing list