On Mon, 19 Apr 2010, Jacob Meuser wrote:
> On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:
> >
> > here's an update on what non-sndio using ports are left. this may be
> > missing a few that also have sndio support. currently xmms and jack
> > build audio(4) backends, but they will both be gone soon. if you
> > know of a port that uses audio(4) or ossaudio(3) and isn't listed here,
> > let me know.
> >
> > if you have tested or would like to test any of the "patches sent" or
> > WIPs let me know too.
>
> and if you plan on updating any of the ports, let me know *NOW* before
> I spend *HOURS* to make them work, only to have that work be worthless.
> thanks.
Hi,
here's an update for audio/shell-fm.
I've removed ossaudio dep and updated it to the latest version (0.7).
Tested on i386 by listening to many tunes ;)
ciao
david
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/shell-fm/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 6 Mar 2009 21:24:52 -0000 1.2
+++ Makefile 21 Apr 2010 09:47:21 -0000
@@ -1,31 +1,39 @@
# $OpenBSD: Makefile,v 1.2 2009/03/06 21:24:52 jasper Exp $
-COMMENT= console based player for last.fm radio streams
+COMMENT = console based player for last.fm radio streams
-DISTNAME= shell-fm-0.6
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= audio
-EXTRACT_SUFX= .tar.bz2
+V = 0.7
+DISTNAME = jkramer-shell-fm-v${V}-0-gc274aa5
+PKGNAME = shell-fm-${V}
+CATEGORIES = audio
-HOMEPAGE= http://nex.scrapping.cc/code/shell-fm/
+HOMEPAGE = http://nex.scrapping.cc/shell-fm/
-MAINTAINER= Guillaume Pinot <guillaume.pi...@tremplin-utc.net>
+MAINTAINER = Guillaume Pinot <guillaume.pi...@tremplin-utc.net>
# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
-MASTER_SITES= ${HOMEPAGE}/downloads/
+MASTER_SITES = http://github.com/jkramer/shell-fm/tarball/v${V}/
-LIB_DEPENDS= ao::audio/libao \
- mad::audio/libmad
-WANTLIB= c m ossaudio
+LIB_DEPENDS = ao::audio/libao \
+ mad::audio/libmad \
+ tag,tag_c::audio/taglib
-USE_GMAKE= yes
-FAKE_FLAGS= DESTDIR="${WRKINST}${PREFIX}"
+WANTLIB = c m
-NO_REGRESS= yes
+USE_GMAKE = yes
+
+NO_REGRESS = yes
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/Makefile
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/source/shell-fm ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/manual/shell-fm.1 ${PREFIX}/man/man1/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/shell-fm/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 21 Sep 2008 22:27:31 -0000 1.1.1.1
+++ distinfo 21 Apr 2010 09:47:21 -0000
@@ -1,5 +1,5 @@
-MD5 (shell-fm-0.6.tar.bz2) = 3Isf/t+T31ZfQm8mlDhCqw==
-RMD160 (shell-fm-0.6.tar.bz2) = N0XRXNVm1YoLS7jktD1PlXXwlGc=
-SHA1 (shell-fm-0.6.tar.bz2) = qemimOcLKIXl6b+5+qq9Wv72O5g=
-SHA256 (shell-fm-0.6.tar.bz2) = tm3FG5WzI7MBmMjpWvE2sjK9Piquiz7EDAfK4Ac618c=
-SIZE (shell-fm-0.6.tar.bz2) = 35422
+MD5 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = sYYVyoaciFZpk4UTGWNaLA==
+RMD160 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 8/xtw6YB1VrKtnGIeaKRYsJq+28=
+SHA1 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = hn/OpOJYneCQpwgIkiYaCnWRNVI=
+SHA256 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) =
56gNyr+hP1uTZh9ZGSV74QZLr/c0lGs9xZGPreBB+XY=
+SIZE (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 49281
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/audio/shell-fm/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 21 Sep 2008 22:27:31 -0000 1.1.1.1
+++ patches/patch-Makefile 21 Apr 2010 09:47:21 -0000
@@ -1,10 +1,13 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2008/09/21 22:27:31 jasper Exp $
-
-Don't install compressed man pages.
-
---- Makefile.orig Thu Sep 18 19:29:48 2008
-+++ Makefile Thu Sep 18 19:30:07 2008
-@@ -4,7 +4,7 @@ MANDIR := $(DESTDIR)/man
+$OpenBSD$
+--- Makefile.orig Sun Aug 30 18:55:07 2009
++++ Makefile Wed Apr 21 09:20:12 2010
+@@ -1,12 +1,12 @@
+
+ DESTDIR =
+-PREFIX := /usr
++PREFIX := ${TRUEPREFIX}
+ MANDIR := $(PREFIX)/man
+ DOCDIR := ${PREFIX}/share/doc
.PHONY : shell-fm manual all clean tags cscope
@@ -13,12 +16,3 @@ Don't install compressed man pages.
shell-fm :
$(MAKE) -C source
-@@ -15,7 +15,7 @@ manual :
- install :
- mkdir -p $(DESTDIR)/bin $(MANDIR)/man1
- install source/shell-fm $(DESTDIR)/bin/shell-fm
-- install manual/shell-fm.1.gz $(MANDIR)/man1
-+ install manual/shell-fm.1 $(MANDIR)/man1
-
- install-strip : install
- strip $(DESTDIR)/bin/shell-fm
Index: patches/patch-source_Makefile
===================================================================
RCS file: /cvs/ports/audio/shell-fm/patches/patch-source_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-source_Makefile
--- patches/patch-source_Makefile 21 Sep 2008 22:27:31 -0000 1.1.1.1
+++ patches/patch-source_Makefile 21 Apr 2010 09:47:21 -0000
@@ -1,24 +1,22 @@
-$OpenBSD: patch-source_Makefile,v 1.1.1.1 2008/09/21 22:27:31 jasper Exp $
-
-Respect CFLAGS.
-
---- source/Makefile.orig Fri Sep 19 08:46:46 2008
-+++ source/Makefile Fri Sep 19 08:47:35 2008
-@@ -1,7 +1,7 @@
- SOURCE := $(wildcard *.c)
- OBJECT := $(subst .c,.o,$(SOURCE))
- BINARY := shell-fm
--LDFLAGS := $(shell pkg-config --exists ao && pkg-config ao --libs) \
-+LDFLAGS += $(shell pkg-config --exists ao && pkg-config ao --libs) \
- $(shell pkg-config mad --libs)
- ifeq ($(shell uname -s), OpenBSD)
- LDFLAGS += -lossaudio
-@@ -10,7 +10,7 @@ ifeq ($(shell uname -s), NetBSD)
+$OpenBSD$
+--- source/Makefile.orig Wed Apr 21 08:42:03 2010
++++ source/Makefile Wed Apr 21 08:44:29 2010
+@@ -5,9 +5,6 @@ BINARY := shell-fm
+ LIB := libshellfm.so
+ STATIC := libshellfm.a
+
+-ifeq ($(shell uname -s), OpenBSD)
+- LDFLAGS += -lossaudio
+-endif
+ ifeq ($(shell uname -s), NetBSD)
LDFLAGS += -lossaudio
endif
- LIBAO := $(shell pkg-config --exists ao && echo -DLIBAO && pkg-config ao
--cflags)
--CFLAGS := -Os -Wall -W -I./include/ $(LIBAO) $(shell pkg-config mad --cflags)
-+CFLAGS += -Wall -W -I./include/ $(LIBAO) $(shell pkg-config mad --cflags)
-
- .PHONY: clean tags cscope
+@@ -15,7 +12,7 @@ ifeq ($(shell uname -s), Darwin)
+ CFLAGS += -D__darwin__
+ endif
+-CFLAGS += -Os -Wall -W -I./include/ -DLIBAO \
++CFLAGS += -Wall -W -I./include/ -DLIBAO \
+ $(shell pkg-config --cflags mad) \
+ $(shell pkg-config --cflags ao)
+ LDFLAGS += $(shell pkg-config --libs mad) \
Index: patches/patch-source_pipe_c
===================================================================
RCS file: patches/patch-source_pipe_c
diff -N patches/patch-source_pipe_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_pipe_c 21 Apr 2010 09:47:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- source/pipe.c.orig Wed Apr 21 09:21:01 2010
++++ source/pipe.c Wed Apr 21 09:22:24 2010
+@@ -40,7 +40,7 @@ FILE * openpipe(const char * cmd, pid_t * cpid) {
+ close(fd[1]);
+ dup2(fd[0], 0);
+
+- execl("/bin/sh", "sh", "-c", cmd, NULL);
++ execl("/bin/sh", "sh", "-c", cmd, (char *)NULL);
+ }
+
+ if(cpid != NULL)
