Upgrade to 0.98.

PR:		17195
Submitted by:	Alex Varju <varju@snapple.webct.com>

7 files changed, 31 insertions, 38 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 56a512923fa1..4ad6f2c4940d 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:   jpilot
-# Version required:    0.96
+# Version required:    0.98
 # Date created:        23 August 1999
 # Whom:                Alex Varju <varju@webct.com>
 #
@@ -7,14 +7,15 @@
 #
 # "?=" and "+=" are for including this Makefile from japanese/jpilot
 
-DISTNAME=	jpilot-0.97
+DISTNAME=	jpilot-0.98
 CATEGORIES=	palm comms
 MASTER_SITES=	http://jpilot.linuxbox.com/
 
 MAINTAINER?=	varju@webct.com
 
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 PREFIX=		${LOCALBASE}/pilot
 GNU_CONFIGURE=	yes
diff --git a/palm/jpilot/distinfo b/palm/jpilot/distinfo
index 351ee21a13ef..42fa129c7562 100644
--- a/palm/jpilot/distinfo
+++ b/palm/jpilot/distinfo
@@ -1 +1 @@
-MD5 (jpilot-0.97.tar.gz) = db31cf7de1b7a93add662f295c04def2
+MD5 (jpilot-0.98.tar.gz) = d997b8abc4c06b3f9a1035cfd65add3b
diff --git a/palm/jpilot/files/patch-ba b/palm/jpilot/files/patch-ba
index 53ee03ee54fa..4f9f6eb82db7 100644
--- a/palm/jpilot/files/patch-ba
+++ b/palm/jpilot/files/patch-ba
@@ -1,22 +1,19 @@
---- Makefile.in.orig	Sun Dec 12 13:23:05 1999
-+++ Makefile.in	Fri Dec 24 11:04:06 1999
-@@ -22,7 +22,7 @@
- GTKLIBS = @GTK_LIBS@
+--- Makefile.in.orig	Wed Mar  1 18:00:14 2000
++++ Makefile.in	Sat Mar  4 16:08:46 2000
+@@ -43,7 +43,7 @@
+ INTLLIBS = @INTLLIBS@
  
  # Targets
--all: jpilot
-+all: jpilot libplugin
+-all: po_dir intl_dir jpilot
++all: po_dir intl_dir jpilot libplugin
  
  jpilot: jpilot.o datebook.o address.o todo.o memo.o \
  	utils.o sync.o prefs.o log.o plugins.o \
-@@ -132,8 +132,10 @@
- 	./install-sh -c -m 755 -g bin -o bin empty/AddressDB.pdb $(prefix)/share/jpilot/
- 	./install-sh -c -m 755 -g bin -o bin empty/ToDoDB.pdb $(prefix)/share/jpilot/
- 	./install-sh -c -m 755 -g bin -o bin empty/MemoDB.pdb $(prefix)/share/jpilot/
+@@ -192,6 +192,7 @@
+ 	./install-sh -c -m 755 empty/AddressDB.pdb $(prefix)/share/jpilot/
+ 	./install-sh -c -m 755 empty/ToDoDB.pdb $(prefix)/share/jpilot/
+ 	./install-sh -c -m 755 empty/MemoDB.pdb $(prefix)/share/jpilot/
 +	./install-sh -c -m 644 libplugin.a $(prefix)/lib/
+ 	cd intl; make install
+ 	cd po; make install
  
- uninstall:
- 	rm $(prefix)/share/jpilot/*
- 	rm $(prefix)/bin/jpilot
- 	rm $(prefix)/jpilot
-+	rm $(prefix)/lib/libplugin.a
diff --git a/palm/jpilot/files/patch-bb b/palm/jpilot/files/patch-bb
index 5dd953ed259b..224e2d7dfbfb 100644
--- a/palm/jpilot/files/patch-bb
+++ b/palm/jpilot/files/patch-bb
@@ -1,11 +1,11 @@
---- configure.orig	Wed Nov 10 09:59:25 1999
-+++ configure	Fri Dec 24 10:58:01 1999
-@@ -951,7 +951,7 @@
+--- configure.orig	Sat Mar  4 16:10:48 2000
++++ configure	Sat Mar  4 16:10:54 2000
+@@ -3779,7 +3779,7 @@
        echo $ac_n "checking for dlopen""... $ac_c" 1>&6
- echo "configure:953: checking for dlopen" >&5
+ echo "configure:3781: checking for dlopen" >&5
     save_LIBS="$LIBS"
 -   LIBS="$LIBS -ldl"
 +   LIBS="$LIBS"
     cat > conftest.$ac_ext <<EOF
- #line 957 "configure"
+ #line 3785 "configure"
  #include "confdefs.h"
diff --git a/palm/jpilot/files/patch-bc b/palm/jpilot/files/patch-bc
index 467778672860..4a50bc12e30c 100644
--- a/palm/jpilot/files/patch-bc
+++ b/palm/jpilot/files/patch-bc
@@ -1,5 +1,5 @@
---- SyncTime/Makefile.in.orig	Fri Nov  5 08:35:11 1999
-+++ SyncTime/Makefile.in	Fri Dec 24 11:01:26 1999
+--- SyncTime/Makefile.in.orig	Sat Feb 12 20:35:13 2000
++++ SyncTime/Makefile.in	Sat Mar  4 16:11:28 2000
 @@ -27,7 +27,7 @@
  	echo; echo "WARNING - SyncTime is currently broken for PalmOS 3.3"; echo
  
diff --git a/palm/jpilot/files/patch-bd b/palm/jpilot/files/patch-bd
deleted file mode 100644
index c91b7ac9acc6..000000000000
--- a/palm/jpilot/files/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
---- Expense/Makefile.in.orig	Wed Nov  3 13:00:42 1999
-+++ Expense/Makefile.in	Fri Dec 24 11:37:21 1999
-@@ -24,7 +24,7 @@
- all: libexpense.so
- 
- libexpense.so: expense.o libplugin.a
--	ld -shared -ldl -o libexpense.so expense.o -L. -lplugin
-+	ld -shared -o libexpense.so expense.o -L. -lplugin
- 
- expense.o: expense.c libplugin.h
- 	$(CC) $(OPTIONS) $(GTKFLAGS) $(PILOT_FLAGS) -c expense.c
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index 752ef069687b..a497c3a737dd 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -8,7 +8,13 @@ share/jpilot/DatebookDB.pdb
 share/jpilot/AddressDB.pdb
 share/jpilot/ToDoDB.pdb
 share/jpilot/MemoDB.pdb
-share/doc/jpilot/plugin.html
 lib/libplugin.a
+share/doc/jpilot/plugin.html
+share/locale/da/LC_MESSAGES/jpilot.mo
+share/locale/de/LC_MESSAGES/jpilot.mo
+share/locale/fr/LC_MESSAGES/jpilot.mo
+share/locale/ja/LC_MESSAGES/jpilot.mo
+share/locale/sv/LC_MESSAGES/jpilot.mo
 @dirrm share/jpilot
 @dirrm share/doc/jpilot
+@dirrm share/local