- Don't build included tests - we don't install them anyway;

- check exit code of FAMMonotor*() functions.

4 files changed, 76 insertions, 8 deletions

diff --git a/x11-fm/nautilus/files/patch-ab b/x11-fm/nautilus/files/patch-ab
index 2592dcf58891..f99842cda257 100644
--- a/x11-fm/nautilus/files/patch-ab
+++ b/x11-fm/nautilus/files/patch-ab
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Mon Oct 29 11:36:40 2001
-+++ Makefile.in	Mon Oct 29 12:16:14 2001
-@@ -243,7 +243,7 @@
+--- Makefile.in.orig	Fri Dec  7 21:51:58 2001
++++ Makefile.in	Sat Dec  8 00:33:03 2001
+@@ -226,7 +226,7 @@
+ 
+ @HAVE_APPLETS_TRUE@APPLETS_SUBDIRS = applets
+ 
+-SUBDIRS =  	data 				icons 				cut-n-paste-code 		libnautilus 			libnautilus-adapter		libnautilus-private 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)		test 				user-guide			help				po 				omf-install			$(NULL)
++SUBDIRS =  	data 				icons 				cut-n-paste-code 		libnautilus 			libnautilus-adapter		libnautilus-private 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)			user-guide			help				po 				omf-install			$(NULL)
+ 
+ 
+ EXTRA_DIST =  	TRADEMARK_NOTICE				COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus-clean.sh				nautilus.desktop				nautilus.desktop.in				nautilus-help.desktop				nautilus-help.desktop.in			nautilus-launch-icon.png			gnome-starthere-96.png				gnome-starthere.png				nautilusConf.sh.in				nautilus-config.in				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				xml-i18n-extract.in				xml-i18n-merge.in				xml-i18n-update.in				Makefile.shared					$(DESKTOP_IN_FILES)				$(DESKTOP_FILES)				$(NULL)
+@@ -244,7 +244,7 @@
  
  bin_SCRIPTS = $(top_builddir)/nautilus-config
  
@@ -12,7 +21,7 @@ $FreeBSD$
  confexec_DATA =  	nautilusConf.sh					$(NULL)
  
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -684,8 +684,8 @@
+@@ -685,8 +685,8 @@
  	$(mkinstalldirs) $(DESTDIR)$(prefix)/bin
  	@list='nautilus-clean.sh'; for p in $$list; do\
  	  if test -f $(srcdir)/$$p; then \
diff --git a/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c
new file mode 100644
index 000000000000..5b3898d8b2c3
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- libnautilus-private/nautilus-monitor.c	2001/12/07 22:54:34	1.1
++++ libnautilus-private/nautilus-monitor.c	2001/12/07 23:10:06
+@@ -274,7 +274,8 @@
+ 	}
+ 	
+ 	monitor = g_new0 (NautilusMonitor, 1);
+-	FAMMonitorFile (connection, path, &monitor->request, NULL);
++	if (FAMMonitorFile (connection, path, &monitor->request, NULL) == -1)
++		return NULL;
+ 
+ 	g_free (path);
+ 
+@@ -314,7 +315,8 @@
+ 	}
+ 	
+ 	monitor = g_new0 (NautilusMonitor, 1);
+-	FAMMonitorDirectory (connection, path, &monitor->request, NULL);
++	if (FAMMonitorDirectory (connection, path, &monitor->request, NULL) == -1)
++		return NULL;
+ 
+ 	g_assert (g_hash_table_lookup (get_request_hash_table (),
+ 				       GINT_TO_POINTER (FAMREQUEST_GETREQNUM (&monitor->request))) == NULL);
diff --git a/x11-fm/nautilus2/files/patch-ab b/x11-fm/nautilus2/files/patch-ab
index 2592dcf58891..f99842cda257 100644
--- a/x11-fm/nautilus2/files/patch-ab
+++ b/x11-fm/nautilus2/files/patch-ab
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Mon Oct 29 11:36:40 2001
-+++ Makefile.in	Mon Oct 29 12:16:14 2001
-@@ -243,7 +243,7 @@
+--- Makefile.in.orig	Fri Dec  7 21:51:58 2001
++++ Makefile.in	Sat Dec  8 00:33:03 2001
+@@ -226,7 +226,7 @@
+ 
+ @HAVE_APPLETS_TRUE@APPLETS_SUBDIRS = applets
+ 
+-SUBDIRS =  	data 				icons 				cut-n-paste-code 		libnautilus 			libnautilus-adapter		libnautilus-private 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)		test 				user-guide			help				po 				omf-install			$(NULL)
++SUBDIRS =  	data 				icons 				cut-n-paste-code 		libnautilus 			libnautilus-adapter		libnautilus-private 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)			user-guide			help				po 				omf-install			$(NULL)
+ 
+ 
+ EXTRA_DIST =  	TRADEMARK_NOTICE				COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus-clean.sh				nautilus.desktop				nautilus.desktop.in				nautilus-help.desktop				nautilus-help.desktop.in			nautilus-launch-icon.png			gnome-starthere-96.png				gnome-starthere.png				nautilusConf.sh.in				nautilus-config.in				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				xml-i18n-extract.in				xml-i18n-merge.in				xml-i18n-update.in				Makefile.shared					$(DESKTOP_IN_FILES)				$(DESKTOP_FILES)				$(NULL)
+@@ -244,7 +244,7 @@
  
  bin_SCRIPTS = $(top_builddir)/nautilus-config
  
@@ -12,7 +21,7 @@ $FreeBSD$
  confexec_DATA =  	nautilusConf.sh					$(NULL)
  
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -684,8 +684,8 @@
+@@ -685,8 +685,8 @@
  	$(mkinstalldirs) $(DESTDIR)$(prefix)/bin
  	@list='nautilus-clean.sh'; for p in $$list; do\
  	  if test -f $(srcdir)/$$p; then \
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c
new file mode 100644
index 000000000000..5b3898d8b2c3
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- libnautilus-private/nautilus-monitor.c	2001/12/07 22:54:34	1.1
++++ libnautilus-private/nautilus-monitor.c	2001/12/07 23:10:06
+@@ -274,7 +274,8 @@
+ 	}
+ 	
+ 	monitor = g_new0 (NautilusMonitor, 1);
+-	FAMMonitorFile (connection, path, &monitor->request, NULL);
++	if (FAMMonitorFile (connection, path, &monitor->request, NULL) == -1)
++		return NULL;
+ 
+ 	g_free (path);
+ 
+@@ -314,7 +315,8 @@
+ 	}
+ 	
+ 	monitor = g_new0 (NautilusMonitor, 1);
+-	FAMMonitorDirectory (connection, path, &monitor->request, NULL);
++	if (FAMMonitorDirectory (connection, path, &monitor->request, NULL) == -1)
++		return NULL;
+ 
+ 	g_assert (g_hash_table_lookup (get_request_hash_table (),
+ 				       GINT_TO_POINTER (FAMREQUEST_GETREQNUM (&monitor->request))) == NULL);