summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz>2011-12-19 13:16:16 +0000
committerwiz <wiz>2011-12-19 13:16:16 +0000
commit5005b69ae72fcc0848314964ef9ecdb6467f1b5f (patch)
tree39fd23b2cea15bd1abc8a7da8111c5bff2a4f047 /audio
parentcc3871bc64394b6fc58a0553e7b124b4cf45740e (diff)
downloadpkgsrc-5005b69ae72fcc0848314964ef9ecdb6467f1b5f.tar.gz
Fix configury with libaudiofile>=0.3.
Set LICENSE while here.
Diffstat (limited to 'audio')
-rw-r--r--audio/wsoundserver/Makefile4
-rw-r--r--audio/wsoundserver/distinfo5
-rw-r--r--audio/wsoundserver/patches/patch-configure21
3 files changed, 27 insertions, 3 deletions
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 01901ae9ae8..70c38a91e15 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2011/11/01 06:00:42 sbd Exp $
+# $NetBSD: Makefile,v 1.44 2011/12/19 13:16:16 wiz Exp $
#
DISTNAME= WSoundServer-0.4.0
@@ -10,6 +10,7 @@ MASTER_SITES= # ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://shadowmere.student.utwente.nl/
COMMENT= Sound server for windowmaker
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
@@ -18,6 +19,7 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # not really needed
+CONFIGURE_ENV+= ac_cv_path_AUDIOFILE_CONFIG="pkg-config audiofile"
PKG_SYSCONFSUBDIR= WindowMaker
EGDIR= ${PREFIX}/share/examples/wsoundserver
CONF_FILES= ${EGDIR:Q}/WMSound ${PKG_SYSCONFDIR:Q}/WMSound
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo
index b379908b47a..b5df6228064 100644
--- a/audio/wsoundserver/distinfo
+++ b/audio/wsoundserver/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/07/30 14:50:36 joerg Exp $
+$NetBSD: distinfo,v 1.9 2011/12/19 13:16:16 wiz Exp $
SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4
RMD160 (WSoundServer-0.4.0.tar.gz) = ac58045fbe7f2c327b0c87514b06cb0941518b25
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = 30414c5c0d6112b02098f4bb901d02b98330919b
SHA1 (patch-ac) = 8595912bdc913dae46c82bc3a59fc96318350982
SHA1 (patch-ad) = 998cc4b2f87c4bce4d8c32e42aa9c06134633252
SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea
-SHA1 (patch-af) = 1ea20d0e00d19a2c23bb8e07cdf182e43db28ca8
+SHA1 (patch-af) = c1b88824803ff293bb78c130ab9bb6ae5404a133
+SHA1 (patch-configure) = ce1042164be0198f9c0eee3494eaf550f2f4106b
diff --git a/audio/wsoundserver/patches/patch-configure b/audio/wsoundserver/patches/patch-configure
new file mode 100644
index 00000000000..a7d44f1dd20
--- /dev/null
+++ b/audio/wsoundserver/patches/patch-configure
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure,v 1.1 2011/12/19 13:16:16 wiz Exp $
+
+Fix configury with libaudiofile-0.3+.
+
+--- configure.orig 2011-12-19 13:10:25.000000000 +0000
++++ configure
+@@ -3252,11 +3252,11 @@ echo "configure:3248: checking for AUDIO
+ AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs`
+ AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags`
+ audiofile_major_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\1/'`
+ audiofile_minor_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\2/'`
+ audiofile_micro_version=`$AUDIOFILE_CONFIG $audiofile_config_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\3/'`
+ if test "x$enable_audiofiletest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"