- Update to 1.6.0

PR:		128623
Submitted by:	Alex Samorukov <samm@os2.kiev.ua> (maintainer)

5 files changed, 18 insertions, 25 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index a9b19d0285a1..65ee504c1aa7 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.9
-PORTREVISION=	3
+PORTVERSION=	1.6.0
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/ \
 		http://jpilot.org/
@@ -18,6 +17,7 @@ COMMENT=	Desktop Organizer Software for the Palm Pilot
 
 LIB_DEPENDS=	pisock.9:${PORTSDIR}/palm/pilot-link
 
+USE_GMAKE=	yes
 USE_GNOME=	gnomehier
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
@@ -49,6 +49,8 @@ MAN1=		jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1
 PORTDOCS=	*
 .endif
 
+post-build:
+	cd ${WRKSRC}/docs && ${GMAKE}
 post-install:
 	@${FIND} ${PREFIX}/lib/jpilot ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
diff --git a/palm/jpilot/distinfo b/palm/jpilot/distinfo
index 86465ed3328e..d6b6028d9cb2 100644
--- a/palm/jpilot/distinfo
+++ b/palm/jpilot/distinfo
@@ -1,3 +1,3 @@
-MD5 (jpilot-0.99.9.tar.gz) = c39df29aeed57b84a674524856ebc290
-SHA256 (jpilot-0.99.9.tar.gz) = 341491ad727e234b58c7d5f057bcff363d15d2f223c1beab05fc49820dfe6432
-SIZE (jpilot-0.99.9.tar.gz) = 1671351
+MD5 (jpilot-1.6.0.tar.gz) = 7918d345fb7e4b644a7211db03ddd148
+SHA256 (jpilot-1.6.0.tar.gz) = e606ebad9817f90e358515dbe06c887592ba7ad4ea6357bded6eb9139d8c35ef
+SIZE (jpilot-1.6.0.tar.gz) = 1573667
diff --git a/palm/jpilot/files/patch-Makefile.in b/palm/jpilot/files/patch-Makefile.in
index bffaf5d0b0b9..fd613d71439d 100644
--- a/palm/jpilot/files/patch-Makefile.in
+++ b/palm/jpilot/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Oct 30 18:00:53 2005
-+++ Makefile.in	Tue Nov  1 17:17:43 2005
-@@ -302,7 +302,7 @@
+--- Makefile.in	2008-11-06 00:38:50.000000000 +0100
++++ Makefile.in	2008-11-06 00:40:39.000000000 +0100
+@@ -331,7 +331,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = Expense SyncTime KeyRing docs dialer po m4 empty icons
-+SUBDIRS = Expense SyncTime KeyRing dialer po m4 empty
- 
- # install the manual docs
- colordir = $(prefix)/share/$(PACKAGE)
+-SUBDIRS = Expense SyncTime KeyRing dialer m4 po icons docs empty
++SUBDIRS = Expense SyncTime KeyRing dialer m4 po empty
+ EXTRA_DIST = config.rpath mkinstalldirs reconf autogen.sh \
+ 	intltool-extract.in intltool-merge.in intltool-update.in \
+ 	ChangeLog ChangeLog.cvs \
diff --git a/palm/jpilot/files/patch-jpilot-langinfo b/palm/jpilot/files/patch-jpilot-langinfo
deleted file mode 100644
index 4837a963b890..000000000000
--- a/palm/jpilot/files/patch-jpilot-langinfo
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/palm/jpilot/pkg-plist
index 0c47fc1bf064..bbedbc5ebfd0 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -12,7 +12,6 @@ share/applications/jpilot.desktop
 %%NLS%%share/locale/ja/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/jpilot.mo
 %%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
@@ -21,6 +20,9 @@ share/applications/jpilot.desktop
 %%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
+%%NLS%%share/locale/nb/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/jpilot.mo
+
 @dirrmtry share/applications
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw