Bug 172141 - [PATCH] deskutils/q4wine: update to 0.121, OptionsNG, check for Wine on !i386
Summary: [PATCH] deskutils/q4wine: update to 0.121, OptionsNG, check for Wine on !i386
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rusmir Dusko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-09-28 12:30 UTC by nemysis
Modified: 2013-10-18 02:00 UTC (History)
1 user (show)

See Also:


Attachments
q4wine-0.121.patch (5.00 KB, patch)
2012-09-28 12:30 UTC, nemysis
no flags Details | Diff
q4wine.diff (10.22 KB, patch)
2012-10-02 10:06 UTC, nemysis
no flags Details | Diff
q4wine.diff (4.21 KB, patch)
2012-10-30 16:29 UTC, nemysis
no flags Details | Diff
q4wine.diff (5.91 KB, patch)
2013-03-23 19:09 UTC, nemysis
no flags Details | Diff
q4wine.diff (6.29 KB, patch)
2013-05-13 23:00 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2012-09-28 12:30:04 UTC
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@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/
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-28 12:30:12 UTC
Maintainer of deskutils/q4wine,

Please note that PR ports/172141 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/172141

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-28 12:30:16 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Sergey V. Dyatko 2012-09-28 20:13:48 UTC
Hi,

looks good

just one question: why wine-devel ?

-- 
wbr, tiger
Comment 4 nemysis 2012-09-28 23:33:59 UTC
On Fri, 28 Sep 2012 22:13:48 +0300
"Sergey V. Dyatko" <sergey.dyatko@gmail.com> wrote:

> Hi,
> 
> looks good
> 
> just one question: why wine-devel ?
> 

Why is emulators/wine old  1.4.1

and emulators/wine-devel is 1.5.13
Comment 5 tiger 2012-10-02 09:17:58 UTC
Hi,

Ok. 
Well, feel free to commit it

-- 
wbr, tiger
Comment 6 nemysis 2012-10-02 10:06:23 UTC
On Tue, 2 Oct 2012 11:17:58 +0300
"Sergey V. Dyatko" <tiger@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.
Comment 7 nemysis 2012-10-30 16:29:05 UTC
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
Comment 8 nemysis 2013-03-23 19:09:39 UTC
- Update to 1.0
- Shorten header
- Convert to OptionsNG
- Add license
- Makefile tweaks

Better is to use category emulators as SWine.

I can maintain Q4Wine if maintainer approve this.
Comment 9 Sergey V. Dyatko 2013-03-24 15:38:28 UTC
Hi,

I don't use q4wine for a long time

once there is a person who use it and wish to support it.. I have no
objection, please feel free pass maintainership to submitter

-- 
wbr, tiger
Comment 10 nemysis 2013-05-13 23:00:35 UTC
- Update to 1.0.r3
- Trim master sites
- Add license
- Add NLS Options
- Trim desktop entry
- Makefile tweaks
- Trim pkg-message
- Trim pkg-plist
- Pass maintainership to submitter

https://redports.org/buildarchive/20130513174600-48147/
Comment 11 Martin Wilke freebsd_committer freebsd_triage 2013-08-14 10:29:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

submitter is now committer.
Comment 12 Rusmir Dusko freebsd_committer freebsd_triage 2013-10-18 01:53:10 UTC
State Changed
From-To: feedback->open

Maintainer has approved.
Comment 13 dfilter service freebsd_committer freebsd_triage 2013-10-18 01:56:18 UTC
Author: nemysis
Date: Fri Oct 18 00:56:10 2013
New Revision: 330710
URL: http://svnweb.freebsd.org/changeset/ports/330710

Log:
  - Update to 1.0.r3
  - Change maintainership to submitter
  - Add license (GPLv3
  - USES cmake desktop-file-utils
  - Add DOCS and NLS Options
  - Support STAGEDIR and add OPTIONS_SUB
  - Change pkg-message
  
  PR:		ports/172141
  Submitted by:	nemysis (self)
  Approved by:	wg (mentor)

Modified:
  head/deskutils/q4wine/Makefile
  head/deskutils/q4wine/distinfo   (contents, props changed)
  head/deskutils/q4wine/pkg-message   (contents, props changed)
  head/deskutils/q4wine/pkg-plist   (contents, props changed)

Modified: head/deskutils/q4wine/Makefile
==============================================================================
--- head/deskutils/q4wine/Makefile	Fri Oct 18 00:54:25 2013	(r330709)
+++ head/deskutils/q4wine/Makefile	Fri Oct 18 00:56:10 2013	(r330710)
@@ -2,45 +2,65 @@
 # $FreeBSD$
 
 PORTNAME=	q4wine
-PORTVERSION=	0.120
-PORTREVISION=	1
+PORTVERSION=	1.0r3
 CATEGORIES=	deskutils emulators
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20$${PORTVERSION:S/r/-r/}/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-r/}
 
-MAINTAINER=	sergey.dyatko@gmail.com
+MAINTAINER=	nemysis@FreeBSD.org
 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
 
+USES=		cmake desktop-file-utils
+CMAKE_ARGS+=	-DMANPAGE_ENTRY_PATH=${MANPREFIX}/man
+USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
 USE_QT4=	qmake_build rcc_build moc_build uic_build \
 		linguist_build corelib gui sql network
+ONLY_FOR_ARCHS=	i386 amd64
 
-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
+#SUB_FILES=	pkg-message
 
-USES=		cmake
-CMAKE_ARGS+=	-DMANPAGE_ENTRY_PATH=${MANPREFIX}/man/
+PORTDOCS=	AUTHORS ChangeLog README TODO
 
-OPTIONS_DEFINE=	DBUS
+OPTIONS_DEFINE=	DOCS NLS DBUS
 OPTIONS_DEFAULT=	DBUS
 
-NO_STAGE=	yes
+OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+DBUS_CMAKE_ON=		-DWITH_DBUS:BOOL=ON
+DBUS_CMAKE_OFF=		-DWITH_DBUS:BOOL=OFF
+
 .include <bsd.port.options.mk>
 
+.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-patch:
+	@${REINPLACE_CMD} -e 's|^Categories=.*|Categories=Qt;System;Emulator;Utility;Game;|' \
+		${WRKSRC}/${PORTNAME}.desktop
+
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|install(FILES|#install(FILES|' \
+		${WRKSRC}/src/i18n/CMakeLists.txt
 .endif
 
 post-install:
-	@-update-desktop-database
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/deskutils/q4wine/distinfo
==============================================================================
--- head/deskutils/q4wine/distinfo	Fri Oct 18 00:54:25 2013	(r330709)
+++ head/deskutils/q4wine/distinfo	Fri Oct 18 00:56:10 2013	(r330710)
@@ -1,2 +1,2 @@
-SHA256 (q4wine-0.120.tar.gz) = 9db9cc021722403709e6f2bb81318e285cfad9eba24d1343532b0fa32f823996
-SIZE (q4wine-0.120.tar.gz) = 836328
+SHA256 (q4wine-1.0-r3.tar.gz) = c23c0dfa30fec67794663cd000100da5633a286c55c86dbdc1c49984d0e72fc9
+SIZE (q4wine-1.0-r3.tar.gz) = 1105792

Modified: head/deskutils/q4wine/pkg-message
==============================================================================
--- head/deskutils/q4wine/pkg-message	Fri Oct 18 00:54:25 2013	(r330709)
+++ head/deskutils/q4wine/pkg-message	Fri Oct 18 00:56:10 2013	(r330710)
@@ -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 @@ and then, as root, executing the command
 
 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
 
 ################################################################################

Modified: head/deskutils/q4wine/pkg-plist
==============================================================================
--- head/deskutils/q4wine/pkg-plist	Fri Oct 18 00:54:25 2013	(r330709)
+++ head/deskutils/q4wine/pkg-plist	Fri Oct 18 00:56:10 2013	(r330710)
@@ -2,23 +2,46 @@ bin/q4wine
 bin/q4wine-cli
 bin/q4wine-helper
 lib/q4wine/libq4wine-core.so
+man/man1/q4wine-cli.1.gz
+man/man1/q4wine-helper.1.gz
+man/man1/q4wine.1.gz
 share/applications/q4wine.desktop
-share/pixmaps/q4wine.png
-%%DATADIR%%/i18n/cs_cz.qm
-%%DATADIR%%/i18n/en_us.qm
-%%DATADIR%%/i18n/es_es.qm
-%%DATADIR%%/i18n/it_it.qm
-%%DATADIR%%/i18n/pt_br.qm
-%%DATADIR%%/i18n/ru_ru.qm
-%%DATADIR%%/i18n/uk_ua.qm
+share/icons/hicolor/128x128/apps/q4wine.png
+share/icons/hicolor/16x16/apps/q4wine.png
+share/icons/hicolor/192x192/apps/q4wine.png
+share/icons/hicolor/22x22/apps/q4wine.png
+share/icons/hicolor/256x256/apps/q4wine.png
+share/icons/hicolor/32x32/apps/q4wine.png
+share/icons/hicolor/48x48/apps/q4wine.png
+share/icons/hicolor/64x64/apps/q4wine.png
+share/icons/hicolor/96x96/apps/q4wine.png
+share/icons/hicolor/scalable/apps/q4wine.svg
+%%NLS%%%%DATADIR%%/i18n/q4wine_af_za.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_cs_cz.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_de_de.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_en_us.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_es_es.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_fa_ir.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_he_il.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_it_it.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_pl_pl.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_pt_br.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_ru_ru.qm
+%%NLS%%%%DATADIR%%/i18n/q4wine_uk_ua.qm
+%%DATADIR%%/icons/control.png
 %%DATADIR%%/icons/eject.png
 %%DATADIR%%/icons/exec_wine.png
 %%DATADIR%%/icons/explorer.png
+%%DATADIR%%/icons/iexplore.png
 %%DATADIR%%/icons/notepad.png
+%%DATADIR%%/icons/oleview.png
 %%DATADIR%%/icons/regedit.png
+%%DATADIR%%/icons/taskmgr.png
 %%DATADIR%%/icons/uninstaller.png
 %%DATADIR%%/icons/winecfg.png
 %%DATADIR%%/icons/wineconsole.png
+%%DATADIR%%/icons/winemine.png
+%%DATADIR%%/icons/wordpad.png
 %%DATADIR%%/scripts/mount_image.sh
 %%DATADIR%%/scripts/umount.sh
 %%DATADIR%%/theme/nuvola/data/configure.png
@@ -43,7 +66,7 @@ share/pixmaps/q4wine.png
 @dirrm %%DATADIR%%/theme
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/i18n
+%%NLS%%@dirrm %%DATADIR%%/i18n
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrm lib/q4wine
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 14 Rusmir Dusko freebsd_committer freebsd_triage 2013-10-18 01:56:29 UTC
State Changed
From-To: open->closed

Committed. Thanks!