- Update to 1.1

- Change CATEGORIES deskutils to emulators
- Adjust patches
- Change pkg-message

Approved by:	pawel (mentor)

12 files changed, 28 insertions, 29 deletions

diff --git a/MOVED b/MOVED
index e2255c7cc26e..ebf5dda4c9c3 100644
--- a/MOVED
+++ b/MOVED
@@ -5265,3 +5265,4 @@ sysutils/rsyslog6-mysql||2013-11-25|Has expired: Use sysutils/rsyslog7
 sysutils/rsyslog6-dbi||2013-11-25|Has expired: Use sysutils/rsyslog7
 www/trac-gitplugin||2013-11-25|Removed: this plugin has been included in the Trac 1.0 distribution
 audio/mpc|audio/musicpc|2013-11-19|Renamed to avoid conflict with math/mpc
+deskutils/q4wine|emulators/q4wine|2013-11-26|Move to better category
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 27d3b8f1a8f4..05ca5b4f3609 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -202,7 +202,6 @@
     SUBDIR += py-vobject
     SUBDIR += pybookreader
     SUBDIR += pypanel
-    SUBDIR += q4wine
     SUBDIR += qlabels
     SUBDIR += qorganizer
     SUBDIR += qrfcview
diff --git a/deskutils/q4wine/distinfo b/deskutils/q4wine/distinfo
deleted file mode 100644
index d5418fd16cf2..000000000000
--- a/deskutils/q4wine/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (q4wine-1.0-r3.tar.gz) = c23c0dfa30fec67794663cd000100da5633a286c55c86dbdc1c49984d0e72fc9
-SIZE (q4wine-1.0-r3.tar.gz) = 1105792
diff --git a/deskutils/q4wine/files/patch-src__q4wine-gui__process.h b/deskutils/q4wine/files/patch-src__q4wine-gui__process.h
deleted file mode 100644
index 8b937ff674fd..000000000000
--- a/deskutils/q4wine/files/patch-src__q4wine-gui__process.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/q4wine-gui/process.h.orig	2013-05-02 22:38:39.000000000 +0200
-+++ ./src/q4wine-gui/process.h	2013-10-29 00:24:57.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <QLibrary>
- #include <QTextCodec>
- #include <QTextStream>
-+#include <locale.h>
- 
- #ifdef DEBUG
- #include <QDebug>
diff --git a/deskutils/q4wine/files/patch-src__q4wine-lib__q4wine-lib.h b/deskutils/q4wine/files/patch-src__q4wine-lib__q4wine-lib.h
deleted file mode 100644
index 8afe5e6c352e..000000000000
--- a/deskutils/q4wine/files/patch-src__q4wine-lib__q4wine-lib.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/q4wine-lib/q4wine-lib.h.orig	2013-05-02 22:38:39.000000000 +0200
-+++ ./src/q4wine-lib/q4wine-lib.h	2013-10-29 00:21:12.000000000 +0100
-@@ -47,6 +47,7 @@
- #include <QDesktopServices>
- #include <QUrl>
- #include <QTranslator>
-+#include <locale.h>
- 
- #include "process.h"
- 
diff --git a/emulators/Makefile b/emulators/Makefile
index 9536e8f8aada..f749b25c6a28 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -129,6 +129,7 @@
     SUBDIR += prodosemu
     SUBDIR += psim-freebsd
     SUBDIR += pyxmame
+    SUBDIR += q4wine
     SUBDIR += qemu
     SUBDIR += qemu-devel
     SUBDIR += qemu-launcher
diff --git a/deskutils/q4wine/Makefile b/emulators/q4wine/Makefile
index aa2a73a1136d..598dea47eb18 100644
--- a/deskutils/q4wine/Makefile
+++ b/emulators/q4wine/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	q4wine
-PORTVERSION=	1.0r3
-CATEGORIES=	deskutils emulators
+PORTVERSION=	1.1
+CATEGORIES=	emulators deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20$${PORTVERSION:S/r/-r/}/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-r/}
 
@@ -35,6 +35,7 @@ OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
+
 DBUS_CMAKE_ON=		-DWITH_DBUS:BOOL=ON
 DBUS_CMAKE_OFF=		-DWITH_DBUS:BOOL=OFF
 
diff --git a/emulators/q4wine/distinfo b/emulators/q4wine/distinfo
new file mode 100644
index 000000000000..9f122f733482
--- /dev/null
+++ b/emulators/q4wine/distinfo
@@ -0,0 +1,2 @@
+SHA256 (q4wine-1.1.tar.gz) = 2a08d9283ba861bb53e5ad3bfb1fc9d052af77006b89512fc04bdfe42c2eb210
+SIZE (q4wine-1.1.tar.gz) = 1113549
diff --git a/emulators/q4wine/files/patch-src__q4wine-gui__process.h b/emulators/q4wine/files/patch-src__q4wine-gui__process.h
new file mode 100644
index 000000000000..1ac0566742e8
--- /dev/null
+++ b/emulators/q4wine/files/patch-src__q4wine-gui__process.h
@@ -0,0 +1,10 @@
+--- ./src/q4wine-gui/process.h.orig	2013-11-10 13:35:22.000000000 +0100
++++ ./src/q4wine-gui/process.h	2013-11-14 00:37:10.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include <QLibrary>
+ #include <QTextCodec>
+ #include <QTextStream>
++#include <locale.h>
+ 
+ #ifdef DEBUG
+ #include <QDebug>
diff --git a/deskutils/q4wine/pkg-descr b/emulators/q4wine/pkg-descr
index 235d5e71aecf..235d5e71aecf 100644
--- a/deskutils/q4wine/pkg-descr
+++ b/emulators/q4wine/pkg-descr
diff --git a/deskutils/q4wine/pkg-message b/emulators/q4wine/pkg-message
index d169ca88cdc8..c74bb837a121 100644
--- a/deskutils/q4wine/pkg-message
+++ b/emulators/q4wine/pkg-message
@@ -1,12 +1,19 @@
 ################################################################################
 
-FreeBSD/amd64 users:
-You need to manually install Wine 32bit binary from:
-http://www.mediafire.com/wine_fbsd64
+Q4Wine has been installed.
+
 
 For more info about running wine on FreeBSD please see:
+
 http://wiki.freebsd.org/Wine
 
+
+FreeBSD/amd64 users:
+You need to manually install Wine 32bit binary from:
+
+https://wiki.freebsd.org/i386-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:
@@ -19,6 +26,6 @@ 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
+work with ISO images.
 
 ################################################################################
diff --git a/deskutils/q4wine/pkg-plist b/emulators/q4wine/pkg-plist
index 49e98801157c..49e98801157c 100644
--- a/deskutils/q4wine/pkg-plist
+++ b/emulators/q4wine/pkg-plist