Index: head/multimedia/butt/Makefile =================================================================== --- head/multimedia/butt/Makefile (revision 534855) +++ head/multimedia/butt/Makefile (revision 534856) @@ -1,33 +1,32 @@ # $FreeBSD$ PORTNAME= butt -PORTVERSION= 0.1.18 -PORTREVISION= 1 +PORTVERSION= 0.1.20 CATEGORIES= multimedia graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= pi@FreeBSD.org COMMENT= Broadcast SHOUTcast and Icecast streams LICENSE= GPLv2 LIB_DEPENDS= libdbus-1.so:devel/dbus \ libFLAC.so:audio/flac \ libfdk-aac.so:audio/fdk-aac \ libfltk_images.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libmp3lame.so:audio/lame \ libogg.so:audio/libogg \ libopus.so:audio/opus \ libpng.so:graphics/png \ libportaudio.so:audio/portaudio \ libsamplerate.so:audio/libsamplerate \ libvorbis.so:audio/libvorbis -USES= autoreconf compiler:c++11-lang gmake jpeg pkgconfig xorg +USES= autoreconf compiler:c++11-lang gmake jpeg pkgconfig xorg ssl uidfix USE_XORG= x11 xrender xcursor xfixes xext xft xinerama GNU_CONFIGURE= yes PLIST_FILES= bin/butt .include Index: head/multimedia/butt/distinfo =================================================================== --- head/multimedia/butt/distinfo (revision 534855) +++ head/multimedia/butt/distinfo (revision 534856) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562349284 -SHA256 (butt-0.1.18.tar.gz) = e812b4058a85c7de3733ff85f513e24891afe541eac399cba535b44490c00595 -SIZE (butt-0.1.18.tar.gz) = 968135 +TIMESTAMP = 1589118346 +SHA256 (butt-0.1.20.tar.gz) = e3f75fc2740bd92801d737f1985f5d662922f4c1f4c76eb0be6d75fe9758c70f +SIZE (butt-0.1.20.tar.gz) = 986757 Index: head/multimedia/butt/files/patch-configure.ac =================================================================== --- head/multimedia/butt/files/patch-configure.ac (revision 534855) +++ head/multimedia/butt/files/patch-configure.ac (revision 534856) @@ -1,56 +1,65 @@ ---- configure.ac.orig 2019-05-12 09:03:53 UTC +--- configure.ac.orig 2020-04-20 14:40:46 UTC +++ configure.ac -@@ -61,6 +61,7 @@ AM_CONDITIONAL(WINDOWS, test "$host_os" = "windows") +@@ -64,6 +64,7 @@ AM_CONDITIONAL(WINDOWS, test "$host_os" = "windows") build_linux=no +build_freebsd=no build_windows=no build_mac=no -@@ -75,6 +76,15 @@ case "${host_os}" in +@@ -88,6 +89,25 @@ case "${host_os}" in ) ]) ;; -+ freebsd*) ++ freebsd*) + build_freebsd=yes + AC_MSG_NOTICE([FreeBSD detected]) -+ AS_IF([test "x$enable_aac" != "xno"], [ ++ ++ AS_IF([test "x$enable_aac" != "xno"], ++ [ + AC_CHECK_LIB([fdk-aac], [aacEncOpen], [], + [AC_MSG_ERROR([**** Could not find libfdk-aac ****])] ++ ) ++ ]) ++ AS_IF([test "x$enable_ssl" != "xno"], [ ++ AC_CHECK_LIB([crypto], [EVP_EncryptInit], [], ++ [AC_MSG_ERROR([**** Could not find libcrypto ****])] + ) ++ AC_CHECK_LIB([ssl], [SSL_CTX_new], [], ++ [AC_MSG_ERROR([**** Could not find libssl ****])] ++ ) + ]) + ;; cygwin*|mingw*|windows) build_windows=yes AC_MSG_NOTICE([Windows detected]) -@@ -90,6 +100,7 @@ esac +@@ -109,6 +129,7 @@ esac # Pass the conditionals to automake AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"]) -+AM_CONDITIONAL([FREEBSD], [test "$build_freebsd" = "yes"]) ++AM_CONDITIONAL([FreeBSD], [test "$build_freebsd" = "yes"]) AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"]) AM_CONDITIONAL([OSX], [test "$build_mac" = "yes"]) -@@ -121,6 +132,21 @@ if test "$build_linux" = "yes"; then - AC_MSG_ERROR([**** Coud not find dbus dev files]) - ]) - fi -+ -+#Add dbus library for FreeBSD -+if test "$build_freebsd" = "yes"; then +@@ -129,6 +150,20 @@ fi + + #Add dbus library for Linux + if test "$build_linux" = "yes"; then + AC_MSG_NOTICE([]) + PKG_CHECK_MODULES([DBUS], [dbus-1], [ + AC_DEFINE([HAVE_DBUS], [1], [Use dbus to get current tracks]) + LIBS="$LIBS $DBUS_LIBS" + CFLAGS="$CFLAGS $LIBS $DBUS_CFLAGS" + CXXFLAGS="$CXXFLAGS $DBUS_CFLAGS" + ], [ + AC_DEFINE([HAVE_DBUS], [0], [Use dbus to get current tracks]) + AC_MSG_ERROR([**** Coud not find dbus dev files]) + ]) +fi + - - # Checks for header files. - AC_PATH_X ++#Add dbus library for FreeBSD ++if test "$build_freebsd" = "yes"; then + AC_MSG_NOTICE([]) + PKG_CHECK_MODULES([DBUS], [dbus-1], [ + AC_DEFINE([HAVE_DBUS], [1], [Use dbus to get current tracks]) Index: head/multimedia/butt/files/patch-src_Makefile.am =================================================================== --- head/multimedia/butt/files/patch-src_Makefile.am (revision 534855) +++ head/multimedia/butt/files/patch-src_Makefile.am (revision 534856) @@ -1,13 +1,13 @@ ---- src/Makefile.am.orig 2019-04-21 18:20:26 UTC +--- src/Makefile.am.orig 2020-04-21 11:35:33 UTC +++ src/Makefile.am @@ -34,6 +34,10 @@ if LINUX butt_SOURCES += currentTrack.h currentTrackLinux.cpp endif -+if FREEBSD ++if FreeBSD +butt_SOURCES += currentTrack.h currentTrackLinux.cpp +endif + # used only under MinGW to compile the resource.rc file (manifest and program icon) .rc.o: