summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-10-23 19:33:24 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-10-23 19:33:24 +0800
commit2c66b9412a39724f749f8f66b5eeec8dd0474241 (patch)
tree361f6873888f34681ca27db360b47f00a55df2d3
parent61608297dbcc1340120422d527979fac5ee7d800 (diff)
downloadmarcuscom-ports-2c66b9412a39724f749f8f66b5eeec8dd0474241.tar
marcuscom-ports-2c66b9412a39724f749f8f66b5eeec8dd0474241.tar.gz
marcuscom-ports-2c66b9412a39724f749f8f66b5eeec8dd0474241.tar.bz2
marcuscom-ports-2c66b9412a39724f749f8f66b5eeec8dd0474241.tar.lz
marcuscom-ports-2c66b9412a39724f749f8f66b5eeec8dd0474241.tar.xz
marcuscom-ports-2c66b9412a39724f749f8f66b5eeec8dd0474241.tar.zst
marcuscom-ports-2c66b9412a39724f749f8f66b5eeec8dd0474241.zip
Don't detect linux/input.h, the u(v)dev modules is useless on FreeBSD.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16525 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--audio/pulseaudio/Makefile5
-rw-r--r--audio/pulseaudio/files/patch-src_Makefile.in10
-rw-r--r--audio/pulseaudio/pkg-plist2
3 files changed, 9 insertions, 8 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 583f26959..ac309a161 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/audio/pulseaudio/Makefile,v 1.23 2011/10/22 22:05:06 kwm Exp $
#
# !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
# PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon,
@@ -38,7 +38,8 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
OPENSSL_CFLAGS="-I/usr/include" \
OPENSSL_LIBS="-lcrypto -lssl" \
- LIBS="-lm -lintl"
+ LIBS="-lm -lintl" \
+ ac_cv_header_linux_input_h=""
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in
index c5f392f3b..da6e03d70 100644
--- a/audio/pulseaudio/files/patch-src_Makefile.in
+++ b/audio/pulseaudio/files/patch-src_Makefile.in
@@ -1,10 +1,12 @@
---- src/Makefile.in.orig 2011-10-21 14:32:40.000000000 +0200
-+++ src/Makefile.in 2011-10-21 14:33:17.000000000 +0200
-@@ -8630,7 +8630,7 @@
+--- src/Makefile.in.orig 2011-10-23 13:13:30.000000000 +0200
++++ src/Makefile.in 2011-10-23 13:14:26.000000000 +0200
+@@ -8629,8 +8629,8 @@
+ info-am:
install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \
- install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \
+- install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \
- install-pulseconfDATA install-pulseincludeHEADERS \
++ install-dist_alsaprofilesetsDATA \
+ install-pulseincludeHEADERS \
install-xdgautostartDATA
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 1ec065fe9..4e26c18f2 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -176,8 +176,6 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-loopback.a
lib/pulse-%%PULSE_VERSION%%/modules/module-loopback.so
lib/pulse-%%PULSE_VERSION%%/modules/module-match.a
lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-mmkbd-evdev.a
-lib/pulse-%%PULSE_VERSION%%/modules/module-mmkbd-evdev.so
lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.a
lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.a