diff -urN /usr/ports/audio/rosegarden/Makefile audio/rosegarden/Makefile --- /usr/ports/audio/rosegarden/Makefile 2015-11-07 18:11:11.279396000 +0900 +++ audio/rosegarden/Makefile 2016-01-05 00:00:00.000000000 +0900 @@ -2,7 +2,7 @@ # $FreeBSD: head/audio/rosegarden/Makefile 400960 2015-11-06 23:38:12Z pawel $ PORTNAME= rosegarden -PORTVERSION= 15.10.2 +PORTVERSION= 15.12.1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -22,24 +22,27 @@ RUN_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \ lilypond:${PORTSDIR}/print/lilypond -USES= compiler:c++0x desktop-file-utils gmake pkgconfig \ +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} + +USES= cmake:outsource desktop-file-utils gmake pkgconfig \ shared-mime-info tar:bzip2 -USE_QT4= gui network xml \ - linguisttools_build moc_build rcc_build uic_build -QT_NONSTANDARD= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qtdir=${QT_PREFIX} \ - --with-qtlibdir=${QT_LIBDIR} -CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -post-patch: - @${REINPLACE_CMD} -e \ - 's|15\.10\.1|${PORTVERSION}| ; \ - /LIBS/s|-ldl||' ${WRKSRC}/configure - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rosegarden +OPTIONS_SINGLE= TOOLKIT +OPTIONS_SINGLE_TOOLKIT= QT4 QT5 +OPTIONS_DEFAULT= QT4 + +QR4_USES= compiler:c++0x +QT4_USE= qt4=gui,network,testlib,xml \ + qt4=linguisttools_build,moc_build,qmake_build \ + qt4=rcc_build,uic_build +QT4_CMAKE_ON= -DUSE_QT4:BOOL=ON +QT5_USES= compiler:c++11-lib +QT5_USE= qt5=network,printsupport,testlib,widgets,xml \ + qt5=buildtools_build,linguisttools_build,qmake_build +QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON +TOOLKIT_DESC= Qt toolkit .include diff -urN /usr/ports/audio/rosegarden/distinfo audio/rosegarden/distinfo --- /usr/ports/audio/rosegarden/distinfo 2015-11-07 18:11:11.279754000 +0900 +++ audio/rosegarden/distinfo 2016-01-05 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (rosegarden-15.10.2.tar.bz2) = d4e8488c3447763a7d4b57925dc9d462e9e21efe647962431ea21aad8930a0a3 -SIZE (rosegarden-15.10.2.tar.bz2) = 6380389 +SHA256 (rosegarden-15.12.1.tar.bz2) = b3aff1057a5ebba216982b17ed7f74d7283f6fb6c8714a7e12b91434a2077450 +SIZE (rosegarden-15.12.1.tar.bz2) = 6406834 diff -urN /usr/ports/audio/rosegarden/files/patch-src__gui__application__main.cpp audio/rosegarden/files/patch-src__gui__application__main.cpp --- /usr/ports/audio/rosegarden/files/patch-src__gui__application__main.cpp 1970-01-01 09:00:00.000000000 +0900 +++ audio/rosegarden/files/patch-src__gui__application__main.cpp 2016-01-05 00:00:00.000000000 +0900 @@ -0,0 +1,30 @@ +--- src/gui/application/main.cpp.orig 2015-12-31 13:49:35 UTC ++++ src/gui/application/main.cpp +@@ -354,6 +354,11 @@ void usage() + exit(2); + } + ++#ifdef __GNUG__ ++#pragma GCC push ++#pragma GCC diagnostic ignored "-Wunused-variable" ++#endif ++ + int main(int argc, char *argv[]) + { + for (int i = 1; i < argc; ++i) { +@@ -377,7 +382,6 @@ int main(int argc, char *argv[]) + // (this has to be outside the ifdef block below) + QSettings preAppSettings("rosegardenmusic", "Rosegarden"); + preAppSettings.beginGroup(GeneralOptionsConfigGroup); +-#pragma GCC diagnostic ignored "-Wunused-variable" + unsigned int graphicsSystem = preAppSettings.value("graphics_system", Native).toUInt(); + preAppSettings.endGroup(); + +@@ -840,4 +844,7 @@ int main(int argc, char *argv[]) + + return returnCode; + } ++#ifdef __GNUG__ ++#pragma GCC pop ++#endif +