ports/155960: [UPDATE]: audio/qmpdclient Update to new release, 1.2.1

Maxim Samsonov xors at mne.ru
Sun Mar 27 01:10:11 UTC 2011 

>Number:         155960
>Category:       ports
>Synopsis:       [UPDATE]: audio/qmpdclient Update to new release, 1.2.1
>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:   Sun Mar 27 01:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Maxim Samsonov
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
>Description:
Update to new release, 1.2.1
>How-To-Repeat:
>Fix:
--- audio-qmpdclient.patch begins here ---
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -6,20 +6,25 @@
 #
 
 PORTNAME=	qmpdclient
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	audio
-MASTER_SITES=	http://dump.bitcheese.net/files/dedycec/
+MASTER_SITES=	http://dump.bitcheese.net/files/
 
 MAINTAINER=	uyamba at gmail.com
-COMMENT=	Easy to use musicpd client written in QT4
+COMMENT=	Easy to use musicpd client written in Qt4
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_BZIP2=	yes
-HAS_CONFIGURE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build \
-		corelib xml gui
-QMAKE_ARGS=	-unix PREFIX=${PREFIX}
+		corelib gui network webkit xml xmlpatterns
+MAKE_JOBS_SAFE=	yes
+INSTALLS_ICONS=	yes
+QMAKE_ARGS=	${QMAKE_PRO}
 QMAKE_PRO=	${PORTNAME}.pro
 
 OPTIONS=	DBUS	"Enable D-BUS support"	off
@@ -27,17 +32,23 @@
 DATADIR=	${PREFIX}/share/QMPDClient
 PLIST_FILES=	bin/${PORTNAME}
 
-USE_DOS2UNIX=	${QMAKE_PRO}
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include  <bsd.port.pre.mk>
 
+PLIST_FILES+=	share/applications/${PORTNAME}.desktop \
+		share/icons/hicolor/scalable/apps/${PORTNAME}.svg
+
+ICON_SIZES=	16 22 48 64
+.for size in ${ICON_SIZES}
+PLIST_FILES+=	share/icons/hicolor/${size}x${size}/apps/${PORTNAME}.png
+.endfor
+
 .if !defined(WITHOUT_NLS)
 QT_COMPONENTS+=	linguist_build
 
-TRANSLATIONS=	cs_CZ de_DE fr_FR it_IT nl_NL nn_NO pt_BR no_NO \
-		ru_RU sv_SE tr_TR uk_UA zh_CN zh_TW
+TRANSLATIONS=	cs_CZ de_DE es_ES fr_FR it_IT nl_NL nn_NO no_NO \
+		pt_BR ru_RU sv_SE tr_TR uk_UA zh_CN zh_TW
 
 .for lang in ${TRANSLATIONS}
 PLIST_FILES+=	${DATADIR_REL}/translations/${lang}.qm
@@ -48,31 +59,27 @@
 
 .if defined(WITH_DBUS) && !defined(WITHOUT_DBUS)
 QT_COMPONENTS+=	dbus
-QMAKE_ARGS+=	CONFIG+=qdbus
+QMAKEFLAGS+=	"CONFIG+=qdbus"
 .endif
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
-		${QMAKE_ARGS} ${QMAKE_PRO}
-
-post-build:
-.if !defined(WITHOUT_NLS)
-.for lang in ${TRANSLATIONS}
-	@${QT_PREFIX}/bin/lrelease-qt4 -compress \
-		${WRKSRC}/lang/${lang}.ts
-.endfor
-.else
-	@${DO_NADA}
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+QMAKEFLAGS+=	"CONFIG+=debug"
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(WITHOUT_NLS)
-	${MKDIR} ${DATADIR}/translations
-.for lang in ${TRANSLATIONS}
-	${INSTALL_DATA} ${WRKSRC}/lang/${lang}.qm \
-		${DATADIR}/translations/${lang}.qm
-.endfor
+post-patch:
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e '/INSTALLS += translations/d' \
+		${WRKSRC}/${QMAKE_PRO}
 .endif
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
+		-e 's|lupdate|lupdate-qt4|' \
+		-e 's|lrelease|lrelease-qt4|' \
+		${WRKSRC}/${QMAKE_PRO}
+	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
+		${WRKSRC}/src/notifications_dbus.cpp
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \
+		${QMAKEFLAGS} ${QMAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/audio/qmpdclient/distinfo b/audio/qmpdclient/distinfo
--- a/audio/qmpdclient/distinfo
+++ b/audio/qmpdclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmpdclient-1.1.2.tar.bz2) = 7bd0c2a87e9a6bdd0580b5c99b6450eb8345f90e27c12a601d3f097e797d794d
-SIZE (qmpdclient-1.1.2.tar.bz2) = 260718
+SHA256 (qmpdclient-1.2.1.tar.bz2) = 9d57ffbf2985c1dbc9e8856e9c5edf5171e85152d8cf58ad692e85233a9b0773
+SIZE (qmpdclient-1.2.1.tar.bz2) = 271243
diff --git a/audio/qmpdclient/files/patch-qmpdclient.desktop b/audio/qmpdclient/files/patch-qmpdclient.desktop
new file mode 100644
--- /dev/null
+++ b/audio/qmpdclient/files/patch-qmpdclient.desktop
@@ -0,0 +1,10 @@
+--- qmpdclient.desktop.orig	2011-02-04 14:22:08.000000000 +0300
++++ qmpdclient.desktop	2011-03-25 13:43:51.000000000 +0300
+@@ -4,6 +4,6 @@
+ GenericName=Qt4 based MPD client
+ Comment=A nicer MPD client
+ Exec=qmpdclient
+-Categories=Qt;Network;Music;
++Categories=Qt;AudioVideo;Player;
+ Icon=qmpdclient
+ Terminal=false
diff --git a/audio/qmpdclient/files/patch-qmpdclient.pro b/audio/qmpdclient/files/patch-qmpdclient.pro
--- a/audio/qmpdclient/files/patch-qmpdclient.pro
+++ b/audio/qmpdclient/files/patch-qmpdclient.pro
@@ -1,27 +1,38 @@
---- qmpdclient.pro.orig	2009-12-02 14:42:07.000000000 +0700
-+++ qmpdclient.pro	2009-12-02 14:48:21.000000000 +0700
-@@ -8,7 +8,7 @@ CONFIG += qt
+--- qmpdclient.pro.orig	2011-02-04 14:22:08.000000000 +0300
++++ qmpdclient.pro	2011-03-25 12:52:30.000000000 +0300
+@@ -3,7 +3,7 @@
+ 
+ # Most people need not muck about below here
+ #!contains(QT_MAJOR_VERSION, 4):error(QMPDClient requires Qt 4)
+-CONFIG += qt debug
++CONFIG += qt
+ 
  # addition ldflags for release build
  QMAKE_LFLAGS_RELEASE += -O2 -g0 -s
- 
--# CONFIG -= debug # Needed to avoid console on win32
-+CONFIG -= debug # Needed to avoid console on win32
- TEMPLATE = app
- RESOURCES = qmpdclient.qrc
- VERSION = 1.1.1
-@@ -202,13 +202,12 @@ unix {
+@@ -212,16 +212,15 @@
          SOURCES += src/qmpdclient_x11.cpp
  
          # Check for dbus support
 -        contains(QT_CONFIG, dbus) {
-+        contains(CONFIG, dbus) {
-             message(DBus notifier: enabled)
++        contains(CONFIG, qdbus) {
+             message(DBus: enabled)
 -            CONFIG += qdbus
-             SOURCES += src/notifications_dbus.cpp
+             SOURCES += src/notifications_dbus.cpp \
+             	src/qdbus_adaptor.cpp
+             HEADERS += src/qdbus_adaptor.h
+             DEFINES += WITH_DBUS
          }
          else {
--            message(DBus notifier: disabled (Qt is not compiled with dbus support))
-+            message(DBus notifier: disabled)
+-            message(DBus: disabled (Qt is not compiled with dbus support))
++            message(DBus: disabled)
              SOURCES += src/notifications_nodbus.cpp
          }
      }
+@@ -253,6 +252,7 @@
+ translations.commands = lrelease $$TRANSLATIONS
+ translations.files = lang/cs_CZ.qm lang/de_DE.qm lang/es_ES.qm lang/fr_FR.qm lang/it_IT.qm lang/nl_NL.qm lang/nn_NO.qm lang/no_NO.qm lang/pt_BR.qm lang/ru_RU.qm lang/sv_SE.qm lang/tr_TR.qm lang/uk_UA.qm lang/zh_CN.qm lang/zh_TW.qm
+ translations.path = $$PREFIX/share/QMPDClient/translations
++translations.CONFIG += no_check_exist
+ 
+ INSTALLS += translations
+ 
--- audio-qmpdclient.patch ends here ---


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

More information about the freebsd-ports-bugs mailing list