6 files changed, 59 insertions, 14 deletions

diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index a09ddce7fa3e..d468fdb63207 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	medusa
-PORTVERSION=	0.3.0
+PORTVERSION=	0.5.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/medusa
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	oaf.0:${PORTSDIR}/devel/oaf \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
-		gconf-1.1:${PORTSDIR}/devel/gconf
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
@@ -25,6 +21,11 @@ CONFIGURE_ARGS=	--enable-shared --enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+MAN1=		medusa-config.1 medusa-idled.1 msearch.1
+MAN5=		medusa.conf.5 medusa-file-index-stoplist.5
+MAN7=		medusa-search-uri.7
+MAN8=		medusa-searchd.8
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/sysutils/medusa/distinfo b/sysutils/medusa/distinfo
index 73277c115dc7..093f228950c6 100644
--- a/sysutils/medusa/distinfo
+++ b/sysutils/medusa/distinfo
@@ -1 +1 @@
-MD5 (medusa-0.3.0.tar.gz) = 36fb25ff70d8983c625fd9bf31f995aa
+MD5 (medusa-0.5.0.tar.gz) = 6c93b219bfeccb5456570c2a464b72fb
diff --git a/sysutils/medusa/files/patch-aa b/sysutils/medusa/files/patch-aa
index 3e1c22c5e37b..e7173e2122b8 100644
--- a/sysutils/medusa/files/patch-aa
+++ b/sysutils/medusa/files/patch-aa
@@ -6,14 +6,20 @@
 +#define	O_SYNC 0
 +#endif
          file_descriptor = open (file_name, O_RDWR | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR);
---- libmedusa/medusa-index-progress.c.orig	Mon Oct 16 16:46:51 2000
-+++ libmedusa/medusa-index-progress.c	Fri Nov  3 11:38:01 2000
-@@ -90,2 +90,5 @@
-         g_return_val_if_fail (disk_information_was_found, NULL);
+--- libmedusa/medusa-index-progress.c.orig	Thu Feb 22 06:58:11 2001
++++ libmedusa/medusa-index-progress.c	Fri Mar  2 13:40:31 2001
+@@ -56,3 +56,5 @@
+ #elif HAVE_STATFS
++#ifndef __FreeBSD__
+ # include <sys/statfs.h>
++#endif
+ #else
+@@ -90,2 +92,5 @@
+         unlink (INDEX_PROGRESS_FILE_NAME);
 +#ifdef	__FreeBSD__
 +#define	O_SYNC 0
 +#endif
-         output_fd = open (INDEX_PROGRESS_FILE_NAME, O_RDWR | O_CREAT | O_EXCL | O_SYNC);
+ }
 --- libmedusa/medusa-unindexed-search.c.orig	Wed Sep 20 14:03:58 2000
 +++ libmedusa/medusa-unindexed-search.c	Fri Nov  3 11:38:30 2000
 @@ -1068,2 +1068,5 @@
diff --git a/sysutils/medusa/files/patch-af b/sysutils/medusa/files/patch-af
index 5b9286b2a6fd..4179bfc65b31 100644
--- a/sysutils/medusa/files/patch-af
+++ b/sysutils/medusa/files/patch-af
@@ -8,8 +8,8 @@
 -#include <sys/types.h>
  #include <sys/un.h>
 
---- indexer/medusa-file-index-daemon.c.orig	Wed Jan 17 21:55:16 2001
-+++ indexer/medusa-file-index-daemon.c	Mon Jan 29 13:42:35 2001
+--- indexer/medusa-file-index-daemon.c.orig	Thu Feb 22 06:58:10 2001
++++ indexer/medusa-file-index-daemon.c	Fri Mar  2 13:46:16 2001
 @@ -44,3 +44,8 @@
  #include <sys/un.h>
 +#ifdef __FreeBSD__
@@ -18,4 +18,10 @@
 +#else
  #include <sys/vfs.h>
 +#endif
- #include <time.h>
+ 
+@@ -49,3 +54,5 @@
+ #elif defined(HAVE_STATFS)
++#ifndef __FreeBSD__
+ #include <sys/statfs.h>
++#endif
+ #endif /* HAVE_STATVFS */
diff --git a/sysutils/medusa/files/patch-ah b/sysutils/medusa/files/patch-ah
new file mode 100644
index 000000000000..4ccf7ffb4f61
--- /dev/null
+++ b/sysutils/medusa/files/patch-ah
@@ -0,0 +1,28 @@
+--- search-service/medusa-file-search-daemon.c.orig	Wed Feb 21 01:33:37 2001
++++ search-service/medusa-file-search-daemon.c	Fri Mar  2 16:11:21 2001
+@@ -204,2 +204,17 @@
+ 
++#ifdef __FreeBSD__
++#include <sys/wait.h>
++
++static void
++grim_reaper(int signo)
++{
++	pid_t pid;
++	int stat;
++
++ 	while ((pid = waitpid(-1, &stat, WNOHANG)) > 0)
++		;
++	return;
++}
++#endif 
++
+ int main (int argc, char *argv[])
+@@ -273,3 +288,7 @@
+            in the Unix Environment", page 280) */
++#ifdef __FreeBSD__
++	signal (SIGCHLD, grim_reaper);
++#else
+         signal (SIGCLD, SIG_IGN);
++#endif
+ 
diff --git a/sysutils/medusa/pkg-plist b/sysutils/medusa/pkg-plist
index 37342825877d..7361d9bf93d1 100644
--- a/sysutils/medusa/pkg-plist
+++ b/sysutils/medusa/pkg-plist
@@ -10,11 +10,15 @@ include/libmedusa/medusa-index-progress.h
 include/libmedusa/medusa-index-service-private.h
 include/libmedusa/medusa-index-service.h
 include/libmedusa/medusa-indexed-search.h
+include/libmedusa/medusa-lock-file-paths.h
+include/libmedusa/medusa-lock.h
 include/libmedusa/medusa-log.h
 include/libmedusa/medusa-search-service-private.h
 include/libmedusa/medusa-search-service.h
 include/libmedusa/medusa-service-private.h
+include/libmedusa/medusa-stdio-extensions.h
 include/libmedusa/medusa-string.h
+include/libmedusa/medusa-system-state.h
 include/libmedusa/medusa-unindexed-search.h
 include/libmedusa/medusa-unsearched-locations.h
 include/libmedusa/medusa-utils.h