Date: Tue, 2 Jul 2013 18:55:32 GMT From: Rene Ladan <rene@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180212: net-p2p/museekplus : remove QT3 interface (MUSEEQ and QSA options) Message-ID: <201307021855.r62ItWNB055462@oldred.freebsd.org> Resent-Message-ID: <201307021900.r62J00Dp089285@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180212
>Category: ports
>Synopsis: net-p2p/museekplus : remove QT3 interface (MUSEEQ and QSA options)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 02 19:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rene Ladan
>Release: FreeBSD 9.1-amd64
>Organization:
>Environment:
FreeBSD 9.1-amd64
Ports Tree r322190
>Description:
The MUSEEQ and QSA options of this port depend on the QT3 port, which expired on 2013-07-01. Remove these options from the Makefile.
Leave the MUSEEQ lines in pkg-plist (now always a comment) to ease a possible update to QT4.
Fix pkg-descr while here.
>How-To-Repeat:
Run 'make index' after locally removing the QT3/KDE3 ports.
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 322190)
+++ Makefile (working copy)
@@ -22,10 +22,8 @@
DATADIR= share/museek
MAN1= musetup.1 mulog.1 museekcontrol.1 muscan.1 muscand.1 museekd.1
-OPTIONS_DEFINE= MUSEEQ QSA MUSETUPGTK PYMUCIPHER VORBIS MURMUR MUCOUS OPTIMIZED_CFLAGS DEBUG
-OPTIONS_DEFAULT= MUSEEQ QSA MUSETUPGTK PYMUCIPHER VORBIS
-MUSEEQ_DESC= Install Museeq (Qt3 client)
-QSA_DESC= Build Museeq with Qt Script support
+OPTIONS_DEFINE= MUSETUPGTK PYMUCIPHER VORBIS MURMUR MUCOUS OPTIMIZED_CFLAGS DEBUG
+OPTIONS_DEFAULT= MUSETUPGTK PYMUCIPHER VORBIS
MUSETUPGTK_DESC= Install musetup-gtk
PYMUCIPHER_DESC= Install python bindings for Mucipher
MURMUR_DESC= Install PyGTK client
@@ -37,22 +35,10 @@
USE_PYTHON= yes
.endif
-.if ${PORT_OPTIONS:MMUSEEQ}
-USE_QT_VER= 3
-SCONS_ARGS+= MUSEEQ=yes
-MAN1+= museeq.1
-PLIST_SUB+= MUSEEQ=""
-.if ${PORT_OPTIONS:MQSA}
-SCONS_ARGS+= QSA=yes
-LIB_DEPENDS+= qsa:${PORTSDIR}/devel/qsa
-.else
-SCONS_ARGS+= QSA=no
-.endif
-.else
SCONS_ARGS+= MUSEEQ=no
PLIST_SUB+= MUSEEQ="@comment "
SCONS_ARGS+= QSA=no
-.endif
+
.if ${PORT_OPTIONS:MVORBIS}
SCONS_ARGS+= VORBIS=yes
LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
Index: pkg-descr
===================================================================
--- pkg-descr (revision 322190)
+++ pkg-descr (working copy)
@@ -2,4 +2,4 @@
application for the Soulseek peer-to-peer network. The actual SoulSeek client
and the GUI are separate programs that communicate via Unix or network sockets.
-WWW: http://www.museek-plus.org/
+WWW: http://www.museek-plus.org/
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307021855.r62ItWNB055462>