summaryrefslogtreecommitdiff
path: root/comms/jpilot
diff options
context:
space:
mode:
Diffstat (limited to 'comms/jpilot')
-rw-r--r--comms/jpilot/Makefile38
-rw-r--r--comms/jpilot/files/md54
-rw-r--r--comms/jpilot/files/patch-sum7
-rw-r--r--comms/jpilot/patches/patch-aa35
-rw-r--r--comms/jpilot/patches/patch-ab47
-rw-r--r--comms/jpilot/patches/patch-ac14
-rw-r--r--comms/jpilot/pkg/DESCR2
-rw-r--r--comms/jpilot/pkg/PLIST39
8 files changed, 107 insertions, 79 deletions
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 323cfcbec7b..92ad58c6942 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,29 +1,47 @@
-# $NetBSD: Makefile,v 1.12 2001/02/16 13:56:15 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/01 20:38:14 jlam Exp $
#
-DISTNAME= jpilot-0.98.1
+DISTNAME= jpilot-0.99
CATEGORIES= comms
-MASTER_SITES= http://jpilot.linuxave.net/
+MASTER_SITES= http://jpilot.org/
MAINTAINER= rh@netbsd.org
-HOMEPAGE= http://jpilot.linuxave.net/
+HOMEPAGE= http://jpilot.org/
COMMENT= desktop organizer application for the palm pilot
+BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf
BUILD_DEPENDS+= msgfmt:../../devel/gettext
DEPENDS+= gtk+>=1.2.0:../../x11/gtk
DEPENDS+= pilot-link>=0.9.3:../../comms/pilot-link
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_X11= YES
-USE_LIBINTL= YES
+GNU_CONFIGURE= # defined
+USE_LIBTOOL= # defined
+USE_X11= # defined
+USE_LIBINTL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
EVAL_PREFIX+= GTKDIR=gtk+
+EVAL_PREFIX+= PILOTLINKDIR=pilot-link
CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}"
-CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE}
+CONFIGURE_ARGS+= --with-pilot-prefix="${PILOTLINKDIR}"
+CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+
+INCDIR= ${PREFIX}/include/jpilot
+HTMLDIR= ${PREFIX}/share/doc/html/jpilot
+MAN1DIR= ${PREFIX}/man/man1
+PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins
+
+post-extract:
+ ${RM} -f ${WRKSRC}/po/Makefile.in
+
+pre-configure:
+ cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/jpilot/plugins
+ ${INSTALL_DATA_DIR} ${INCDIR} ${HTMLDIR} ${PLUGINSDIR}
+ cd ${WRKSRC}; ${INSTALL_DATA} libplugin.h prefs.h ${INCDIR}
+ cd ${WRKSRC}/docs; ${INSTALL_DATA} *.html ${HTMLDIR}
+ cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR}
+ ${TOUCH} ${PLUGINSDIR}/.directory
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot/files/md5 b/comms/jpilot/files/md5
index 2273dda2911..cc2500ddbb8 100644
--- a/comms/jpilot/files/md5
+++ b/comms/jpilot/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/06/15 09:14:23 rh Exp $
+$NetBSD: md5,v 1.2 2001/03/01 20:38:15 jlam Exp $
-MD5 (jpilot-0.98.1.tar.gz) = a67a68a9e53757b34cbd2d3fc9c0e3bb
+MD5 (jpilot-0.99.tar.gz) = a6c8c1a9bc74f8a3f8403c451fdaef0f
diff --git a/comms/jpilot/files/patch-sum b/comms/jpilot/files/patch-sum
index d267569c591..31497691577 100644
--- a/comms/jpilot/files/patch-sum
+++ b/comms/jpilot/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/11/09 14:17:06 itojun Exp $
+$NetBSD: patch-sum,v 1.5 2001/03/01 20:38:15 jlam Exp $
-MD5 (patch-aa) = ec235201db3982423443a5a9a71ee5ca
-MD5 (patch-ab) = 8e4a8bc56a5dc24a1af3ee77b5903fa3
-MD5 (patch-ac) = 2e89e4905df99a4287f3d35ca1ea44ae
+MD5 (patch-aa) = 2319e52021d9bce83577c948ce2aed10
+MD5 (patch-ab) = 4ea006d053cd6d35061025bc478ccf4f
diff --git a/comms/jpilot/patches/patch-aa b/comms/jpilot/patches/patch-aa
index 1dbd2d75010..fe0890b616e 100644
--- a/comms/jpilot/patches/patch-aa
+++ b/comms/jpilot/patches/patch-aa
@@ -1,12 +1,25 @@
-$NetBSD: patch-aa,v 1.1 2000/06/15 21:14:07 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/01 20:38:15 jlam 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"
+--- Makefile.in.orig Tue Feb 6 14:31:05 2001
++++ Makefile.in
+@@ -43,7 +43,7 @@
+ INTLLIBS = @INTLLIBS@
+
+ # Targets
+-all: po_dir intl_dir jpilot jpilot-sync jpilot-dump
++all: po_dir intl_dir jpilot jpilot-sync jpilot-dump jpilot-upgrade-99
+
+ jpilot: jpilot.o datebook.o address.o todo.o memo.o \
+ utils.o sync.o prefs.o log.o plugins.o \
+@@ -240,9 +240,9 @@
+ ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-dump ; \
+ fi
+ if test -d "$(prefix)/bin" ; then \
+- ./install-sh -s -c -m 555 jpilot-dump $(prefix)/bin/jpilot-upgrade-99 ; \
++ ./install-sh -s -c -m 555 jpilot-upgrade-99 $(prefix)/bin/jpilot-upgrade-99 ; \
+ else \
+- ./install-sh -s -c -m 555 jpilot-dump $(prefix)/jpilot-upgrade-99 ; \
++ ./install-sh -s -c -m 555 jpilot-upgrade-99 $(prefix)/jpilot-upgrade-99 ; \
+ fi
+ ./install-sh -d -m 755 $(prefix)/share/jpilot
+ ./install-sh -c -m 755 jpilotrc.blue $(prefix)/share/jpilot
diff --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab
index 2ad623f9886..aec64116d9a 100644
--- a/comms/jpilot/patches/patch-ab
+++ b/comms/jpilot/patches/patch-ab
@@ -1,30 +1,25 @@
-$NetBSD: patch-ab,v 1.1 2000/06/15 21:14:08 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/03/01 20:38:15 jlam 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 */
--/*
+--- configure.in.orig Tue Feb 6 14:26:38 2001
++++ configure.in
+@@ -56,6 +56,9 @@
+ dnl AM_WITH_NLS()
+ AM_GNU_GETTEXT
+
++# Use PKGLOCALEDIR to determine location of installed locale files.
++DATADIRNAME="${PKGLOCALEDIR}"
+
- 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);
- }
--*/
+ if test "x$MSGFMT" = "xno"; then
+ if test "x$GMSGFMT" = "xno"; then
+ AC_MSG_RESULT(I can't find gettext)
+@@ -179,6 +182,10 @@
+ LIBS="$LIBS -ldl"
+ AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);] , have_dlopen=yes, , )
+ LIBS="$save_LIBS"
+
++ if test "x$have_dlopen" != "yes"; then
++ AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);], have_dlopen=yes,, )
++ fi
- p->full_path = strdup(path);
-
+ if test "x$have_dlopen" = "xyes"; then
+ AC_DEFINE(ENABLE_PLUGINS)
diff --git a/comms/jpilot/patches/patch-ac b/comms/jpilot/patches/patch-ac
deleted file mode 100644
index e89c765951a..00000000000
--- a/comms/jpilot/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/11/08 11:56:45 tron Exp $
-
---- jpilot.c.orig Sat Feb 12 21:33:21 2000
-+++ jpilot.c Wed Nov 8 12:53:18 2000
-@@ -27,6 +27,9 @@
- #include <signal.h>
- #include <string.h>
- #include <unistd.h>
-+#ifdef __NetBSD__
-+#include <locale.h>
-+#endif
-
- #include <pi-datebook.h>
- #include <gdk/gdkkeysyms.h>
diff --git a/comms/jpilot/pkg/DESCR b/comms/jpilot/pkg/DESCR
index de6bb8f403c..d707a00c9ab 100644
--- a/comms/jpilot/pkg/DESCR
+++ b/comms/jpilot/pkg/DESCR
@@ -1,4 +1,4 @@
- J-Pilot is a desktop organizer application for the palm pilot that
+J-Pilot is a desktop organizer application for the palm pilot that
runs under Linux and Unix. It is similar in functionality to the one
that 3com distributes for a well known rampant legacy operating
system. Features include:
diff --git a/comms/jpilot/pkg/PLIST b/comms/jpilot/pkg/PLIST
index d5071eac111..c0f45f39fdb 100644
--- a/comms/jpilot/pkg/PLIST
+++ b/comms/jpilot/pkg/PLIST
@@ -1,20 +1,37 @@
-@comment $NetBSD: PLIST,v 1.2 2000/06/15 21:14:08 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/01 20:38:15 jlam Exp $
bin/jpilot
-share/locale/da/LC_MESSAGES/jpilot.mo
-share/locale/de/LC_MESSAGES/jpilot.mo
-share/locale/fr/LC_MESSAGES/jpilot.mo
-share/locale/sv/LC_MESSAGES/jpilot.mo
-share/locale/ja/LC_MESSAGES/jpilot.mo
+bin/jpilot-dump
+bin/jpilot-sync
+bin/jpilot-upgrade-99
+include/jpilot/libplugin.h
+include/jpilot/prefs.h
+man/man1/jpilot-sync.1
+man/man1/jpilot-upgrade-99.1
+man/man1/jpilot.1
+lib/jpilot/plugins/.directory
+share/doc/html/jpilot/manual.html
+share/doc/html/jpilot/plugin.html
+share/jpilot/AddressDB.pdb
+share/jpilot/DatebookDB.pdb
+share/jpilot/MemoDB.pdb
+share/jpilot/ToDoDB.pdb
share/jpilot/jpilotrc.blue
share/jpilot/jpilotrc.default
share/jpilot/jpilotrc.green
share/jpilot/jpilotrc.purple
share/jpilot/jpilotrc.steel
-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
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/jpilot.mo
@dirrm share/jpilot
+@dirrm share/doc/html/jpilot
@dirrm lib/jpilot/plugins
@dirrm lib/jpilot
+@dirrm include/jpilot
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 11:30:29 +0000