[145178] trunk/dports/audio/pianobar

27 Jan 2016

Revision: 145178
          https://trac.macports.org/changeset/145178
Author:   ryandesign@macports.org
Date:     2016-01-27 15:53:51 -0800 (Wed, 27 Jan 2016)
Log Message:
-----------
pianobar: update to 2015.11.22, fixing TLS network error (#40050); disable silent rules

Modified Paths:
--------------
    trunk/dports/audio/pianobar/Portfile
    trunk/dports/audio/pianobar/files/patch-Makefile.diff

Modified: trunk/dports/audio/pianobar/Portfile
===================================================================

--- trunk/dports/audio/pianobar/Portfile	2016-01-27 21:24:45 UTC (rev 145177)
+++ trunk/dports/audio/pianobar/Portfile	2016-01-27 23:53:51 UTC (rev 145178)
@@ -4,7 +4,7 @@
 PortSystem                  1.0
 PortGroup                   github 1.0
 
-github.setup                PromyLOPh pianobar 2014.09.28
+github.setup                PromyLOPh pianobar 2015.11.22
 categories                  audio
 platforms                   darwin
 maintainers                 gmail.com:aguynamedryan+pianobar
@@ -20,17 +20,23 @@
                             configure keybindings, last.fm scrobbling, \
                             proxy support for listening outside of USA.
 
-checksums                   rmd160  010e3643641b2d4cbbb0223c1ae37f864a8d6a21 \
-                            sha256  7ddc7a651f0185451f7c457dcb9587c445d1a738a620bc16fb358f68f8938d2b
+checksums                   rmd160  375d9a1a4a8a879df98affe9ed063d779f7b822e \
+                            sha256  120f34fa70c34c12194b7c350952c9d5fd706b820bdd49cb139dabe785499bc9
 
 depends_build               port:pkgconfig
 
 depends_lib                 path:lib/libavcodec.dylib:ffmpeg \
-                            port:gnutls \
                             port:libao \
                             port:libgcrypt \
                             port:json-c
 
+post-patch {
+    # Disable silent rules.
+    # https://github.com/PromyLOPh/pianobar/issues/571
+    reinplace -E "s/^(\t+)@(\\\$\{)/\\1\\2/" ${worksrcpath}/Makefile
+    reinplace -E "/^\t+@echo \" /d" ${worksrcpath}/Makefile
+}
+
 configure.cflags-append     -std=c99
 
 # Prevent upgrade failure.
@@ -47,7 +53,12 @@
 
 destroot.args               PREFIX=${prefix}
 
+if {${subport} eq ${name}} {
+    depends_lib-append      port:curl
+}
+
 subport libpiano {
+    depends_lib-append      port:gnutls
     build.target            libpiano.so.0
     destroot.target         install-libpiano
     platform darwin {

Modified: trunk/dports/audio/pianobar/files/patch-Makefile.diff
===================================================================
--- trunk/dports/audio/pianobar/files/patch-Makefile.diff	2016-01-27 21:24:45 UTC (rev 145177)
+++ trunk/dports/audio/pianobar/files/patch-Makefile.diff	2016-01-27 23:53:51 UTC (rev 145178)
@@ -1,51 +1,50 @@
---- Makefile.orig	2014-09-28 08:17:29.000000000 -0500
-+++ Makefile	2014-12-18 14:29:33.000000000 -0600
-@@ -95,7 +95,7 @@
+--- Makefile.orig	2015-11-22 04:31:27.000000000 -0800
++++ Makefile	2016-01-27 15:18:12.000000000 -0800
+@@ -71,7 +71,7 @@
  
  # build pianobar
  ifeq (${DYNLINK},1)
--pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.0
-+pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.0.dylib
+-pianobar: ${PIANOBAR_OBJ} libpiano.so.0
++pianobar: ${PIANOBAR_OBJ} libpiano.0.dylib
  	@echo "  LINK  $@"
  	@${CC} -o $@ ${PIANOBAR_OBJ} -L. -lpiano ${ALL_LDFLAGS}
  else
-@@ -107,13 +107,13 @@
+@@ -81,12 +81,12 @@
  endif
  
  # build shared and static libpiano
--libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
-+libpiano.0.dylib: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
- 		${LIBWAITRESS_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
+-libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_OBJ}
++libpiano.0.dylib: ${LIBPIANO_RELOBJ} ${LIBPIANO_OBJ}
  	@echo "  LINK  $@"
 -	@${CC} -shared -Wl,-soname,libpiano.so.0 -o libpiano.so.0.0.0 \
 +	@${CC} -dynamiclib -Wl,-install_name,${LIBDIR}/libpiano.0.dylib -o libpiano.0.0.0.dylib \
- 			${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} ${ALL_LDFLAGS}
--	@ln -s libpiano.so.0.0.0 libpiano.so.0
--	@ln -s libpiano.so.0 libpiano.so
-+	@ln -s libpiano.0.0.0.dylib libpiano.0.dylib
-+	@ln -s libpiano.0.dylib libpiano.dylib
+ 			${LIBPIANO_RELOBJ} ${ALL_LDFLAGS}
+-	@ln -fs libpiano.so.0.0.0 libpiano.so.0
+-	@ln -fs libpiano.so.0 libpiano.so
++	@ln -fs libpiano.0.0.0.dylib libpiano.0.dylib
++	@ln -fs libpiano.0.dylib libpiano.dylib
  	@echo "    AR  libpiano.a"
- 	@${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
+ 	@${AR} rcs libpiano.a ${LIBPIANO_OBJ}
  
-@@ -135,7 +135,7 @@
+@@ -107,7 +107,7 @@
  clean:
  	@echo " CLEAN"
- 	@${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \
--			${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} pianobar libpiano.so* \
-+			${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} pianobar libpiano*.dylib \
- 			libpiano.a waitress-test $(PIANOBAR_SRC:.c=.d) $(LIBPIANO_SRC:.c=.d) \
- 			$(LIBWAITRESS_SRC:.c=.d)
+ 	@${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
+-			${LIBPIANO_RELOBJ} pianobar libpiano.so* \
++			${LIBPIANO_RELOBJ} pianobar libpiano*.dylib \
+ 			libpiano.a $(PIANOBAR_SRC:.c=.d) $(LIBPIANO_SRC:.c=.d)
  
-@@ -159,9 +159,9 @@
+ all: pianobar
+@@ -124,9 +124,9 @@
  
  install-libpiano:
  	install -d ${DESTDIR}${LIBDIR}/
 -	install -m644 libpiano.so.0.0.0 ${DESTDIR}${LIBDIR}/
--	ln -s libpiano.so.0.0.0 ${DESTDIR}${LIBDIR}/libpiano.so.0
--	ln -s libpiano.so.0 ${DESTDIR}${LIBDIR}/libpiano.so
+-	ln -fs libpiano.so.0.0.0 ${DESTDIR}${LIBDIR}/libpiano.so.0
+-	ln -fs libpiano.so.0 ${DESTDIR}${LIBDIR}/libpiano.so
 +	install -m644 libpiano.0.0.0.dylib ${DESTDIR}${LIBDIR}/
-+	ln -s libpiano.0.0.0.dylib ${DESTDIR}${LIBDIR}/libpiano.0.dylib
-+	ln -s libpiano.0.dylib ${DESTDIR}${LIBDIR}/libpiano.dylib
++	ln -fs libpiano.0.0.0.dylib ${DESTDIR}${LIBDIR}/libpiano.0.dylib
++	ln -fs libpiano.0.dylib ${DESTDIR}${LIBDIR}/libpiano.dylib
  	install -m644 libpiano.a ${DESTDIR}${LIBDIR}/
  	install -d ${DESTDIR}${INCDIR}/
  	install -m644 src/libpiano/piano.h ${DESTDIR}${INCDIR}/

    

ryandesign＠macports.org

tags

participants (1)