Update to pianobar-3631791.

No more cmake, build system is plain make now.

OK landry@, sthen@

audio/pianobar/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2010/05/13 18:35:51 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.3 2010/07/20 09:47:18 dcoppa Exp $
 
 COMMENT =	console client for pandora
 
-VERSION =	0.20100513
-DISTNAME =	PromyLOPh-pianobar-2a1e819
+VERSION =	0.20100619
+DISTNAME =	PromyLOPh-pianobar-3631791
 PKGNAME =	pianobar-${VERSION}
 CATEGORIES =	audio
 
@@ -12,24 +12,40 @@ MAINTAINER =	David Coppa <dcoppa@openbsd.org>
 HOMEPAGE =	http://6xq.net/html/00/17.html
 MASTER_SITES =	http://www.phil.uu.nl/~lievisse/distfiles/
 
+SHARED_ONLY =	Yes
+
+SHARED_LIBS =	piano	0.0	# 0.0.0
+
 # MIT
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =	c m pthread
+WANTLIB =	ao c faad m mad pthread
 
-MODULES =	devel/cmake
+LIB_DEPENDS =	::audio/libao \
+		::audio/faad \
+		::audio/libmad
 
-LIB_DEPENDS =	ao::audio/libao \
-		faad::audio/faad \
-		mad::audio/libmad
+CFLAGS +=	-I${LOCALBASE}/include
 
-CONFIGURE_ARGS= -DMAN_INSTALL_DIR="${PREFIX}/man"
+MAKE_FLAGS =	LIBAO_INCLUDE="${LOCALBASE}/include/ao" \
+		LIBAO_LIB="-L${LOCALBASE}/lib -lao" \
+		LIBpiano_VERSION="${LIBpiano_VERSION}" \
+		MANDIR="${PREFIX}/man"
 
+FAKE_FLAGS =	PREFIX="${PREFIX}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_MAN="${INSTALL_MAN}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+
+USE_GMAKE =	Yes
 NO_REGRESS =	Yes
 
+ALL_TARGET =	pianobar libpiano
+INSTALL_TARGET =install install-libpiano
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pianobar
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/pianobar

audio/pianobar/distinfo

@@ -1,5 +1,5 @@
-MD5 (PromyLOPh-pianobar-2a1e819.tar.gz) = iJxlkhD4m1RnxlVEnwkQCw==
-RMD160 (PromyLOPh-pianobar-2a1e819.tar.gz) = k/qpTtfA0TpJdh5Bt93sAJBqDOs=
-SHA1 (PromyLOPh-pianobar-2a1e819.tar.gz) = NorXGE0d7chFflodjnCDKF2lupQ=
-SHA256 (PromyLOPh-pianobar-2a1e819.tar.gz) = 9VCaZYGZ5dWpCP33Y6zepp3OoVJSmheOmtH2sJECX1U=
-SIZE (PromyLOPh-pianobar-2a1e819.tar.gz) = 66942
+MD5 (PromyLOPh-pianobar-3631791.tar.gz) = oCBlnmKimvIJG9QFWJHqrg==
+RMD160 (PromyLOPh-pianobar-3631791.tar.gz) = 6/pAbgiazKPDMZDQ54LZ3YI5tY8=
+SHA1 (PromyLOPh-pianobar-3631791.tar.gz) = qZno0ajwn9HfHYo6C0GMY07BdvE=
+SHA256 (PromyLOPh-pianobar-3631791.tar.gz) = LkZBUmZLh2AElb0gTXysqMDgO1CFsptvrWPVFPEtxDE=
+SIZE (PromyLOPh-pianobar-3631791.tar.gz) = 65363

audio/pianobar/patches/patch-Makefile

@@ -0,0 +1,44 @@
+$OpenBSD: patch-Makefile,v 1.1 2010/07/20 09:47:18 dcoppa Exp $
+--- Makefile.orig	Sat Jun 19 09:36:18 2010
++++ Makefile	Tue Jul 13 20:23:39 2010
+@@ -4,7 +4,7 @@ PREFIX:=/usr/local
+ BINDIR:=${PREFIX}/bin
+ LIBDIR:=${PREFIX}/lib
+ MANDIR:=${PREFIX}/share/man
+-CFLAGS:=-Wall -g -std=c99 -pedantic
++CFLAGS+=-Wall -g -std=c99 -pedantic
+ 
+ PIANOBAR_DIR=src
+ PIANOBAR_SRC=\
+@@ -94,7 +94,7 @@ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_O
+ libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
+ 		${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR}
+ 	${CC} -shared ${CFLAGS} ${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} \
+-			${LIBEZXML_RELOBJ} -o $@.so.0.0.0
++			${LIBEZXML_RELOBJ} -o $@.so.${LIBpiano_VERSION}
+ 
+ %.o: %.c
+ 	${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
+@@ -109,17 +109,14 @@ libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAIT
+ clean:
+ 	${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} \
+ 			${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ} pianobar \
+-			libpiano.so.0.0.0
++			libpiano.so.${LIBpiano_VERSION}
+ 
+ all: pianobar libpiano
+ 
+ install: pianobar
+-	install -d ${DESTDIR}/${BINDIR}/
+-	install -m755 pianobar ${DESTDIR}/${BINDIR}/
+-	install -d ${DESTDIR}/${MANDIR}/man1/
+-	install -m644 src/pianobar.1 ${DESTDIR}/${MANDIR}/man1/
++	${INSTALL_PROGRAM} pianobar ${DESTDIR}/${BINDIR}/
++	${INSTALL_MAN} src/pianobar.1 ${DESTDIR}/${MANDIR}/man1/
+ 
+-install-libpiano: libpiano
+-	install -d ${DESTDIR}/${LIBDIR}/
+-	install -m755 libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/
++install-libpiano:
++	${INSTALL_DATA} libpiano.so.${LIBpiano_VERSION} ${DESTDIR}/${LIBDIR}/
+ 

audio/pianobar/pkg/PLIST

@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/05/13 18:35:51 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/07/20 09:47:19 dcoppa Exp $
 @bin bin/pianobar
+@lib lib/libpiano.so.${LIBpiano_VERSION}
 @man man/man1/pianobar.1
 @comment share/doc/pianobar/
 @comment share/doc/pianobar/COPYING