6 files changed, 21 insertions, 55 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 6daee25ac333..a16d79f7b0aa 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -7,25 +7,25 @@
 # "?=" and "+=" are for including this Makefile from japanese/jpilot
 
 PORTNAME=	jpilot
-PORTVERSION=	0.99.8
-PORTREVISION=	4
+PORTVERSION=	0.99.9
+PORTREVISION=	0
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://jpilot.org/
 
 MAINTAINER?=	samm@os2.kiev.ua
 COMMENT=	Desktop Organizer Software for the Palm Pilot
 
-LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
+LIB_DEPENDS=	pisock.9:${PORTSDIR}/palm/pilot-link
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
+USE_LDCONFIG=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -38,9 +38,9 @@ PLIST_SUB=		NLS="@comment "
 
 .if defined(WITH_GTK1)
 USE_GNOME+=	gtk12
+CONFIGURE_ARGS+=	--disable-gtk2=yes
 .else
 USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk2=yes
 .endif
 
 MAN1=		jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1
@@ -71,7 +71,7 @@ post-install:
 .for ext in html png jpg
 	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
 .endfor
-.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO UPGRADING
+.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons
diff --git a/palm/jpilot/distinfo b/palm/jpilot/distinfo
index 7c832dd45542..86465ed3328e 100644
--- a/palm/jpilot/distinfo
+++ b/palm/jpilot/distinfo
@@ -1,3 +1,3 @@
-MD5 (jpilot-0.99.8.tar.gz) = 4bdb200367e691e64d02bd6dfcdec604
-SHA256 (jpilot-0.99.8.tar.gz) = a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78
-SIZE (jpilot-0.99.8.tar.gz) = 1589217
+MD5 (jpilot-0.99.9.tar.gz) = c39df29aeed57b84a674524856ebc290
+SHA256 (jpilot-0.99.9.tar.gz) = 341491ad727e234b58c7d5f057bcff363d15d2f223c1beab05fc49820dfe6432
+SIZE (jpilot-0.99.9.tar.gz) = 1671351
diff --git a/palm/jpilot/files/patch-0.99.8-memory b/palm/jpilot/files/patch-0.99.8-memory
deleted file mode 100644
index cb8e270b1c21..000000000000
--- a/palm/jpilot/files/patch-0.99.8-memory
+++ /dev/null
@@ -1,12 +0,0 @@
---- utils.c.orig	2005-12-11 13:04:24.000000000 -0500
-+++ utils.c	2005-12-11 13:04:38.000000000 -0500
-@@ -2042,9 +2042,6 @@
-       fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
- #endif /* PILOT_LINK_0_12 */
-       jp_logf(JP_LOG_DEBUG, "record deleted\n");
--#ifdef PILOT_LINK_0_12
--      pi_buffer_free(RecordBuffer);
--#endif /* PILOT_LINK_0_12 */
-       fclose(pc_in);
- #ifdef PILOT_LINK_0_12
-       pi_buffer_free(RecordBuffer);
diff --git a/palm/jpilot/files/patch-jpilot b/palm/jpilot/files/patch-jpilot
deleted file mode 100644
index 6be41c16cf62..000000000000
--- a/palm/jpilot/files/patch-jpilot
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u -r1.127 -r1.128
---- jpilot.c	28 Nov 2005 07:22:22 -0000	1.127
-+++ jpilot.c	16 Dec 2005 13:33:27 -0000	1.128
-@@ -1,4 +1,4 @@
--/* $Id: jpilot.c,v 1.127 2005/11/28 07:22:22 rikster5 Exp $ */
-+/* $Id: jpilot.c,v 1.128 2005/12/16 13:33:27 rousseau Exp $ */
- 
- /*******************************************************************************
-  * jpilot.c
-@@ -1367,7 +1367,7 @@
-    gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
-    data = gdk_pixdata_serialize(pixdata, &len);
- 
--   g_free(pixbuf);
-+   g_object_unref(pixbuf);
-    g_free(pixdata);
- 
-    return data;
diff --git a/palm/jpilot/files/patch-jpilot-langinfo b/palm/jpilot/files/patch-jpilot-langinfo
new file mode 100644
index 000000000000..4837a963b890
--- /dev/null
+++ b/palm/jpilot/files/patch-jpilot-langinfo
@@ -0,0 +1,11 @@
+--- jpilot.c.orig	Fri Jun  9 23:42:57 2006
++++ jpilot.c	Tue Sep 12 18:51:49 2006
+@@ -2180,7 +2180,7 @@
+ 
+    /* Extract first day of week preference from locale in GTK2 */
+ #  ifdef ENABLE_GTK2
+-#     ifdef HAVE_LANGINFO_H
++#     if defined(HAVE_LANGINFO_H) && defined(_NL_TIME_FIRST_WEEKDAY)
+ 	 /* GTK 2.8 libraries */
+ 	 week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+ 	 pref_fdow = *((unsigned char *) week_start) - 1;
diff --git a/palm/jpilot/files/patch-jpilot-sync b/palm/jpilot/files/patch-jpilot-sync
deleted file mode 100644
index 3b478400f286..000000000000
--- a/palm/jpilot/files/patch-jpilot-sync
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: jpilot-sync.c
-===================================================================
-RCS file: /cvs/jpilot/jpilot_src/jpilot-sync.c,v
-retrieving revision 1.23
-diff -u -r1.23 jpilot-sync.c
---- jpilot-sync.c	28 Jan 2005 16:54:13 -0000	1.23
-+++ jpilot-sync.c	5 Nov 2005 15:07:57 -0000
-@@ -44,6 +44,7 @@
- pid_t glob_child_pid;
- GtkWidget *glob_dialog;
- pid_t glob_child_pid;
-+GtkTooltips *glob_tooltips;
- 
- unsigned char skip_plugins;
-