Update to 0.2.2

6 files changed, 99 insertions, 23 deletions

diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index 30610b2172c6..c41981d0e302 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	medusa
-PORTVERSION=	0.2
+PORTVERSION=	0.2.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/medusa
diff --git a/sysutils/medusa/distinfo b/sysutils/medusa/distinfo
index 20a3df161aac..bfb256bcfba9 100644
--- a/sysutils/medusa/distinfo
+++ b/sysutils/medusa/distinfo
@@ -1 +1 @@
-MD5 (medusa-0.2.tar.gz) = 65e6fe67ebbf5e12406836a18baa1cee
+MD5 (medusa-0.2.2.tar.gz) = 19066c59e85fa81d8a24966d24c17291
diff --git a/sysutils/medusa/files/patch-aa b/sysutils/medusa/files/patch-aa
index 56b2c43eab5b..3e1c22c5e37b 100644
--- a/sysutils/medusa/files/patch-aa
+++ b/sysutils/medusa/files/patch-aa
@@ -1,12 +1,33 @@
---- libmedusa-internal/medusa-io-handler.c.orig	Sun Aug  6 04:10:06 2000
-+++ libmedusa-internal/medusa-io-handler.c	Thu Aug 17 10:27:10 2000
-@@ -208,6 +208,9 @@
- 
-   /* We open the file synchronously here to make sure the header gets
-      written before returning the FILE * */
-+#ifdef __FreeBSD__
-+#define O_SYNC 0
+--- libmedusa-internal/medusa-io-handler.c.orig	Fri Oct  6 18:20:52 2000
++++ libmedusa-internal/medusa-io-handler.c	Fri Nov  3 11:37:17 2000
+@@ -254,2 +254,5 @@
+            written before returning the FILE * */
++#ifdef	__FreeBSD__
++#define	O_SYNC 0
 +#endif
-   file_descriptor = open (file_name, O_RDWR | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR);
-   write_header_to_file_descriptor (file_descriptor, magic_number, version_number, 0);
-   close (file_descriptor);				  
+         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);
++#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 @@
+ {
++#ifdef	__FreeBSD__
++#define	O_SYNC 0
++#endif
+         return open (file_name, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR | O_SYNC);
+--- libmedusa/medusa-service-private.c.orig	Thu Sep 14 23:59:29 2000
++++ libmedusa/medusa-service-private.c	Fri Nov  3 11:41:51 2000
+@@ -32,5 +32,5 @@
+ #include <strings.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+-#include <sys/types.h>
+ #include <sys/un.h>
diff --git a/sysutils/medusa/files/patch-ab b/sysutils/medusa/files/patch-ab
index 4a762825a9ef..d30c4c9863a9 100644
--- a/sysutils/medusa/files/patch-ab
+++ b/sysutils/medusa/files/patch-ab
@@ -1,14 +1,10 @@
---- libmedusa-internal/medusa-rdb-query.c.orig	Fri Jul 28 05:14:34 2000
-+++ libmedusa-internal/medusa-rdb-query.c	Thu Aug 17 10:04:48 2000
-@@ -26,7 +26,11 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#ifdef __FreeBSD__
+--- libmedusa-internal/medusa-rdb-query.c.orig	Tue Oct  3 16:31:03 2000
++++ libmedusa-internal/medusa-rdb-query.c	Fri Nov  3 11:39:47 2000
+@@ -29,3 +29,7 @@
+ #include <sys/types.h>
++#ifdef	__FreeBSD__
 +#include <gnuregex.h>
 +#else
  #include <regex.h>
 +#endif
  #include <medusa-test.h>
- 
- #include "medusa-rdb-query-private.h"
diff --git a/sysutils/medusa/files/patch-ae b/sysutils/medusa/files/patch-ae
new file mode 100644
index 000000000000..a2b187128066
--- /dev/null
+++ b/sysutils/medusa/files/patch-ae
@@ -0,0 +1,7 @@
+--- index-configuration/Makefile.in.orig	Wed Nov  1 15:07:46 2000
++++ index-configuration/Makefile.in	Fri Nov  3 11:46:54 2000
+@@ -129,3 +129,3 @@
+ 
+-medusacronconfdir = $(sysconfdir)/cron.daily
++medusacronconfdir = $(sysconfdir)
+ 
diff --git a/sysutils/medusa/pkg-plist b/sysutils/medusa/pkg-plist
index 8949744d78c0..ab61d4829fc0 100644
--- a/sysutils/medusa/pkg-plist
+++ b/sysutils/medusa/pkg-plist
@@ -3,10 +3,62 @@ bin/medusa-indexd
 bin/medusa-searchd
 bin/msearch
 etc/vfs/modules/search-methods.conf
-include/libmedusa/medusa-common-private.h
+etc/medusa.cron
+include/libmedusa-index/medusa-byte.h
+include/libmedusa-index/medusa-conf.h
+include/libmedusa-index/medusa-db-update.h
+include/libmedusa-index/medusa-enums.h
+include/libmedusa-index/medusa-file-index-encoders.h
+include/libmedusa-index/medusa-file-index-queries.h
+include/libmedusa-index/medusa-file-index.h
+include/libmedusa-index/medusa-file-information.h
+include/libmedusa-index/medusa-hash.h
+include/libmedusa-index/medusa-io-handler.h
+include/libmedusa-index/medusa-keyword-set.h
+include/libmedusa-index/medusa-lock-file-paths.h
+include/libmedusa-index/medusa-lock.h
+include/libmedusa-index/medusa-master-db-private.h
+include/libmedusa-index/medusa-master-db.h
+include/libmedusa-index/medusa-query-clauses.h
+include/libmedusa-index/medusa-query-optimizations-private.h
+include/libmedusa-index/medusa-query-optimizations.h
+include/libmedusa-index/medusa-queue.h
+include/libmedusa-index/medusa-rdb-fields.h
+include/libmedusa-index/medusa-rdb-file.h
+include/libmedusa-index/medusa-rdb-index.h
+include/libmedusa-index/medusa-rdb-query-private.h
+include/libmedusa-index/medusa-rdb-query.h
+include/libmedusa-index/medusa-rdb-record.h
+include/libmedusa-index/medusa-rdb-table-private.h
+include/libmedusa-index/medusa-rdb-table.h
+include/libmedusa-index/medusa-search-uri.h
+include/libmedusa-index/medusa-test-conf.h
+include/libmedusa-index/medusa-test.h
+include/libmedusa-index/medusa-text-index-mime-module.h
+include/libmedusa-index/medusa-text-index-plaintext-module.h
+include/libmedusa-index/medusa-text-index-private.h
+include/libmedusa-index/medusa-text-index-queries.h
+include/libmedusa-index/medusa-text-index.h
+include/libmedusa-index/medusa-tokenize.h
+include/libmedusa-index/medusa-uri-list-encoders.h
+include/libmedusa-index/medusa-uri-list-private.h
+include/libmedusa-index/medusa-uri-list-queries.h
+include/libmedusa-index/medusa-uri-list.h
+include/libmedusa-index/medusa-versioned-file.h
+include/libmedusa/medusa-file-info-utilities.h
+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-search-service-private.h
 include/libmedusa/medusa-search-service.h
+include/libmedusa/medusa-service-private.h
+include/libmedusa/medusa-unindexed-search.h
+include/libmedusa/medusa-unsearched-locations.h
+include/libmedusa/medusa-utils.h
+lib/libmedusa-index.a
+lib/libmedusa-index.so
+lib/libmedusa-index.so.0
 lib/libmedusa.a
 lib/libmedusa.so
 lib/libmedusa.so.0