From 3ec4297daef2153e7dcb265d77f585e879065b91 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 15 Mar 2016 15:06:19 +0000
Subject: [PATCH] Update to 16.02

PR:		207983
Submitted by:	tkato432 yahoo com
Sponsored by:	Absolight
---
 audio/rosegarden/Makefile                     | 21 +++++++++----------
 audio/rosegarden/distinfo                     |  4 ++--
 ...cpp => patch-src_gui_application_main.cpp} | 10 ++++-----
 audio/rosegarden/pkg-plist                    |  1 +
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename audio/rosegarden/files/{patch-src__gui__application__main.cpp => patch-src_gui_application_main.cpp} (71%)

diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 3264cb42437e..2dbc7523ffde 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	rosegarden
-PORTVERSION=	15.12.1
+PORTVERSION=	16.02
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose music editor and sequencer suite
@@ -13,30 +13,29 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
-		makedepend:${PORTSDIR}/devel/makedepend \
 		${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		liblirc_client.so:${PORTSDIR}/comms/lirc \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		liblrdf.so:${PORTSDIR}/textproc/liblrdf
 RUN_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
+		flac:${PORTSDIR}/audio/flac \
+		wavpack:${PORTSDIR}/audio/wavpack \
+		xdg-open:${PORTSDIR}/devel/xdg-utils \
 		lilypond:${PORTSDIR}/print/lilypond
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-
-USES=		cmake:outsource desktop-file-utils gmake pkgconfig \
-		shared-mime-info tar:bzip2
+USES=		cmake:outsource desktop-file-utils pkgconfig shared-mime-info \
+		tar:bzip2
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-INSTALLS_ICONS=	yes
-
+OPTIONS_DEFINE=		LIRC
 OPTIONS_SINGLE=		TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
 OPTIONS_DEFAULT=	QT4
 
-QR4_USES=		compiler:c++0x
+LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_CMAKE_ON=		-DENABLE_LIRC:BOOL=ON
 QT4_USE=		qt4=gui,network,testlib,xml \
 			qt4=linguisttools_build,moc_build,qmake_build \
 			qt4=rcc_build,uic_build
diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo
index 9a5a85daaaf4..956205c1075c 100644
--- a/audio/rosegarden/distinfo
+++ b/audio/rosegarden/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rosegarden-15.12.1.tar.bz2) = b3aff1057a5ebba216982b17ed7f74d7283f6fb6c8714a7e12b91434a2077450
-SIZE (rosegarden-15.12.1.tar.bz2) = 6406834
+SHA256 (rosegarden-16.02.tar.bz2) = dee4dbe9e657482cc708b8159ae80300acf0009cd10c55ad8b1e95aada813be7
+SIZE (rosegarden-16.02.tar.bz2) = 6348976
diff --git a/audio/rosegarden/files/patch-src__gui__application__main.cpp b/audio/rosegarden/files/patch-src_gui_application_main.cpp
similarity index 71%
rename from audio/rosegarden/files/patch-src__gui__application__main.cpp
rename to audio/rosegarden/files/patch-src_gui_application_main.cpp
index 93f6d00fb813..9ea2765909aa 100644
--- a/audio/rosegarden/files/patch-src__gui__application__main.cpp
+++ b/audio/rosegarden/files/patch-src_gui_application_main.cpp
@@ -1,6 +1,6 @@
---- src/gui/application/main.cpp.orig	2015-12-31 13:49:35 UTC
+--- src/gui/application/main.cpp.orig	2016-02-29 12:18:01 UTC
 +++ src/gui/application/main.cpp
-@@ -354,6 +354,11 @@ void usage()
+@@ -359,6 +359,11 @@ void usage()
      exit(2);
  }
  
@@ -11,8 +11,8 @@
 +
  int main(int argc, char *argv[])
  {
-     for (int i = 1; i < argc; ++i) {
-@@ -377,7 +382,6 @@ int main(int argc, char *argv[])
+ 
+@@ -405,7 +410,6 @@ int main(int argc, char *argv[])
      // (this has to be outside the ifdef block below)
      QSettings preAppSettings("rosegardenmusic", "Rosegarden");
      preAppSettings.beginGroup(GeneralOptionsConfigGroup);
@@ -20,7 +20,7 @@
      unsigned int graphicsSystem = preAppSettings.value("graphics_system", Native).toUInt();
      preAppSettings.endGroup();
  
-@@ -840,4 +844,7 @@ int main(int argc, char *argv[])
+@@ -868,4 +872,7 @@ int main(int argc, char *argv[])
  
      return returnCode;
  }
diff --git a/audio/rosegarden/pkg-plist b/audio/rosegarden/pkg-plist
index 30d75aec1dc7..1429d1577e42 100644
--- a/audio/rosegarden/pkg-plist
+++ b/audio/rosegarden/pkg-plist
@@ -2,6 +2,7 @@ bin/rosegarden
 share/appdata/rosegarden.appdata.xml
 share/applications/rosegarden.desktop
 share/icons/hicolor/128x128/apps/rosegarden.png
+share/icons/hicolor/16x16/apps/rosegarden.png
 share/icons/hicolor/16x16/mimetypes/application-x-rosegarden-composition.png
 share/icons/hicolor/16x16/mimetypes/application-x-rosegarden-device.png
 share/icons/hicolor/16x16/mimetypes/application-x-rosegarden-project.png