Index: head/audio/polyphone/Makefile =================================================================== --- head/audio/polyphone/Makefile (revision 513841) +++ head/audio/polyphone/Makefile (revision 513842) @@ -1,45 +1,47 @@ # $FreeBSD$ PORTNAME= polyphone -DISTVERSION= 2.1.0 +DISTVERSION= 2.1.1 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org COMMENT= Graphical user interface for editing soundfont (sf2 and sfz) files LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../LICENSE.txt LIB_DEPENDS= libFLAC.so:audio/flac \ libjack.so:audio/jack \ libogg.so:audio/libogg \ libportaudio.so:audio/portaudio \ librtmidi.so:audio/rtmidi \ libstk.so:audio/stk \ libvorbisfile.so:audio/libvorbis -USES= compiler:c++11-lang desktop-file-utils gl gnome pkgconfig qmake:outsource qt:5 shared-mime-info ssl xorg +USES= compiler:c++11-lang desktop-file-utils dos2unix gl gnome pkgconfig qmake:outsource qt:5 shared-mime-info ssl xorg USE_GITHUB= yes GH_ACCOUNT= davy7125 +DOS2UNIX_FILES= polyphone.pro USE_GL= gl USE_QT= core concurrent gui network printsupport svg widgets buildtools_build qmake_build USE_GNOME= glib20 USE_CXXSTD= c++11 QMAKE_ARGS= DEFINES=USE_LOCAL_QCUSTOMPLOT CXXFLAGS+= -D__UNIX_JACK__ +LIBS+= -lssl -lcrypto WRKSRC_SUBDIR= sources PLIST_FILES= bin/polyphone \ share/applications/polyphone.desktop \ share/mime/packages/polyphone.xml \ share/pixmaps/polyphone.png do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/resources/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications @${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xml ${STAGEDIR}${PREFIX}/share/mime/packages .include Index: head/audio/polyphone/distinfo =================================================================== --- head/audio/polyphone/distinfo (revision 513841) +++ head/audio/polyphone/distinfo (revision 513842) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567474097 -SHA256 (davy7125-polyphone-2.1.0_GH0.tar.gz) = 30812339f34b9125bd53820d34a12077f474a8433b50a0ddd0122e789861d2a0 -SIZE (davy7125-polyphone-2.1.0_GH0.tar.gz) = 1980275 +TIMESTAMP = 1570295770 +SHA256 (davy7125-polyphone-2.1.1_GH0.tar.gz) = ff8237f0cc2d9e032cfe581c3ed22ed9313d9802a3b3310324b9894977ace8ad +SIZE (davy7125-polyphone-2.1.1_GH0.tar.gz) = 1985829 Index: head/audio/polyphone/files/patch-polyphone.pro =================================================================== --- head/audio/polyphone/files/patch-polyphone.pro (revision 513841) +++ head/audio/polyphone/files/patch-polyphone.pro (revision 513842) @@ -1,45 +1,44 @@ ---- polyphone.pro.orig 2019-07-16 14:22:06 UTC +--- polyphone.pro.orig 2019-09-13 16:03:56 UTC +++ polyphone.pro -@@ -65,8 +65,9 @@ win32 { +@@ -65,8 +65,8 @@ win32 { unix:!macx { - DEFINES += __LINUX_ALSASEQ__ + DEFINES += __LINUX_ALSASEQ__ __UNIX_JACK__ CONFIG += link_pkgconfig - PKGCONFIG += alsa jack portaudio-2.0 zlib ogg flac vorbis vorbisfile vorbisenc glib-2.0 openssl - INCLUDEPATH += /usr/include/jack \ + PKGCONFIG += jack portaudio-2.0 zlib ogg flac vorbis vorbisfile vorbisenc glib-2.0 -+ LIBS += -lssl -lcrypto # on FreeBSD /etc/make.conf defines which ssl library is used + INCLUDEPATH += $$PREFIX/include/jack \ lib/flac isEmpty(PREFIX) { PREFIX = /usr/local -@@ -125,7 +126,7 @@ contains(DEFINES, USE_LOCAL_STK) { +@@ -125,7 +125,7 @@ contains(DEFINES, USE_LOCAL_STK) { INCLUDEPATH += lib/stk } else { LIBS += -lstk - INCLUDEPATH += /usr/include/stk + INCLUDEPATH += $$PREFIX/include/stk } # Location of QCustomplot -@@ -135,7 +136,7 @@ contains(DEFINES, USE_LOCAL_QCUSTOMPLOT) { +@@ -135,7 +135,7 @@ contains(DEFINES, USE_LOCAL_QCUSTOMPLOT) { INCLUDEPATH += lib/qcustomplot } else { LIBS += -lqcustomplot - INCLUDEPATH += /usr/include/qcustomplot + INCLUDEPATH += $$PREFIX/include/qcustomplot } INCLUDEPATH += mainwindow \ -@@ -862,10 +863,10 @@ win32 { +@@ -909,10 +909,10 @@ win32 { ExtraCompiler.commands = $${QMAKE_CXX} -D__LITTLE_ENDIAN__ -MD -arch:IA32 -D_CRT_SECURE_NO_WARNINGS $(INCPATH) -c ${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT} } macx { - ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} } unix:!macx { - ExtraCompiler.commands = $${QMAKE_CXX} -fPIC -D__LITTLE_ENDIAN__ -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -+ ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -fPIC -D__LITTLE_ENDIAN__ $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} ++ ExtraCompiler.commands = $${QMAKE_CXX} -fPIC -D__LITTLE_ENDIAN__ $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} } QMAKE_EXTRA_COMPILERS += ExtraCompiler