From 92236d8d6fb5b0fe870d7ce1cd8d2a5aa3a69f80 Mon Sep 17 00:00:00 2001
From: rh <rh>
Date: Thu, 15 Jun 2000 21:14:06 +0000
Subject: Fix plugin handling.

---
 comms/jpilot/Makefile         |  5 ++++-
 comms/jpilot/files/patch-sum  |  4 ++++
 comms/jpilot/patches/patch-aa | 12 ++++++++++++
 comms/jpilot/patches/patch-ab | 30 ++++++++++++++++++++++++++++++
 comms/jpilot/pkg/PLIST        |  5 ++++-
 5 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 comms/jpilot/files/patch-sum
 create mode 100644 comms/jpilot/patches/patch-aa
 create mode 100644 comms/jpilot/patches/patch-ab

(limited to 'comms/jpilot')

diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index d809849f830..d0c3db83305 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/06/15 09:14:23 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/15 21:14:06 rh Exp $
 #
 
 DISTNAME=		jpilot-0.98.1
@@ -19,4 +19,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/jpilot/plugins
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot/files/patch-sum b/comms/jpilot/files/patch-sum
new file mode 100644
index 00000000000..36633062a51
--- /dev/null
+++ b/comms/jpilot/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 2000/06/15 21:14:07 rh Exp $
+
+MD5 (patch-aa) = ec235201db3982423443a5a9a71ee5ca
+MD5 (patch-ab) = 8e4a8bc56a5dc24a1af3ee77b5903fa3
diff --git a/comms/jpilot/patches/patch-aa b/comms/jpilot/patches/patch-aa
new file mode 100644
index 00000000000..1dbd2d75010
--- /dev/null
+++ b/comms/jpilot/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2000/06/15 21:14:07 rh Exp $
+
+--- configure.orig	Mon Feb 28 23:30:09 2000
++++ configure	Thu Jun 15 18:05:22 2000
+@@ -3779,7 +3779,6 @@
+       echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+ echo "configure:3781: checking for dlopen" >&5
+    save_LIBS="$LIBS"
+-   LIBS="$LIBS -ldl"
+    cat > conftest.$ac_ext <<EOF
+ #line 3785 "configure"
+ #include "confdefs.h"
diff --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab
new file mode 100644
index 00000000000..2ad623f9886
--- /dev/null
+++ b/comms/jpilot/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2000/06/15 21:14:08 rh Exp $
+
+--- plugins.c.orig	Sun Feb 13 05:36:01 2000
++++ plugins.c	Thu Jun 15 22:19:03 2000
+@@ -127,7 +127,7 @@
+    char name[52];
+    char db_name[52];
+    int version, major_version, minor_version;
+-   /* void (*plugin_set_jpilot_logf)(int (*Pjpilot_logf)(int level, char *format, ...));*/
++   void (*plugin_set_jpilot_logf)(int (*Pjpilot_logf)(int level, char *format, ...));
+    void (*plugin_versionM)(int *major_version, int *minor_version);
+    
+    p->full_path = NULL;
+@@ -159,14 +159,14 @@
+    p->handle=h;
+    
+    /* logf */
+-/*
++
+    plugin_set_jpilot_logf = dlsym(h, "plugin_set_jpilot_logf");
+    if ((err = dlerror()) != NULL)  {
+       jpilot_logf(LOG_WARN, "plugin_set_jpilot_logf, [%s]\n [%s]\n", err, path);
+    } else {
+       plugin_set_jpilot_logf(jpilot_logf);
+    }
+-*/
++
+ 
+    p->full_path = strdup(path);
+ 
diff --git a/comms/jpilot/pkg/PLIST b/comms/jpilot/pkg/PLIST
index 720ae2a465a..d5071eac111 100644
--- a/comms/jpilot/pkg/PLIST
+++ b/comms/jpilot/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/06/15 09:14:23 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/06/15 21:14:08 rh Exp $
 bin/jpilot
 share/locale/da/LC_MESSAGES/jpilot.mo
 share/locale/de/LC_MESSAGES/jpilot.mo
@@ -14,4 +14,7 @@ share/jpilot/DatebookDB.pdb
 share/jpilot/AddressDB.pdb
 share/jpilot/ToDoDB.pdb
 share/jpilot/MemoDB.pdb
+@exec install -d -m 0555 %D/lib/jpilot/plugins
 @dirrm share/jpilot
+@dirrm lib/jpilot/plugins
+@dirrm lib/jpilot
-- 
cgit v1.2.3