5 files changed, 13 insertions, 30 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 6c91943e499b..4b379d866a27 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -7,8 +7,7 @@
 # "?=" and "+=" are for including this Makefile from japanese/jpilot
 
 PORTNAME=	jpilot
-PORTVERSION=	0.99.7
-PORTREVISION=	3
+PORTVERSION=	0.99.8
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://jpilot.org/
 
@@ -19,7 +18,7 @@ LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
 CFLAGS+=	-I${LOCALBASE}/include
@@ -43,7 +42,7 @@ USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk2=yes
 .endif
 
-MAN1=		jpilot-sync.1 jpilot.1
+MAN1=		jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -54,6 +53,8 @@ post-install:
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${PREFIX}/lib/jpilot -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dial.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dump.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-sync.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/jpilot.1 ${PREFIX}/man/man1
 	@${MKDIR} ${DATADIR}/icons
diff --git a/palm/jpilot/distinfo b/palm/jpilot/distinfo
index 6455ea5fa2b7..c9fb51198f3a 100644
--- a/palm/jpilot/distinfo
+++ b/palm/jpilot/distinfo
@@ -1,2 +1,2 @@
-MD5 (jpilot-0.99.7.tar.gz) = 11bb7236702e2e4c7e3d06372bdc9695
-SIZE (jpilot-0.99.7.tar.gz) = 1197119
+MD5 (jpilot-0.99.8.tar.gz) = 4bdb200367e691e64d02bd6dfcdec604
+SIZE (jpilot-0.99.8.tar.gz) = 1589217
diff --git a/palm/jpilot/files/patch-Makefile.in b/palm/jpilot/files/patch-Makefile.in
index 49c9ede7e12c..bffaf5d0b0b9 100644
--- a/palm/jpilot/files/patch-Makefile.in
+++ b/palm/jpilot/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Feb 28 15:19:48 2004
-+++ Makefile.in	Sun Feb 29 17:22:11 2004
-@@ -312,7 +312,7 @@
+--- Makefile.in.orig	Sun Oct 30 18:00:53 2005
++++ Makefile.in	Tue Nov  1 17:17:43 2005
+@@ -302,7 +302,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff --git a/palm/jpilot/files/patch-address_gui.c b/palm/jpilot/files/patch-address_gui.c
deleted file mode 100644
index f5c1be5141c2..000000000000
--- a/palm/jpilot/files/patch-address_gui.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- address_gui.c~	2004-05-11 22:33:45.364123000 -0400
-+++ address_gui.c	2004-05-11 22:38:37.506140000 -0400
-@@ -1427,13 +1427,15 @@
-    char number[100];
-    char ext[100];
- 
--   number[0]=ext[0]='\0';
--   text=data;
- #ifdef ENABLE_GTK2
-    GtkTextIter    start_iter;
-    GtkTextIter    end_iter;
-    GtkTextBuffer *text_buffer;
-+#endif
- 
-+   number[0]=ext[0]='\0';
-+   text=data;
-+#ifdef ENABLE_GTK2
-    text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
-    gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(text),&start_iter,&end_iter);
-    str = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(text),&start_iter,&end_iter,TRUE);
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index 1c19a56ece05..81fa32df1426 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -1,7 +1,7 @@
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
-share/gnome/apps/Applications/jpilot.desktop
+share/applications/jpilot.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/da/LC_MESSAGES/jpilot.mo
@@ -13,8 +13,10 @@ share/gnome/apps/Applications/jpilot.desktop
 %%NLS%%share/locale/nl/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/no/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/jpilot.mo
+@unexec rmdir %D/share/applications 2>/dev/null || true