Index: multimedia/audacious/Makefile =================================================================== --- multimedia/audacious/Makefile (revision 480010) +++ multimedia/audacious/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.9 -PORTREVISION= 1 +PORTVERSION= 3.10 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -17,18 +16,18 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -CONFLICTS_INSTALL= audacious-gtk3-3.* - -SUB_FILES= pkg-message - USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \ - localbase pkgconfig tar:bzip2 -GNU_CONFIGURE= yes + gnome localbase pkgconfig tar:bzip2 USE_XORG= x11 sm USE_GNOME= gtk20 glib20 cairo USE_LDCONFIG= yes + +GNU_CONFIGURE= yes INSTALLS_ICONS= yes +SUB_FILES= pkg-message +CONFLICTS_INSTALL= audacious-gtk3-3.* + CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --enable-gtk \ --without-buildstamp @@ -35,17 +34,21 @@ OPTIONS_DEFINE= ICONV NLS EXECINFO OPTIONS_DEFAULT=ICONV EXECINFO -ICONV_USES= iconv -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile OPTIONS_SUB= yes EXECINFO_DESC= Build with libexecinfo support +ICONV_USES= iconv + +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls + post-patch: @${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ ${WRKSRC}/buildsys.mk.in +post-patch-NLS-off: + ${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile + post-patch-EXECINFO-on: @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ ${WRKSRC}/src/audacious/Makefile Index: multimedia/audacious/distinfo =================================================================== --- multimedia/audacious/distinfo (revision 480010) +++ multimedia/audacious/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506360445 -SHA256 (audacious-3.9.tar.bz2) = 2d8044673ac786d71b08004f190bbca368258bf60e6602ffc0d9622835ccb05e -SIZE (audacious-3.9.tar.bz2) = 599488 +TIMESTAMP = 1537161628 +SHA256 (audacious-3.10.tar.bz2) = 6e4d49ac48a373c4c47d605fe18fbd5854bc30af6fece11331069af40eaa3fb5 +SIZE (audacious-3.10.tar.bz2) = 563531 Index: multimedia/audacious/files/extra-patch-Makefile =================================================================== --- multimedia/audacious/files/extra-patch-Makefile (revision 480010) +++ multimedia/audacious/files/extra-patch-Makefile (nonexistent) @@ -1,8 +0,0 @@ ---- Makefile.orig 2015-11-08 04:44:35 UTC -+++ Makefile -@@ -1,4 +1,4 @@ --SUBDIRS = src man images po -+SUBDIRS = src man images - - DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk - Property changes on: multimedia/audacious/files/extra-patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: multimedia/audacious/files/patch-buildsys.mk.in =================================================================== --- multimedia/audacious/files/patch-buildsys.mk.in (revision 480010) +++ multimedia/audacious/files/patch-buildsys.mk.in (working copy) @@ -1,27 +1,21 @@ ---- buildsys.mk.in.orig 2016-08-24 14:50:57 UTC +--- buildsys.mk.in.orig 2018-08-08 22:36:44 UTC +++ buildsys.mk.in -@@ -166,7 +166,7 @@ depend: pre-depend ${SRCS} +@@ -180,7 +180,8 @@ depend: pre-depend ${SRCS} done; \ if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ ${DEPEND_STATUS}; \ -- if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \ -+ if ${MAKE} ${MFLAGS} $$deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' $$deps >.deps; then \ +- if ${MAKE} $$deps && cat $$deps >.deps; then \ ++ if ${MAKE} $$deps && cat $$deps >.deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' \ ++ $$deps >.deps; then \ rm -f $$deps; \ ${DEPEND_OK}; \ else \ -@@ -205,7 +205,7 @@ pre-depend: - - ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} - ${LINK_STATUS} -- if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ -+ if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \ - ${LINK_OK}; \ - else \ - ${LINK_FAILED}; \ -@@ -604,6 +604,15 @@ install: install-extra - fi \ - done - +@@ -664,6 +665,15 @@ install: install-extra + ${DIR_ENTER}; \ + ${MAKE} install || exit $$?; \ + ${DIR_LEAVE}; \ ++ done ++ + for i in ${CONTRIB}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datarootdir}/appdata && ${INSTALL} -m 644 $$i ${DESTDIR}${datarootdir}/appdata/$$(basename $$i); then \ @@ -29,8 +23,6 @@ + else \ + ${INSTALL_FAILED}; \ + fi \ -+ done -+ - for i in ${PROG}; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ + done + + for i in "" ${SHARED_LIB}; do \ Index: multimedia/audacious/pkg-plist =================================================================== --- multimedia/audacious/pkg-plist (revision 480010) +++ multimedia/audacious/pkg-plist (working copy) @@ -34,7 +34,7 @@ include/libaudgui/menu.h lib/libaudcore.so lib/libaudcore.so.5 -lib/libaudcore.so.5.0.0 +lib/libaudcore.so.5.1.0 lib/libaudgui.so lib/libaudgui.so.5 lib/libaudgui.so.5.0.0 @@ -48,19 +48,9 @@ share/applications/audacious.desktop %%DATADIR%%/AUTHORS %%DATADIR%%/COPYING -%%DATADIR%%/images/about-logo.png -%%DATADIR%%/images/about-logo.svg -%%DATADIR%%/images/album.png -%%DATADIR%%/images/appearance.png -%%DATADIR%%/images/audio.png -%%DATADIR%%/images/connectivity.png -%%DATADIR%%/images/info.png -%%DATADIR%%/images/playlist.png -%%DATADIR%%/images/plugins.png share/icons/hicolor/48x48/apps/audacious.png share/icons/hicolor/scalable/apps/audacious.svg %%NLS%%share/locale/ar/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo %%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo @@ -70,7 +60,6 @@ %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo %%NLS%%share/locale/el/LC_MESSAGES/audacious.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/eo/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo @@ -80,7 +69,6 @@ %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo %%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo %%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo %%NLS%%share/locale/it/LC_MESSAGES/audacious.mo @@ -99,14 +87,11 @@ %%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo %%NLS%%share/locale/si/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sq/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sr@latin/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo %%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo Index: multimedia/audacious-gtk3/Makefile =================================================================== --- multimedia/audacious-gtk3/Makefile (revision 480010) +++ multimedia/audacious-gtk3/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.9 -PORTREVISION= 1 +PORTVERSION= 3.10 DISTVERSIONSUFFIX= -gtk3 CATEGORIES= multimedia audio #MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -13,9 +12,10 @@ COMMENT= Gtk+3 port of lightweight and versatile audio player LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig CONFLICTS_INSTALL= audacious-3.* @@ -29,7 +29,7 @@ USE_GITHUB= yes GH_ACCOUNT= audacious-media-player -GH_TAGNAME= 7a490de +GH_TAGNAME= 89521a6 GNU_CONFIGURE= yes USE_XORG= x11 sm @@ -41,29 +41,31 @@ --enable-gtk \ --without-buildstamp -OPTIONS_DEFINE= ICONV NLS EXECINFO -OPTIONS_DEFAULT=ICONV EXECINFO -ICONV_USES= iconv -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile +OPTIONS_DEFINE= EXECINFO ICONV NLS +OPTIONS_DEFAULT=EXECINFO ICONV OPTIONS_SUB= yes + EXECINFO_DESC= Build with libexecinfo support -.include +ICONV_USES= iconv +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls post-patch: -.if ${PORT_OPTIONS:MEXECINFO} + ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ + ${WRKSRC}/buildsys.mk.in + +post-patch-NLS-off: + ${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile + +post-patch-EXECINFO-on: @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ ${WRKSRC}/src/audacious/Makefile @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \ ${WRKSRC}/audacious.pc.in -.endif - ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ - ${WRKSRC}/buildsys.mk.in post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* \ + ${STAGEDIR}${PREFIX}/lib/lib* .include Index: multimedia/audacious-gtk3/distinfo =================================================================== --- multimedia/audacious-gtk3/distinfo (revision 480010) +++ multimedia/audacious-gtk3/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506368343 -SHA256 (audacious-media-player-audacious-3.9-gtk3-7a490de_GH0.tar.gz) = 3a105932ad8d3489fdd9ea4fa845211388638a3da92182d6445c5d3b31678115 -SIZE (audacious-media-player-audacious-3.9-gtk3-7a490de_GH0.tar.gz) = 860819 +TIMESTAMP = 1537222969 +SHA256 (audacious-media-player-audacious-3.10-gtk3-89521a6_GH0.tar.gz) = 82991fd5061d3b6df9935b07d112fab8e83e90c90d733a12c7d68e92fb884f99 +SIZE (audacious-media-player-audacious-3.10-gtk3-89521a6_GH0.tar.gz) = 801667 Index: multimedia/audacious-plugins/Makefile =================================================================== --- multimedia/audacious-plugins/Makefile (revision 480010) +++ multimedia/audacious-plugins/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= audacious-plugins -PORTVERSION= 3.9 -PORTREVISION= 5 +PORTVERSION= 3.10 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -17,109 +16,109 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libmpg123.so:audio/mpg123 RUN_DEPENDS= audacious:multimedia/audacious -CONFLICTS_INSTALL= audacious-plugins-gtk3-3.* - -USES= compiler:c++11-lib gettext-tools gmake iconv \ +USES= compiler:c++11-lib gettext-tools gmake gnome iconv \ localbase pkgconfig tar:bzip2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes USE_GNOME= gtk20 glib20 libxml2 cairo gdkpixbuf2 USE_XORG= x11 +CONFLICTS_INSTALL= audacious-plugins-gtk3-3.* + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-console --disable-soxr \ --enable-gnomeshortcuts \ - --enable-gtk --enable-filewriter --enable-hotkey + --enable-gtk --enable-hotkey -OPTIONS_DEFINE= AAC ALSA AMIDI AOSD BS2B CDDA CUE FFMPEG \ - FLAC JACK LAME LIRC MP3 MMS MODPLUG MPRIS NEON NLS NOTIFY \ - OPENGL OSS PULSEAUDIO SAMPLERATE SCROBBLER SDL SID SNDFILE \ - SNDIO SPEEDPITCH VORBIS WAVPACK -OPTIONS_DEFAULT= AAC AOSD CDDA CUE FFMPEG FLAC MP3 \ +OPTIONS_DEFINE= AAC AMIDI AOSD BS2B CDDA CUE FFMPEG FLAC LAME LIRC \ + MMS MODPLUG MPRIS NEON NLS NOTIFY OPENGL SAMPLERATE \ + SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK +OPTIONS_MULTI= OUTPUT +OPTIONS_MULTI_OUTPUT= ALSA FILEWRITER JACK OSS PULSEAUDIO SDL SNDIO +OPTIONS_DEFAULT=AAC AOSD CDDA CUE FILEWRITER FFMPEG FLAC \ MMS MPRIS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK +OPTIONS_SUB= yes +AMIDI_DESC= Amidi decoder +AOSD_DESC= Audacious OSD +BS2B_DESC= BS2B effect +FILEWRITER_DESC=File writer +MPRIS_DESC= NPRIS plugin +NEON_DESC= Neon plugin +SCROBBLER_DESC= Scrobbler decoder +SID_DESC= Sound chip emulator of Commodore +SPEEDPITCH_DESC=Speed and Pitch plugin + AAC_LIB_DEPENDS= libfaad.so:audio/faad -AAC_CONFIGURE_OFF= --disable-aac +AAC_CONFIGURE_ENABLE= aac ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CONFIGURE_OFF= --disable-alsa +ALSA_CONFIGURE_ENABLE= alsa AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -AMIDI_CONFIGURE_OFF= --disable-amidiplug -AOSD_USE= gnome=pango -AOSD_USE= xorg=xrender +AMIDI_CONFIGURE_ENABLE= amidiplug +AOSD_USE= gnome=pango xorg=xrender AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite AOSD_CONFIGURE_ENABLE= aosd BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b -BS2B_CONFIGURE_OFF= --disable-bs2b +BS2B_CONFIGURE_ENABLE= bs2b CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \ libcddb.so:audio/libcddb \ libcdio.so:sysutils/libcdio -CDDA_CONFIGURE_OFF= --disable-cdaudio +CDDA_CONFIGURE_ENABLE= cdaudio CUE_LIB_DEPENDS= libcue.so:textproc/libcue -CUE_CONFIGURE_OFF= --disable-cue +CUE_CONFIGURE_ENABLE= cue +FILEWRITER_CONFIGURE_ENABLE= filewriter FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_WITH= ffmpeg=ffmpeg FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ON= --enable-flac --enable-filewriter -FLAC_CONFIGURE_OFF= --disable-flac --disable-filewriter +FLAC_CONFIGURE_ENABLE= flac JACK_LIB_DEPENDS= libjack.so:audio/jack \ libsamplerate.so:audio/libsamplerate -JACK_CONFIGURE_OFF= --disable-jack +JACK_CONFIGURE_ENABLE= jack LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -LAME_CONFIGURE_OFF= --disable-filewriter_mp3 +LAME_CONFIGURE_ENABLE= filewriter_mp3 LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -LIRC_CONFIGURE_OFF= --disable-lirc -MP3_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MP3_CONFIGURE_OFF= --disable-mp3 +LIRC_CONFIGURE_ENABLE= lirc MMS_LIB_DEPENDS= libmms.so:net/libmms -MMS_CONFIGURE_OFF= --disable-mms +MMS_CONFIGURE_ENABLE= mms MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug -MODPLUG_CONFIGURE_OFF= --disable-modplug +MODPLUG_CONFIGURE_ENABLE= modplug MPRIS_CONFIGURE_ENABLE= mpris2 NEON_LIB_DEPENDS= libneon.so:www/neon -NEON_CONFIGURE_OFF= --disable-neon +NEON_CONFIGURE_ENABLE= neon NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile +NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify -NOTIFY_CONFIGURE_ENABLE= notify +NOTIFY_CONFIGURE_ENABLE=notify +OPENGL_USES= gl OPENGL_USE= xorg=x11 gl=gl -OPENGL_CONFIGURE_ENABLE= glspectrum +OPENGL_CONFIGURE_ENABLE=glspectrum OSS_CONFIGURE_ENABLE= oss4 PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_OFF= --disable-pulse +PULSEAUDIO_CONFIGURE_ENABLE= pulse SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate -SAMPLERATE_CONFIGURE_OFF= --disable-resample +SAMPLERATE_CONFIGURE_ENABLE= resample SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl -SCROBBLER_CONFIGURE_OFF= --disable-scrobbler2 +SCROBBLER_CONFIGURE_ENABLE= scrobbler2 SDL_LIB_DEPENDS= libSDL2.so:devel/sdl20 SDL_CONFIGURE_ON= --enable-sdlout --with-libsdl=2 SDL_CONFIGURE_OFF= --disable-sdlout SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp -SID_CONFIGURE_OFF= --disable-sid +SID_CONFIGURE_ENABLE= sid SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile -SNDFILE_CONFIGURE_OFF= --disable-sndfile +SNDFILE_CONFIGURE_ENABLE= sndfile SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ENABLE= sndio -SPEEDPITCH_CONFIGURE_OFF= --disable-speedpitch +SPEEDPITCH_CONFIGURE_ENABLE= speedpitch SPEEDPITCH_IMPLIES= SAMPLERATE VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg -VORBIS_CONFIGURE_ENABLE= vorbis +VORBIS_CONFIGURE_ENABLE=vorbis WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack -WAVPACK_CONFIGURE_OFF= --disable-wavpack +WAVPACK_CONFIGURE_ENABLE= wavpack OPTIONS_SUB= yes -AMIDI_DESC= Amidi decoder -AOSD_DESC= Audacious OSD -BS2B_DESC= BS2B effect -SCROBBLER_DESC= Scrobbler decoder -SID_DESC= Sound chip emulator of Commodore -NEON_DESC= Neon plugin -SPEEDPITCH_DESC=Speed and Pitch plugin -MPRIS_DESC= NPRIS plugin - post-patch: @${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ ${WRKSRC}/buildsys.mk.in @@ -126,6 +125,9 @@ @${FIND} ${WRKSRC} -type f -name 'Makefile' \ | ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||' +post-patch-NLS-off: + ${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile + post-install: @${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \ -exec ${STRIP_CMD} {} \; Index: multimedia/audacious-plugins/distinfo =================================================================== --- multimedia/audacious-plugins/distinfo (revision 480010) +++ multimedia/audacious-plugins/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506363579 -SHA256 (audacious-plugins-3.9.tar.bz2) = 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8 -SIZE (audacious-plugins-3.9.tar.bz2) = 1843084 +TIMESTAMP = 1537198433 +SHA256 (audacious-plugins-3.10.tar.bz2) = 5061ebb20169eb4d3f15aafbe83b43363762dc8d19ca0cd83f5556dc577e618f +SIZE (audacious-plugins-3.10.tar.bz2) = 1701877 Index: multimedia/audacious-plugins/files/extra-patch-Makefile =================================================================== --- multimedia/audacious-plugins/files/extra-patch-Makefile (revision 480010) +++ multimedia/audacious-plugins/files/extra-patch-Makefile (nonexistent) @@ -1,8 +0,0 @@ ---- Makefile.orig 2015-11-07 23:04:08 UTC -+++ Makefile -@@ -1,4 +1,4 @@ --SUBDIRS = src po -+SUBDIRS = src - - DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk - Property changes on: multimedia/audacious-plugins/files/extra-patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: multimedia/audacious-plugins/files/patch-buildsys.mk.in =================================================================== --- multimedia/audacious-plugins/files/patch-buildsys.mk.in (revision 480010) +++ multimedia/audacious-plugins/files/patch-buildsys.mk.in (nonexistent) @@ -1,11 +0,0 @@ ---- buildsys.mk.in.orig 2016-09-22 01:16:40 UTC -+++ buildsys.mk.in -@@ -205,7 +205,7 @@ pre-depend: - - ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} - ${LINK_STATUS} -- if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ -+ if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \ - ${LINK_OK}; \ - else \ - ${LINK_FAILED}; \ Property changes on: multimedia/audacious-plugins/files/patch-buildsys.mk.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: multimedia/audacious-plugins/pkg-plist =================================================================== --- multimedia/audacious-plugins/pkg-plist (revision 480010) +++ multimedia/audacious-plugins/pkg-plist (working copy) @@ -22,7 +22,6 @@ %%AOSD%%lib/audacious/General/aosd.so %%CDDA%%lib/audacious/General/cd-menu-items.so lib/audacious/General/delete-files.so -lib/audacious/General/gnomeshortcuts.so lib/audacious/General/gtkui.so lib/audacious/General/hotkey.so %%LIRC%%lib/audacious/General/lirc.so @@ -36,12 +35,11 @@ lib/audacious/General/song_change.so lib/audacious/General/statusicon.so %%AAC%%lib/audacious/Input/aac-raw.so -lib/audacious/Input/adplug.so %%AMIDI%%lib/audacious/Input/amidi-plug.so %%CDDA%%lib/audacious/Input/cdaudio-ng.so %%FFMPEG%%lib/audacious/Input/ffaudio.so %%FLAC%%lib/audacious/Input/flacng.so -%%MP3%%lib/audacious/Input/madplug.so +lib/audacious/Input/madplug.so lib/audacious/Input/metronom.so %%MODPLUG%%lib/audacious/Input/modplug.so lib/audacious/Input/psf2.so @@ -53,7 +51,7 @@ %%WAVPACK%%lib/audacious/Input/wavpack.so lib/audacious/Input/xsf.so %%ALSA%%lib/audacious/Output/alsa.so -lib/audacious/Output/filewriter.so +%%FILEWRITER%%lib/audacious/Output/filewriter.so %%JACK%%lib/audacious/Output/jack-ng.so %%OSS%%lib/audacious/Output/oss4.so %%PULSEAUDIO%%lib/audacious/Output/pulse_audio.so Index: multimedia/audacious-plugins-gtk3/Makefile =================================================================== --- multimedia/audacious-plugins-gtk3/Makefile (revision 480010) +++ multimedia/audacious-plugins-gtk3/Makefile (working copy) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= audacious-plugins -PORTVERSION= 3.9 +PORTVERSION= 3.10 DISTVERSIONSUFFIX= -gtk3 -PORTREVISION= 5 CATEGORIES= multimedia audio #MASTER_SITES= http://distfiles.audacious-media-player.org/ PKGNAMESUFFIX= ${DISTVERSIONSUFFIX} @@ -13,12 +12,14 @@ COMMENT= Plugins needed for audacious-gtk3 LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= audacious:multimedia/audacious-gtk3 LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libdbus-1.so:devel/dbus \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libdbus-1.so:devel/dbus \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libmpg123.so:audio/mpg123 RUN_DEPENDS= audacious:multimedia/audacious-gtk3 CONFLICTS_INSTALL= audacious-plugins-3.* @@ -27,109 +28,107 @@ DISTINFO_FILE= ${.CURDIR}/distinfo FILESDIR= ${MASTERDIR}/files -USES= autoreconf compiler:c++11-lib gettext-tools gmake iconv \ - localbase pkgconfig +USES= autoreconf compiler:c++11-lib gettext-tools gmake gnome \ + iconv localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= audacious-media-player -GH_TAGNAME= 9c44e5e +GH_TAGNAME= 4cf5e07 GNU_CONFIGURE= yes -USE_LDCONFIG= yes USE_GNOME= gtk30 glib20 libxml2 cairo gdkpixbuf2 USE_XORG= x11 CONFIGURE_ARGS+=--disable-console --disable-soxr \ - --enable-gnomeshortcuts \ - --enable-gtk --enable-filewriter --enable-hotkey + --enable-gnomeshortcuts \ + --enable-gtk --enable-hotkey -OPTIONS_DEFINE= AAC ALSA AMIDI AOSD BS2B CDDA CUE FFMPEG \ - FLAC JACK LAME LIRC MP3 MMS MODPLUG MPRIS NEON NLS NOTIFY \ - OPENGL OSS PULSEAUDIO SAMPLERATE SCROBBLER SDL SID SNDFILE \ - SNDIO SPEEDPITCH VORBIS WAVPACK -OPTIONS_DEFAULT= AAC AOSD CDDA CUE FFMPEG FLAC MP3 \ - MMS MPRIS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK +OPTIONS_DEFINE= AAC AMIDI AOSD BS2B CDDA CUE FFMPEG FLAC LAME LIRC \ + MMS MODPLUG MPRIS NEON NLS NOTIFY OPENGL SAMPLERATE \ + SCROBBLER SID SNDFILE SPEEDPITCH VORBIS WAVPACK +OPTIONS_MULTI= OUTPUT +OPTIONS_MULTI_OUTPUT= ALSA FILEWRITER JACK OSS PULSEAUDIO SDL SNDIO +OPTIONS_DEFAULT=AAC AOSD CDDA CUE FILEWRITER FFMPEG FLAC \ + MMS MPRIS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK +OPTIONS_SUB= yes +AMIDI_DESC= Amidi decoder +AOSD_DESC= Audacious OSD +BS2B_DESC= BS2B effect +FILEWRITER_DESC=File writer +MPRIS_DESC= NPRIS plugin +NEON_DESC= Neon plugin +SCROBBLER_DESC= Scrobbler decoder +SID_DESC= Sound chip emulator of Commodore +SPEEDPITCH_DESC=Speed and Pitch plugin + AAC_LIB_DEPENDS= libfaad.so:audio/faad -AAC_CONFIGURE_OFF= --disable-aac +AAC_CONFIGURE_ENABLE= aac ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CONFIGURE_OFF= --disable-alsa +ALSA_CONFIGURE_ENABLE= alsa AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -AMIDI_CONFIGURE_OFF= --disable-amidiplug -AOSD_USE= gnome=pango -AOSD_USE= xorg=xrender +AMIDI_CONFIGURE_ENABLE= amidiplug +AOSD_USE= gnome=pango xorg=xrender AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite AOSD_CONFIGURE_ENABLE= aosd BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b -BS2B_CONFIGURE_OFF= --disable-bs2b +BS2B_CONFIGURE_ENABLE= bs2b CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \ - libcddb.so:audio/libcddb \ - libcdio.so:sysutils/libcdio -CDDA_CONFIGURE_OFF= --disable-cdaudio + libcddb.so:audio/libcddb \ + libcdio.so:sysutils/libcdio +CDDA_CONFIGURE_ENABLE= cdaudio CUE_LIB_DEPENDS= libcue.so:textproc/libcue -CUE_CONFIGURE_OFF= --disable-cue +CUE_CONFIGURE_ENABLE= cue +FILEWRITER_CONFIGURE_ENABLE= filewriter FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_WITH= ffmpeg=ffmpeg FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ON= --enable-flac --enable-filewriter -FLAC_CONFIGURE_OFF= --disable-flac --disable-filewriter +FLAC_CONFIGURE_ENABLE= flac JACK_LIB_DEPENDS= libjack.so:audio/jack \ - libsamplerate.so:audio/libsamplerate -JACK_CONFIGURE_OFF= --disable-jack + libsamplerate.so:audio/libsamplerate +JACK_CONFIGURE_ENABLE= jack LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -LAME_CONFIGURE_OFF= --disable-filewriter_mp3 +LAME_CONFIGURE_ENABLE= filewriter_mp3 LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -LIRC_CONFIGURE_OFF= --disable-lirc -MP3_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MP3_CONFIGURE_OFF= --disable-mp3 +LIRC_CONFIGURE_ENABLE= lirc MMS_LIB_DEPENDS= libmms.so:net/libmms -MMS_CONFIGURE_OFF= --disable-mms +MMS_CONFIGURE_ENABLE= mms MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug -MODPLUG_CONFIGURE_OFF= --disable-modplug +MODPLUG_CONFIGURE_ENABLE= modplug MPRIS_CONFIGURE_ENABLE= mpris2 NEON_LIB_DEPENDS= libneon.so:www/neon -NEON_CONFIGURE_OFF= --disable-neon -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile +NEON_CONFIGURE_ENABLE= neon +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify -NOTIFY_CONFIGURE_ENABLE= notify -OPENGL_USE= xorg=x11 gl=gl -OPENGL_CONFIGURE_ENABLE= glspectrum +NOTIFY_CONFIGURE_ENABLE=notify +OPENGL_USES= gl +OPENGL_USE= xorg=x11 gl=gl +OPENGL_CONFIGURE_ENABLE=glspectrum OSS_CONFIGURE_ENABLE= oss4 PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_OFF= --disable-pulse +PULSEAUDIO_CONFIGURE_ENABLE= pulse SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate -SAMPLERATE_CONFIGURE_OFF= --disable-resample +SAMPLERATE_CONFIGURE_ENABLE= resample SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl -SCROBBLER_CONFIGURE_OFF= --disable-scrobbler2 +SCROBBLER_CONFIGURE_ENABLE= scrobbler2 SDL_LIB_DEPENDS= libSDL2.so:devel/sdl20 SDL_CONFIGURE_ON= --enable-sdlout --with-libsdl=2 SDL_CONFIGURE_OFF= --disable-sdlout SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp -SID_CONFIGURE_OFF= --disable-sid +SID_CONFIGURE_ENABLE= sid SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile -SNDFILE_CONFIGURE_OFF= --disable-sndfile +SNDFILE_CONFIGURE_ENABLE= sndfile SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ENABLE= sndio -SPEEDPITCH_CONFIGURE_OFF= --disable-speedpitch +SPEEDPITCH_CONFIGURE_ENABLE= speedpitch SPEEDPITCH_IMPLIES= SAMPLERATE VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ - libogg.so:audio/libogg -VORBIS_CONFIGURE_ENABLE= vorbis + libogg.so:audio/libogg +VORBIS_CONFIGURE_ENABLE=vorbis WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack -WAVPACK_CONFIGURE_OFF= --disable-wavpack -OPTIONS_SUB= yes +WAVPACK_CONFIGURE_ENABLE= wavpack -AMIDI_DESC= Amidi decoder -AOSD_DESC= Audacious OSD -BS2B_DESC= BS2B effect -SCROBBLER_DESC= Scrobbler decoder -SID_DESC= Sound chip emulator of Commodore -NEON_DESC= Neon plugin -SPEEDPITCH_DESC=Speed and Pitch plugin -MPRIS_DESC= NPRIS plugin - post-patch: ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ ${WRKSRC}/buildsys.mk.in @@ -136,6 +135,9 @@ ${FIND} ${WRKSRC} -type f -name 'Makefile' \ | ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||' +post-patch-NLS-off: + ${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile + post-install: @${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \ -exec ${STRIP_CMD} {} \; Index: multimedia/audacious-plugins-gtk3/distinfo =================================================================== --- multimedia/audacious-plugins-gtk3/distinfo (revision 480010) +++ multimedia/audacious-plugins-gtk3/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506369854 -SHA256 (audacious-media-player-audacious-plugins-3.9-gtk3-9c44e5e_GH0.tar.gz) = bfcae7c2312aeee360ac30be494ac0e97629af21b8823afa501abdbf19d5fcde -SIZE (audacious-media-player-audacious-plugins-3.9-gtk3-9c44e5e_GH0.tar.gz) = 2749596 +TIMESTAMP = 1537259830 +SHA256 (audacious-media-player-audacious-plugins-3.10-gtk3-4cf5e07_GH0.tar.gz) = 513e4e4151955e149b51e8604d5fb94845afe51bd03a47ee63dbe4e53ef8bdd0 +SIZE (audacious-media-player-audacious-plugins-3.10-gtk3-4cf5e07_GH0.tar.gz) = 2579889