ports/172141: [PATCH] deskutils/q4wine: update to 0.121, OptionsNG, check for Wine on !i386

Fri Sep 28 11:30:05 UTC 2012

>Number:         172141
>Category:       ports
>Synopsis:       [PATCH] deskutils/q4wine: update to 0.121, OptionsNG, check for Wine on !i386
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 28 11:30:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed

+LICENSE=	GPLv3

+		wine:${PORTSDIR}/emulators/wine-devel \

OptionsNG

+SUB_FILES=	pkg-message

+pre-build:
+.if !exists(${LOCALBASE}/bin/wine) && ${ARCH} != "i386"

- Update to 0.121

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Port maintainer (sergey.dyatko at gmail.com) is cc'd.

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
0 fatal errors and 1 warning found.


Build log RedPorts

https://redports.org/buildarchive/20120928102716-23012/

>Fix:

--- q4wine-0.121.patch begins here ---
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-09-28 12:34:28.000000000 +0200
@@ -5,43 +5,64 @@
 # $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/
+SUB_FILES=	pkg-message
+
+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/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/deskutils/q4wine/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-message.in	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/pkg-message ./pkg-message
--- /usr/ports/deskutils/q4wine/pkg-message	2010-10-29 00:24:57.000000000 +0200
+++ ./pkg-message	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-################################################################################
-
-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/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
--- q4wine-0.121.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

