cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to *release* 2012.05.06

Browse Source
This commit is contained in:
dcoppa 2012-05-07 11:04:21 +00:00
parent 21fda32a64
commit 972bc1d24f
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
audio/pianobar/Makefile
View File

@ -1,19 +1,20 @@
# $OpenBSD: Makefile,v 1.35 2012/05/04 10:32:33 dcoppa Exp $
# $OpenBSD: Makefile,v 1.36 2012/05/07 11:04:21 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = console client for pandora
DISTNAME = pianobar-2012.05.02
DISTNAME = pianobar-2012.05.06
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio
MAINTAINER = David Coppa <dcoppa@openbsd.org>
HOMEPAGE = http://6xq.net/projects/pianobar/
MASTER_SITES = http://spacehopper.org/mirrors/
MASTER_SITES = ${HOMEPAGE} \
http://spacehopper.org/mirrors/
SHARED_ONLY = Yes
SHARED_LIBS = piano 1.0 # 0.0.0
SHARED_LIBS = piano 1.1 # 0.0.0
# MIT
PERMIT_PACKAGE_CDROM = Yes
@ -30,15 +31,12 @@ LIB_DEPENDS = audio/faad \
security/gnutls>=2.10.0 \
security/libgcrypt
CFLAGS += -I${LOCALBASE}/include
.if !defined(DEBUG)
CFLAGS += -DNDEBUG
.endif
MAKE_FLAGS = DYNLINK=1 \
CC=${CC} \
LDFLAGS="-L${LOCALBASE}/lib" \
LIBpiano_VERSION="${LIBpiano_VERSION}" \
MANDIR="${PREFIX}/man"
@ -49,11 +47,14 @@ FAKE_FLAGS = PREFIX="${PREFIX}" \
USE_GMAKE = Yes
NO_REGRESS = Yes
REGRESS_TARGET = test
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pianobar
${INSTALL_DATA} ${WRKSRC}/contrib/config-example \
${PREFIX}/share/examples/pianobar/config
pre-regress:
@touch ${WRKSRC}/src/libwaitress/waitress.c
.include <bsd.port.mk>

10
audio/pianobar/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pianobar-2012.05.02.tar.bz2) = RG9XhUyLDFh/nx72Aqws9Q==
RMD160 (pianobar-2012.05.02.tar.bz2) = +657ZVZ0mMIvIjsViVHKBcHrfYk=
SHA1 (pianobar-2012.05.02.tar.bz2) = tzl9AerKg/pDkpeJk14l+IP6m80=
SHA256 (pianobar-2012.05.02.tar.bz2) = q0kyr/NNC7XYcrgVHctJUU6nwheEWVu8odmLZjaFbHg=
SIZE (pianobar-2012.05.02.tar.bz2) = 46778
MD5 (pianobar-2012.05.06.tar.bz2) = Eqlm7O4LHNO7n4/pZfOeAw==
RMD160 (pianobar-2012.05.06.tar.bz2) = Ua22VuoBPOGvdJ29IW0h1k535F8=
SHA1 (pianobar-2012.05.06.tar.bz2) = UVJLkfmz5/aV2UKKTfJ4666vYMo=
SHA256 (pianobar-2012.05.06.tar.bz2) = sUOILKUDA9Vg9JVn0aUIyktIII2064qmfzafyq5wjXo=
SIZE (pianobar-2012.05.06.tar.bz2) = 47052

23
audio/pianobar/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.13 2012/05/04 10:32:33 dcoppa Exp $
--- Makefile.orig Fri May 4 09:29:47 2012
+++ Makefile Fri May 4 09:39:21 2012
$OpenBSD: patch-Makefile,v 1.14 2012/05/07 11:04:21 dcoppa Exp $
--- Makefile.orig Sun May 6 16:33:54 2012
+++ Makefile Mon May 7 12:26:23 2012
@@ -6,15 +6,8 @@ LIBDIR:=${PREFIX}/lib
INCDIR:=${PREFIX}/include
MANDIR:=${PREFIX}/share/man
@ -18,6 +18,17 @@ $OpenBSD: patch-Makefile,v 1.13 2012/05/04 10:32:33 dcoppa Exp $
PIANOBAR_DIR=src
PIANOBAR_SRC=\
${PIANOBAR_DIR}/main.c \
@@ -76,8 +69,8 @@ else
LIBMAD_LDFLAGS=-lmad
endif
-LIBGNUTLS_CFLAGS=
-LIBGNUTLS_LDFLAGS=-lgnutls
+LIBGNUTLS_CFLAGS=$(shell pkg-config --cflags gnutls)
+LIBGNUTLS_LDFLAGS=$(shell pkg-config --libs gnutls)
LIBGCRYPT_CFLAGS=
LIBGCRYPT_LDFLAGS=-lgcrypt
@@ -87,50 +80,41 @@ LIBJSONC_LDFLAGS=$(shell pkg-config --libs json)
# build pianobar
@ -69,9 +80,11 @@ $OpenBSD: patch-Makefile,v 1.13 2012/05/04 10:32:33 dcoppa Exp $
%.lo: %.c
- @echo " CC $< (PIC)"
- @${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
- ${LIBJSONC_CFLAGS} \
- -c -fPIC -o $@ $<
+ ${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
${LIBJSONC_CFLAGS} \
-c -fPIC -o $@ $<
+ ${LIBFAAD_CFLAGS} ${LIBMAD_CFLAGS} ${LIBGNUTLS_CFLAGS} \
+ ${LIBJSONC_CFLAGS} -c -fPIC -o $@ $<
clean:
- @echo " CLEAN"