Attachment #202760 for bug #236437




# $FreeBSD: head/audio/quimup/Makefile 490472 2019-01-16 11:13:44Z tijl $

PORTNAME=	quimup
PORTVERSION=	1.4.4
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}
DISTNAME=	Quimup_${PORTVERSION}_source

MAINTAINER=	cmangin@arobas.net
COMMENT=	Qt5 client for MPD (the Music Player Daemon)

LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
		libtag.so:audio/taglib

WRKSRC=		${WRKDIR}/Quimup_${PORTVERSION}_source

USES=		gl pkgconfig qmake compiler:c++11-lang qt:5
USE_QT=		core gui network widgets buildtools_build
USE_GL=		gl


Lines 1-3 Link Here

(-)quimup/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1517267675	1	TIMESTAMP = 1552177932
2	SHA256 (quimup_1.4.3_source.tar.gz) = dac47b4c0f458e1a020f2c70d4291ad6bcf85041e6a26f1d011d6542aa3fdc33	2	SHA256 (Quimup_1.4.4_source.tar.gz) = d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
3	SIZE (quimup_1.4.3_source.tar.gz) = 587260	3	SIZE (Quimup_1.4.4_source.tar.gz) = 240902




--- src/qm_mpdcom.cpp.orig	2018-12-11 16:49:38.000000000 -0500
+++ src/qm_mpdcom.cpp	2019-03-09 20:14:42.938535000 -0500
@@ -367,16 +367,16 @@
     QFile file;
     QString line = "";
 
-    file.setFileName("/etc/default/mpd");
+    file.setFileName("/usr/local/etc/musicpd.conf");
     if ( !file.exists() )
     {
-        printf ("MPD's config : Tried /etc/default/mpd but it does not exist\n");
+        printf ("MPD's config : Tried /usr/local/etc/musicpd.conf but it does not exist\n");
         return line;
     }
 
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
-        printf ("MPD's config : Tried /etc/default/mpd but it is not readable\n");
+        printf ("MPD's config : Tried /usr/local/etc/musicpd.conf but it is not readable\n");
         return line;
     }
 
@@ -393,10 +393,10 @@
     file.close();
 
     if (line.isEmpty())
-        printf ("MPD's config : Tried /etc/default/mpd but MPDCONF is not set\n");
+        printf ("MPD's config : Tried /usr/local/etc/musicpd.conf but MPDCONF is not set\n");
     else
     {
-        QString msg  = "MPD's config found in /etc/default/mpd : " + line + "\n";
+        QString msg  = "MPD's config found in /usr/local/etc/musicpd.conf : " + line + "\n";
         printf ("%s", msg.toUtf8().constData());
     }
 
@@ -2710,17 +2710,10 @@
     struct stat sts;
     bool b_isrunning = false;
 

Return to bug 236437

Lines 2-11 Link Here

(-)quimup/Makefile (-4 / +4 lines)
2	# $FreeBSD: head/audio/quimup/Makefile 490472 2019-01-16 11:13:44Z tijl $	2	# $FreeBSD: head/audio/quimup/Makefile 490472 2019-01-16 11:13:44Z tijl $
3		3
4	PORTNAME= quimup	4	PORTNAME= quimup
5	PORTVERSION= 1.4.3	5	PORTVERSION= 1.4.4
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= SF/${PORTNAME}	7	MASTER_SITES= SF/${PORTNAME}
8	DISTNAME= quimup_${PORTVERSION}_source	8	DISTNAME= Quimup_${PORTVERSION}_source
9		9
10	MAINTAINER= cmangin@arobas.net	10	MAINTAINER= cmangin@arobas.net
11	COMMENT= Qt5 client for MPD (the Music Player Daemon)	11	COMMENT= Qt5 client for MPD (the Music Player Daemon)
Lines 16-24 Link Here
16	LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \	16	LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \
17	libtag.so:audio/taglib	17	libtag.so:audio/taglib
18		18
19	WRKSRC= ${WRKDIR}/Quimup_${PORTVERSION}	19	WRKSRC= ${WRKDIR}/Quimup_${PORTVERSION}_source
20		20
21	USES= pkgconfig qmake compiler:c++11-lang qt:5	21	USES= gl pkgconfig qmake compiler:c++11-lang qt:5
22	USE_QT= core gui network widgets buildtools_build	22	USE_QT= core gui network widgets buildtools_build
23	USE_GL= gl	23	USE_GL= gl
24		24

Lines 1-6 Link Here

(-)quimup/files/patch-src_qm__mpdcom.cpp (-3 / +36 lines)
1	--- src/qm_mpdcom.cpp.orig 2016-02-28 09:52:46 UTC	1	--- src/qm_mpdcom.cpp.orig 2018-12-11 16:49:38.000000000 -0500
2	+++ src/qm_mpdcom.cpp	2	+++ src/qm_mpdcom.cpp 2019-03-09 20:14:42.938535000 -0500
3	@@ -2500,17 +2500,10 @@ bool qm_mpdCom::is_mpd_running()	3	@@ -367,16 +367,16 @@
		4	QFile file;
		5	QString line = "";
		6
		7	- file.setFileName("/etc/default/mpd");
		8	+ file.setFileName("/usr/local/etc/musicpd.conf");
		9	if ( !file.exists() )
		10	{
		11	- printf ("MPD's config : Tried /etc/default/mpd but it does not exist\n");
		12	+ printf ("MPD's config : Tried /usr/local/etc/musicpd.conf but it does not exist\n");
		13	return line;
		14	}
		15
		16	if (!file.open(QIODevice::ReadOnly \| QIODevice::Text))
		17	{
		18	- printf ("MPD's config : Tried /etc/default/mpd but it is not readable\n");
		19	+ printf ("MPD's config : Tried /usr/local/etc/musicpd.conf but it is not readable\n");
		20	return line;
		21	}
		22
		23	@@ -393,10 +393,10 @@
		24	file.close();
		25
		26	if (line.isEmpty())
		27	- printf ("MPD's config : Tried /etc/default/mpd but MPDCONF is not set\n");
		28	+ printf ("MPD's config : Tried /usr/local/etc/musicpd.conf but MPDCONF is not set\n");
		29	else
		30	{
		31	- QString msg = "MPD's config found in /etc/default/mpd : " + line + "\n";
		32	+ QString msg = "MPD's config found in /usr/local/etc/musicpd.conf : " + line + "\n";
		33	printf ("%s", msg.toUtf8().constData());
		34	}
		35
		36	@@ -2710,17 +2710,10 @@
4	struct stat sts;	37	struct stat sts;
5	bool b_isrunning = false;	38	bool b_isrunning = false;
6		39