mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-28 10:08:24 +00:00
Code Issues Releases Activity

Fix the build with HAL present.

Browse Source 
Reported by:	Caelian on #freebsd-gnome
This commit is contained in:
Joe Marcus Clarke 2006-05-07 05:13:14 +00:00
parent 8d9120adf2
commit 85ae49722e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=161540
6 changed files with 84 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
devel/gnome-vfs/files/patch-aa
View File

@ -1,6 +1,6 @@
--- configure.orig Mon Nov 14 11:43:13 2005
+++ configure Mon Nov 28 13:52:39 2005
@@ -23123,6 +23123,8 @@
--- configure.orig Sun May 7 00:51:33 2006
+++ configure Sun May 7 00:53:15 2006
@@ -23482,6 +23482,8 @@ echo $ECHO_N "checking for $ac_func... $
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23205,6 +23207,7 @@
@@ -23564,6 +23566,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@ -17,7 +17,7 @@
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -24296,6 +24299,7 @@
@@ -24655,6 +24658,7 @@ if test `eval echo '${'$as_ac_var'}'` =
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@ -25,7 +25,16 @@
have_ngettext=yes
else
echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
@@ -33559,7 +33563,7 @@
@@ -25708,7 +25712,7 @@ done
-for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h
+for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -34025,7 +34029,7 @@ if test "${openssl_libs+set}" = set; the
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@ -34,7 +43,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -37107,6 +37111,9 @@
@@ -38165,6 +38169,9 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -44,7 +53,7 @@
#include <sys/statfs.h>
#include <sys/fstyp.h>
_ACEOF
@@ -37148,6 +37155,9 @@
@@ -38206,6 +38213,9 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -54,7 +63,7 @@
#include <sys/statfs.h>
#include <sys/vmount.h>
_ACEOF
@@ -38604,6 +38614,7 @@
@@ -39645,6 +39655,7 @@ s,@TEST_LIBS@,$TEST_LIBS,;t t
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t

12
devel/gnome-vfs/files/patch-config.h.in Normal file
View File

@ -0,0 +1,12 @@
--- config.h.in.orig Sun May 7 00:54:09 2006
+++ config.h.in Sun May 7 00:54:46 2006
@@ -121,6 +121,9 @@
/* Define to 1 if you have the <fnmatch.h> header file. */
#undef HAVE_FNMATCH_H
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+#undef HAVE_SYS_SYSMACROS_H
+
/* Define to 1 if you have the <fstab.h> header file. */
#undef HAVE_FSTAB_H

12
devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c Normal file
View File

@ -0,0 +1,12 @@
--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Sun May 7 01:07:27 2006
+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun May 7 01:07:42 2006
@@ -32,7 +32,9 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_SYSMACROS_H
#include <sys/sysmacros.h>
+#endif
#include <sys/types.h>
#include <unistd.h>
#include <limits.h>

27
devel/gnomevfs2/files/patch-aa
View File

@ -1,6 +1,6 @@
--- configure.orig Mon Nov 14 11:43:13 2005
+++ configure Mon Nov 28 13:52:39 2005
@@ -23123,6 +23123,8 @@
--- configure.orig Sun May 7 00:51:33 2006
+++ configure Sun May 7 00:53:15 2006
@@ -23482,6 +23482,8 @@ echo $ECHO_N "checking for $ac_func... $
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23205,6 +23207,7 @@
@@ -23564,6 +23566,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@ -17,7 +17,7 @@
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -24296,6 +24299,7 @@
@@ -24655,6 +24658,7 @@ if test `eval echo '${'$as_ac_var'}'` =
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@ -25,7 +25,16 @@
have_ngettext=yes
else
echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
@@ -33559,7 +33563,7 @@
@@ -25708,7 +25712,7 @@ done
-for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h
+for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -34025,7 +34029,7 @@ if test "${openssl_libs+set}" = set; the
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@ -34,7 +43,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -37107,6 +37111,9 @@
@@ -38165,6 +38169,9 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -44,7 +53,7 @@
#include <sys/statfs.h>
#include <sys/fstyp.h>
_ACEOF
@@ -37148,6 +37155,9 @@
@@ -38206,6 +38213,9 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -54,7 +63,7 @@
#include <sys/statfs.h>
#include <sys/vmount.h>
_ACEOF
@@ -38604,6 +38614,7 @@
@@ -39645,6 +39655,7 @@ s,@TEST_LIBS@,$TEST_LIBS,;t t
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t

12
devel/gnomevfs2/files/patch-config.h.in Normal file
View File

@ -0,0 +1,12 @@
--- config.h.in.orig Sun May 7 00:54:09 2006
+++ config.h.in Sun May 7 00:54:46 2006
@@ -121,6 +121,9 @@
/* Define to 1 if you have the <fnmatch.h> header file. */
#undef HAVE_FNMATCH_H
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+#undef HAVE_SYS_SYSMACROS_H
+
/* Define to 1 if you have the <fstab.h> header file. */
#undef HAVE_FSTAB_H

12
devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c Normal file
View File

@ -0,0 +1,12 @@
--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Sun May 7 01:07:27 2006
+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun May 7 01:07:42 2006
@@ -32,7 +32,9 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_SYSMACROS_H
#include <sys/sysmacros.h>
+#endif
#include <sys/types.h>
#include <unistd.h>
#include <limits.h>