Attachment 147989 Details for Bug 194153 – shairport_1.1.1.diff

[patch] shairport_1.1.1.diff

shairport_1.1.1.diff (text/plain), 6.66 KB, created by Steve Wills on 2014-10-05 04:34:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2014-10-05 04:34:31 UTC

Size: 6.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 369841)
>+++ Makefile	(working copy)
>@@ -2,57 +2,42 @@
> # $FreeBSD$
> 
> PORTNAME=	shairport
>-PORTVERSION=	0.05
>-PORTREVISION=	1
>+PORTVERSION=	1.1.1
> CATEGORIES=	audio
>-MASTER_SITES=	http://cloud.github.com/downloads/miks/${PORTNAME}/
>-DISTNAME=	miks-${PORTNAME}-${REV}
>+MASTER_SITES=	https://github.com/abrasive/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
> 
> MAINTAINER=	miks.mikelsons@gmail.com
> COMMENT=	Airtunes emulator
> 
> LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
>-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
>-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
>-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
>-		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
>-		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
>-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
>-		avahi-publish-service:${PORTSDIR}/net/avahi-app
>+RUN_DEPENDS=	avahi-publish-service:${PORTSDIR}/net/avahi-app
> 
>-USES=		gmake perl5 pkgconfig
>-USE_PERL5=	run
>+USES=		gmake pkgconfig
> USE_OPENSSL=	yes
> 
> USE_RC_SUBR=	${PORTNAME}
>-SUB_LIST=	PERL=${PERL}
> 
>-PLIST_FILES=	bin/${PORTNAME} bin/hairtunes bin/${PORTNAME}.pl
>+PLIST_FILES=	bin/${PORTNAME}
> PORTDOCS=	README.md
> 
>-REV=		b1cb9ea
>-
> OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.options.mk>
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|avahi-|${LOCALBASE}/bin/avahi-|g' \
>-		-e 's|$$FindBin.*|"${PREFIX}/bin/hairtunes";|' \
>-		-e '/use FindBin;/d;s|/usr/bin/env perl|${PERL}|' \
>-		${WRKSRC}/shairport.c ${WRKSRC}/shairport.pl
>-	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' ${WRKSRC}/Makefile
>+	@${ECHO_CMD} '"'${PORTVERSION}'"' > ${WRKSRC}/version.h
> 
>+do-configure:
>+	cd ${WRKSRC} ; ./configure
>+
> do-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin
>-.for file in ${PORTNAME} hairtunes
>-	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
>-.endfor
> .if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for i in ${PORTDOCS}
> 	${INSTALL_DATA} -p ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
> .endfor
> .endif
>+	cd ${WRKSRC} ; ${GMAKE} PREFIX=${STAGEDIR}${PREFIX} install
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/shairport
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 369841)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (miks-shairport-b1cb9ea.tar.gz) = daf55530ba1fecb5a6b5a4c770c97e44cb0ca59a58cd87451975635197e1304f
>-SIZE (miks-shairport-b1cb9ea.tar.gz) = 40425
>+SHA256 (shairport-1.1.1.tar.gz) = 1b60df6d40bab874c1220d7daecd68fcff3e47bda7c6d7f91db0a5b5c43c0c72
>+SIZE (shairport-1.1.1.tar.gz) = 59487
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 0)
>+++ files/patch-Makefile	(working copy)
>@@ -0,0 +1,22 @@
>+--- Makefile.orig	2014-10-05 01:39:58 UTC
>++++ Makefile
>+@@ -48,19 +48,9 @@
>+ 	install -m 755 -d $(PREFIX)/bin
>+ 	install -m 755 shairport $(PREFIX)/bin/shairport
>+ 
>+-GITREV=$(shell git describe --always)
>+-DIRTY:=$(shell if ! git diff --quiet --exit-code; then echo -dirty; fi)
>+-VERSION=\"$(GITREV)$(DIRTY)\"
>+-__version_file:
>+-	@if [ ! -f version.h -o "`cat .version 2>/dev/null`" != '$(VERSION)' ]; then \
>+-		echo $(VERSION) > version.h; \
>+-	fi
>+-
>+ %.o: %.c $(DEPS)
>+ 	$(CC) -c $(CFLAGS) $<
>+ 
>+-shairport.o: __version_file
>+-
>+ OBJS := $(SRCS:.c=.o)
>+ shairport: $(OBJS)
>+ 	$(CC) $(OBJS) $(LDFLAGS) -o shairport
>
>Property changes on: files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 0)
>+++ files/patch-configure	(working copy)
>@@ -0,0 +1,31 @@
>+--- configure.orig	2014-07-01 11:54:43 UTC
>++++ configure
>+@@ -1,6 +1,6 @@
>+ #!/bin/sh
>+ 
>+-[ -z "${CC}" ] && CC=gcc
>++[ -z "${CC}" ] && CC=cc
>+ 
>+ echo Configuring Shairport
>+ 
>+@@ -59,7 +59,7 @@
>+     fi
>+ }
>+ 
>+-do_pkg_config OpenSSL       openssl
>++do_pkg_config OpenSSL       openssl         CONFIG_OPENSSL
>+ do_pkg_config libao         ao              CONFIG_AO
>+ do_pkg_config PulseAudio    libpulse-simple CONFIG_PULSE
>+ do_pkg_config ALSA          alsa            CONFIG_ALSA
>+@@ -80,9 +80,9 @@
>+ 
>+ 
>+ echo "CFLAGS+=${CFLAGS}" >> config.mk
>+-echo "LDFLAGS+=${LDFLAGS}" >> config.mk
>++echo "LDFLAGS+=${LDFLAGS} -lcrypto" >> config.mk
>+ 
>+ echo CFLAGS: ${CFLAGS}
>+-echo LDFLAGS: ${LDFLAGS}
>++echo LDFLAGS: ${LDFLAGS} -lcrypto
>+ 
>+ echo "Configure successful. You may now build with 'make'"
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: files/patch-shairport.pl
>===================================================================
>--- files/patch-shairport.pl	(revision 369841)
>+++ files/patch-shairport.pl	(working copy)
>@@ -1,18 +0,0 @@
>---- shairport.pl.orig	2012-01-08 22:34:35.000000000 +1000
>-+++ shairport.pl	2012-01-08 22:34:14.000000000 +1000
>-@@ -270,6 +270,7 @@
>- $avahi_publish = fork();
>- my $pw_clause = (length $password) ? "pw=true" : "pw=false";
>- if ($avahi_publish==0) {
>-+    open STDERR,  "/dev/null"; # suppress output from avahi-publish-service
>-     { exec 'avahi-publish-service',
>-         join('', map { sprintf "%02X", $_ } @hw_addr) . "\@$apname",
>-         "_raop._tcp",
>-@@ -329,7 +330,6 @@
>- 
>- if ($daemon) {
>-     chdir "/" or die "Could not chdir to '/': $!";
>--    umask 0;
>-     open STDIN, "/dev/null" or die "Could not redirect /dev/null to STDIN(0): $!";
>-     open STDOUT, ">/dev/null" or die "Could not redirect STDOUT(1) to /dev/null: $!";
>-     defined( my $pid = fork() ) or die "Could not fork: $!";
>Index: files/shairport.in
>===================================================================
>--- files/shairport.in	(revision 369841)
>+++ files/shairport.in	(working copy)
>@@ -27,11 +27,10 @@
> : ${shairport_enable="NO"}
> : ${shairport_user="nobody"}
> 
>-command="%%PREFIX%%/bin/${name}.pl"
>+command="%%PREFIX%%/bin/${name}"
> pidfile="/var/run/${name}/${name}.pid"
>-command_interpreter="%%PERL%%"
> 
>-command_args="-d -w ${pidfile}"
>+command_args="-d -P ${pidfile}"
> start_precmd="install -d -o ${shairport_user} -g wheel -m 755 /var/run/${name}"
> 
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 194153: 147989