From a520ba5a84d931ae3004419001dc9db8b911e66d Mon Sep 17 00:00:00 2001 From: bad Date: Thu, 9 Oct 2008 19:01:57 +0000 Subject: Update jpilot to 1.6.0. Changes since 0.99.9: Support for Treo 680. 1.6.0 - 05/27/08 Support for MemosDB-PMem Support for ContactsDB-PAdd Syncing merged records fixes Added sortable columns in KeyRing Temporarily removed Edit categories Many many bug fixes and small changes --- comms/jpilot/Makefile | 14 ++------ comms/jpilot/PLIST | 77 +++++++++++++++++++++++-------------------- comms/jpilot/buildlink3.mk | 6 ++-- comms/jpilot/distinfo | 10 +++--- comms/jpilot/patches/patch-aa | 13 -------- comms/jpilot/patches/patch-ad | 13 -------- 6 files changed, 51 insertions(+), 82 deletions(-) delete mode 100644 comms/jpilot/patches/patch-aa delete mode 100644 comms/jpilot/patches/patch-ad diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index 75e5e93d80f..fdaa27d4e96 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2008/01/18 05:06:26 tnn Exp $ +# $NetBSD: Makefile,v 1.63 2008/10/09 19:01:57 bad Exp $ # -DISTNAME= jpilot-0.99.9 -PKGREVISION= 2 +DISTNAME= jpilot-1.6.0 CATEGORIES= comms MASTER_SITES= http://www.jpilot.org/ @@ -16,7 +15,7 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_OLD_DES_API= YES USE_DIRS+= xdg-1.4 -USE_TOOLS+= intltool msgfmt pkg-config +USE_TOOLS+= gmake intltool msgfmt pkg-config USE_LANGUAGES+= c GNU_CONFIGURE= YES @@ -37,13 +36,6 @@ PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins post-extract: ${RM} -f ${WRKSRC}/po/Makefile.in -pre-configure: - for file in ${WRKSRC}/docs/jpilot.1; do \ - ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ - $${file} > $${file}.fixed; \ - ${MV} -f $${file}.fixed $${file}; \ - done - post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA_DIR} ${INCDIR} diff --git a/comms/jpilot/PLIST b/comms/jpilot/PLIST index bddf9f1e595..b73dbbc6894 100644 --- a/comms/jpilot/PLIST +++ b/comms/jpilot/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2006/11/20 18:34:27 bad Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/10/09 19:01:57 bad Exp $ bin/jpilot bin/jpilot-dump bin/jpilot-sync @@ -12,44 +12,48 @@ man/man1/jpilot-dial.1 man/man1/jpilot-dump.1 man/man1/jpilot-sync.1 man/man1/jpilot.1 -share/doc/${PKGNAME}/AUTHORS -share/doc/${PKGNAME}/BUGS -share/doc/${PKGNAME}/COPYING -share/doc/${PKGNAME}/ChangeLog -share/doc/${PKGNAME}/INSTALL -share/doc/${PKGNAME}/README -share/doc/${PKGNAME}/TODO -share/doc/${PKGNAME}/icons/README -share/doc/${PKGNAME}/icons/jpilot-icon1.xpm -share/doc/${PKGNAME}/icons/jpilot-icon2.xpm -share/doc/${PKGNAME}/icons/jpilot-icon3.xpm -share/doc/${PKGNAME}/icons/jpilot-icon4.xpm -share/doc/${PKGNAME}/manual/jpilot-address.png -share/doc/${PKGNAME}/manual/jpilot-datebook.png -share/doc/${PKGNAME}/manual/jpilot-expense.png -share/doc/${PKGNAME}/manual/jpilot-install.png -share/doc/${PKGNAME}/manual/jpilot-memo.png -share/doc/${PKGNAME}/manual/jpilot-prefs-1.png -share/doc/${PKGNAME}/manual/jpilot-prefs-2.png -share/doc/${PKGNAME}/manual/jpilot-prefs-3.png -share/doc/${PKGNAME}/manual/jpilot-prefs-4.png -share/doc/${PKGNAME}/manual/jpilot-prefs-5.png -share/doc/${PKGNAME}/manual/jpilot-prefs-6.png -share/doc/${PKGNAME}/manual/jpilot-prefs-7.png -share/doc/${PKGNAME}/manual/jpilot-prefs-8.png -share/doc/${PKGNAME}/manual/jpilot-print.png -share/doc/${PKGNAME}/manual/jpilot-search.png -share/doc/${PKGNAME}/manual/jpilot-todo.png -share/doc/${PKGNAME}/manual/jpilot-toplogo.jpg -share/doc/${PKGNAME}/manual/manual.html -share/doc/${PKGNAME}/manual/plugin.html +share/doc/jpilot/AUTHORS +share/doc/jpilot/BUGS +share/doc/jpilot/COPYING +share/doc/jpilot/ChangeLog +share/doc/jpilot/INSTALL +share/doc/jpilot/README +share/doc/jpilot/TODO +share/doc/jpilot/icons/README +share/doc/jpilot/icons/jpilot-icon1.xpm +share/doc/jpilot/icons/jpilot-icon2.xpm +share/doc/jpilot/icons/jpilot-icon3.xpm +share/doc/jpilot/icons/jpilot-icon4.xpm +share/doc/jpilot/manual/jpilot-address.png +share/doc/jpilot/manual/jpilot-datebook.png +share/doc/jpilot/manual/jpilot-expense.png +share/doc/jpilot/manual/jpilot-install.png +share/doc/jpilot/manual/jpilot-memo.png +share/doc/jpilot/manual/jpilot-prefs-1.png +share/doc/jpilot/manual/jpilot-prefs-2.png +share/doc/jpilot/manual/jpilot-prefs-3.png +share/doc/jpilot/manual/jpilot-prefs-4.png +share/doc/jpilot/manual/jpilot-prefs-5.png +share/doc/jpilot/manual/jpilot-prefs-6.png +share/doc/jpilot/manual/jpilot-prefs-7.png +share/doc/jpilot/manual/jpilot-prefs-8.png +share/doc/jpilot/manual/jpilot-print.png +share/doc/jpilot/manual/jpilot-search.png +share/doc/jpilot/manual/jpilot-todo.png +share/doc/jpilot/manual/jpilot-toplogo.jpg +share/doc/jpilot/manual/manual.html +share/doc/jpilot/manual/plugin.html share/doc/jpilot/BUGS share/applications/jpilot.desktop share/jpilot/AddressDB.pdb +share/jpilot/CalendarDB-PDat.pdb +share/jpilot/ContactsDB-PAdd.pdb share/jpilot/DatebookDB.pdb share/jpilot/ExpenseDB.pdb share/jpilot/Memo32DB.pdb share/jpilot/MemoDB.pdb +share/jpilot/MemosDB-PMem.pdb +share/jpilot/TasksDB-PTod.pdb share/jpilot/ToDoDB.pdb share/jpilot/jpilotrc.blue share/jpilot/jpilotrc.default @@ -65,8 +69,9 @@ share/locale/fr/LC_MESSAGES/jpilot.mo share/locale/it/LC_MESSAGES/jpilot.mo share/locale/ja/LC_MESSAGES/jpilot.mo share/locale/ko/LC_MESSAGES/jpilot.mo +share/locale/nb/LC_MESSAGES/jpilot.mo share/locale/nl/LC_MESSAGES/jpilot.mo -share/locale/no/LC_MESSAGES/jpilot.mo +share/locale/pt_BR/LC_MESSAGES/jpilot.mo share/locale/ru/LC_MESSAGES/jpilot.mo share/locale/rw/LC_MESSAGES/jpilot.mo share/locale/sv/LC_MESSAGES/jpilot.mo @@ -76,9 +81,9 @@ share/locale/vi/LC_MESSAGES/jpilot.mo share/locale/zh_CN/LC_MESSAGES/jpilot.mo share/locale/zh_TW/LC_MESSAGES/jpilot.mo @dirrm share/jpilot -@dirrm share/doc/${PKGNAME}/icons -@dirrm share/doc/${PKGNAME}/manual -@dirrm share/doc/${PKGNAME} +@dirrm share/doc/jpilot/icons +@dirrm share/doc/jpilot/manual +@dirrm share/doc/jpilot @dirrm share/doc/jpilot @dirrm lib/jpilot/plugins @dirrm lib/jpilot diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk index a59bbc9b0d5..fd7ce54ead2 100644 --- a/comms/jpilot/buildlink3.mk +++ b/comms/jpilot/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2008/10/09 19:01:57 bad Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ JPILOT_BUILDLINK3_MK:= ${JPILOT_BUILDLINK3_MK}+ @@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= jpilot BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jpilot .if !empty(JPILOT_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.jpilot+= jpilot>=0.99.5nb4 -BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=0.99.7nb3 +BUILDLINK_API_DEPENDS.jpilot+= jpilot>=1.6.0 +BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.6.0 BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot .endif # JPILOT_BUILDLINK3_MK diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo index a10370377d3..a278fbb3812 100644 --- a/comms/jpilot/distinfo +++ b/comms/jpilot/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.20 2006/11/20 18:34:27 bad Exp $ +$NetBSD: distinfo,v 1.21 2008/10/09 19:01:57 bad Exp $ -SHA1 (jpilot-0.99.9.tar.gz) = 19a76f8815188a1b7993fbff81624e852a3bbc5c -RMD160 (jpilot-0.99.9.tar.gz) = 0286b9f9579dbbdb8e9bd207384561814bab5114 -Size (jpilot-0.99.9.tar.gz) = 1671351 bytes -SHA1 (patch-aa) = 1eae313fd7196a2f3639f7cf7ea5782ca8fb4633 -SHA1 (patch-ad) = cac013141685ff632cafc7a45841d4c9b77a957f +SHA1 (jpilot-1.6.0.tar.gz) = d48963c34b7f27b11111da966e54fd555477a19a +RMD160 (jpilot-1.6.0.tar.gz) = c4610360c2ccde8e32b466746947606fe9260df9 +Size (jpilot-1.6.0.tar.gz) = 1573667 bytes diff --git a/comms/jpilot/patches/patch-aa b/comms/jpilot/patches/patch-aa deleted file mode 100644 index e6c4e74a29a..00000000000 --- a/comms/jpilot/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2006/11/20 18:34:27 bad Exp $ - ---- jpilot.c.orig 2006-06-09 22:42:57.000000000 +0200 -+++ jpilot.c -@@ -2180,7 +2180,7 @@ char * xpm_backup[] = { - - /* 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/comms/jpilot/patches/patch-ad b/comms/jpilot/patches/patch-ad deleted file mode 100644 index 56344374e92..00000000000 --- a/comms/jpilot/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2005/09/05 07:43:40 rh Exp $ - ---- docs/jpilot.1.orig 2004-02-17 20:36:44.000000000 -0800 -+++ docs/jpilot.1 -@@ -32,7 +32,7 @@ which port to sync on, and at what speed - - If PILOTPORT is not set then it defaults to /dev/pilot. - .SH BUGS --See /usr/share/doc/jpilot/BUGS -+See @PREFIX@/share/doc/jpilot/BUGS - .SH SEE ALSO - jpilot-sync(1) - .SH AUTHOR -- cgit v1.2.3