aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthierry <thierry@FreeBSD.org>2009-11-18 06:31:13 +0800
committerthierry <thierry@FreeBSD.org>2009-11-18 06:31:13 +0800
commitdaec574aca7ad9b2e845a3f253eead5d00ebe236 (patch)
tree6b1d02ad0811c20aa2aa9273486dbbc3139162f8
parentbcb94f22fecab2c271c9ef57b94c9b565fe31caf (diff)
downloadfreebsd-ports-gnome-daec574aca7ad9b2e845a3f253eead5d00ebe236.tar.gz
freebsd-ports-gnome-daec574aca7ad9b2e845a3f253eead5d00ebe236.tar.zst
freebsd-ports-gnome-daec574aca7ad9b2e845a3f253eead5d00ebe236.zip
Force the detection of <sys/mount.h> by configure for FreeBSD-6.
PR: ports/140521 Submitted by: Mark Andrews <marka (at) isc.org> Approved by: Joseph S. Atkinson <jsa.bsd (at) gmail.com> (maintainer)
-rw-r--r--multimedia/vlc/Makefile2
-rw-r--r--multimedia/vlc/files/patch-modules_access_file.c11
2 files changed, 1 insertions, 12 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 67bfab79a019..7bc73dbf3b68 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -99,7 +99,7 @@ MAN1= vlc.1 \
.include <bsd.port.pre.mk>
.if (${OSVERSION} < 701000)
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_misc_thread.c
+CONFIGURE_ENV+= HAS_SYS_MOUNT_H="1"
.endif
WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
diff --git a/multimedia/vlc/files/patch-modules_access_file.c b/multimedia/vlc/files/patch-modules_access_file.c
deleted file mode 100644
index bfee94847a8b..000000000000
--- a/multimedia/vlc/files/patch-modules_access_file.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./modules/access/file.c.orig 2009-08-09 23:50:57.000000000 +0200
-+++ ./modules/access/file.c 2009-11-14 18:12:22.000000000 +0100
-@@ -50,7 +50,7 @@
- #if defined (__linux__)
- # include <sys/vfs.h>
- # include <linux/magic.h>
--#elif defined (HAVE_SYS_MOUNT_H)
-+#elif defined (HAVE_SYS_MOUNT_H) || (defined(__FreeBSD__) && (_FreeBSD_version < 700000))
- # include <sys/param.h>
- # include <sys/mount.h>
- #endif