Date: Wed, 6 Feb 2002 16:18:57 -0800 (PST) From: varju@webct.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34679: maintainer update of ports/palm/jpilot Message-ID: <200202070018.g170Iv451021@snapple.webct.com>
next in thread | raw e-mail | index | archive | help
>Number: 34679 >Category: ports >Synopsis: maintainer update of ports/palm/jpilot >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 06 16:20:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Alex Varju <varju@webct.com> >Release: FreeBSD 4.3-RELEASE-p23 i386 >Organization: WebCT >Environment: System: FreeBSD snapple.webct.com 4.3-RELEASE-p23 FreeBSD 4.3-RELEASE-p23 #4: Mon Jan 21 23:23:45 PST 2002 varju@snapple.webct.com:/usr/obj/home/cvs/src.releng4/sys/SNAPPLE i386 >Description: Update ports/palm/jpilot to version 0.99.2 - install in LOCALBASE instead of LOCALBASE/pilot Release Notes: 0.99.2 - 02/06/02 - Made changes to support pilot-link 0.10.1 and USB (palm m series and clies) - Export for Datebook, Address, Todo, and Memo - Import for Datebook, Address, Todo, and Memo - Can now enter begin/end times into datebook by GUI, or keyboard. - Put icons in clist title buttons. - Prompts to Save a changed/new record instead of letting it get away. - Drastically improved local database read speeds caused by bugs intro'd in 0.99 - Fixed misc bugs in alarms. - Support for pedit (pedit is a memo editor for the palm). - Added Preferences to choose conduits. - Adding in better printing support. - Adding in record masking support. - Wrote a KeyRing plugin (KeyRing is a palm encryption app). - Added Restore Functionality. - Added plugin_startup & plugin_cleanup funcs to jpilot-sync. - Added man pages. - Added plugin_startup and plugin_cleanup to jpilot-sync. - Added a default pdb file for Expenses. - Added an icon when iconized. >How-To-Repeat: >Fix: The patch below adds one new file, palm/jpilot/files/patch-KeyRing_Makefile.in The following files are obsolete: palm/jpilot/files/patch-address.c palm/jpilot/files/patch-configure.in palm/jpilot/files/patch-datebook.c palm/jpilot/files/patch-datebook_gui.c palm/jpilot/files/patch-japanese.c palm/jpilot/files/patch-memo.c palm/jpilot/files/patch-sync.c palm/jpilot/files/patch-todo_gui.c palm/jpilot/files/patch-utils.c palm/jpilot/files/patch-utils.h Index: palm/jpilot/Makefile =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/Makefile,v retrieving revision 1.18 diff -u -w -r1.18 Makefile --- palm/jpilot/Makefile 2001/08/30 02:03:01 1.18 +++ palm/jpilot/Makefile 2002/02/06 23:56:54 @@ -7,8 +7,7 @@ # "?=" and "+=" are for including this Makefile from japanese/jpilot PORTNAME= jpilot -PORTVERSION= 0.99 -PORTREVISION?= 3 +PORTVERSION= 0.99.2 CATEGORIES+= palm comms MASTER_SITES= http://jpilot.org/ @@ -17,18 +16,37 @@ LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link \ intl.1:${PORTSDIR}/devel/gettext -PREFIX= ${LOCALBASE}/pilot USE_GTK= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+=--with-pilot-prefix=${PREFIX} INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +LDCONFIG_DIRS= %%PREFIX%%/lib/jpilot/plugins +MAN1= jpilot-sync.1 jpilot-upgrade-99.1 jpilot.1 + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/jpilot ${CP} ${WRKSRC}/docs/manual.html ${PREFIX}/share/doc/jpilot ${CP} ${WRKSRC}/docs/plugin.html ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/BUGS ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/CHANGELOG ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/COPYING ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/README ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/TODO ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/UPGRADING ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-address.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-datebook.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-expense.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-install.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-memo.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-prefs.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-print.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-search.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-todo.png ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/docs/jpilot-toplogo.jpg ${PREFIX}/share/doc/jpilot + ${CP} ${WRKSRC}/icons/README ${PREFIX}/share/doc/jpilot/README.icons .endif .include <bsd.port.mk> Index: palm/jpilot/distinfo =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/distinfo,v retrieving revision 1.9 diff -u -w -r1.9 distinfo --- palm/jpilot/distinfo 2001/02/09 16:14:28 1.9 +++ palm/jpilot/distinfo 2002/02/07 00:02:40 @@ -1 +1 @@ -MD5 (jpilot-0.99.tar.gz) = a6c8c1a9bc74f8a3f8403c451fdaef0f +MD5 (jpilot-0.99.2.tar.gz) = 57be9e7cd2b2878fd439c98d77d4bdb9 Index: palm/jpilot/pkg-plist =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/pkg-plist,v retrieving revision 1.8 diff -u -w -r1.8 pkg-plist --- palm/jpilot/pkg-plist 2001/02/09 16:14:28 1.8 +++ palm/jpilot/pkg-plist 2002/02/07 00:00:12 @@ -3,15 +3,42 @@ bin/jpilot-sync bin/jpilot-upgrade-99 lib/jpilot/plugins/libexpense.a +lib/jpilot/plugins/libexpense.la lib/jpilot/plugins/libexpense.so lib/jpilot/plugins/libexpense.so.1 +lib/jpilot/plugins/libkeyring.a +lib/jpilot/plugins/libkeyring.la +lib/jpilot/plugins/libkeyring.so +lib/jpilot/plugins/libkeyring.so.1 lib/jpilot/plugins/libsynctime.a +lib/jpilot/plugins/libsynctime.la lib/jpilot/plugins/libsynctime.so lib/jpilot/plugins/libsynctime.so.1 %%PORTDOCS%%share/doc/jpilot/manual.html %%PORTDOCS%%share/doc/jpilot/plugin.html +%%PORTDOCS%%share/doc/jpilot/BUGS +%%PORTDOCS%%share/doc/jpilot/CHANGELOG +%%PORTDOCS%%share/doc/jpilot/COPYING +%%PORTDOCS%%share/doc/jpilot/CREDITS +%%PORTDOCS%%share/doc/jpilot/INSTALL +%%PORTDOCS%%share/doc/jpilot/README +%%PORTDOCS%%share/doc/jpilot/README.icons +%%PORTDOCS%%share/doc/jpilot/TODO +%%PORTDOCS%%share/doc/jpilot/UPGRADING +%%PORTDOCS%%share/doc/jpilot/jpilot-address.png +%%PORTDOCS%%share/doc/jpilot/jpilot-datebook.png +%%PORTDOCS%%share/doc/jpilot/jpilot-expense.png +%%PORTDOCS%%share/doc/jpilot/jpilot-install.png +%%PORTDOCS%%share/doc/jpilot/jpilot-memo.png +%%PORTDOCS%%share/doc/jpilot/jpilot-prefs.png +%%PORTDOCS%%share/doc/jpilot/jpilot-print.png +%%PORTDOCS%%share/doc/jpilot/jpilot-search.png +%%PORTDOCS%%share/doc/jpilot/jpilot-todo.png +%%PORTDOCS%%share/doc/jpilot/jpilot-toplogo.jpg share/jpilot/AddressDB.pdb share/jpilot/DatebookDB.pdb +share/jpilot/ExpenseDB.pdb +share/jpilot/Memo32DB.pdb share/jpilot/MemoDB.pdb share/jpilot/ToDoDB.pdb share/jpilot/jpilotrc.blue @@ -19,16 +46,22 @@ share/jpilot/jpilotrc.green share/jpilot/jpilotrc.purple share/jpilot/jpilotrc.steel +share/jpilot/icons/jpilot-icon1.xpm +share/jpilot/icons/jpilot-icon2.xpm +share/jpilot/icons/jpilot-icon3.xpm +share/jpilot/icons/jpilot-icon4.xpm share/locale/ca/LC_MESSAGES/jpilot.mo share/locale/cs/LC_MESSAGES/jpilot.mo share/locale/da/LC_MESSAGES/jpilot.mo share/locale/de/LC_MESSAGES/jpilot.mo share/locale/es/LC_MESSAGES/jpilot.mo share/locale/fr/LC_MESSAGES/jpilot.mo +share/locale/it/LC_MESSAGES/jpilot.mo share/locale/ja/LC_MESSAGES/jpilot.mo share/locale/nl/LC_MESSAGES/jpilot.mo share/locale/no/LC_MESSAGES/jpilot.mo share/locale/sv/LC_MESSAGES/jpilot.mo +@dirrm share/jpilot/icons @dirrm share/jpilot %%PORTDOCS%%@dirrm share/doc/jpilot @dirrm lib/jpilot/plugins Index: palm/jpilot/files/patch-Expense_Makefile.in =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-Expense_Makefile.in,v retrieving revision 1.1 diff -u -w -r1.1 patch-Expense_Makefile.in --- palm/jpilot/files/patch-Expense_Makefile.in 2001/02/09 16:14:28 1.1 +++ palm/jpilot/files/patch-Expense_Makefile.in 2002/01/10 06:14:33 @@ -1,18 +1,12 @@ ---- Expense/Makefile.in.orig Fri Dec 8 06:44:26 2000 -+++ Expense/Makefile.in Fri Feb 9 23:46:37 2001 -@@ -52,13 +52,13 @@ - install: - ./install-sh -d -m 755 $(prefix)/lib/jpilot; \ - ./install-sh -d -m 755 $(prefix)/lib/jpilot/plugins; \ -- ../libtool --mode=install ./install-sh \ -+ ../libtool --mode=install ./install-sh -c \ - libexpense.la $(prefix)/lib/jpilot/plugins +--- Expense/Makefile.in.orig Sun Dec 23 16:43:25 2001 ++++ Expense/Makefile.in Wed Jan 9 22:14:27 2002 +@@ -31,8 +31,7 @@ + $(CC) $(OPTIONS) -o libexpense.la \ + expense.lo \ + -rpath $(prefix)/lib/jpilot/plugins \ +- -version-info 1:1 \ +- -avoid-version ++ -version-info 1:1 - local_install: - ./install-sh -d -m 755 $(HOME)/.jpilot; \ - ./install-sh -d -m 755 $(HOME)/.jpilot/plugins; \ -- ../libtool --mode=install ./install-sh \ -+ ../libtool --mode=install ./install-sh -c \ - libexpense.la $(HOME)/.jpilot/plugins - - uninstall: + expense.o: expense.c libplugin.h + $(LIBTOOL) --mode=compile \ Index: palm/jpilot/files/patch-Makefile.in =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-Makefile.in,v retrieving revision 1.1 diff -u -w -r1.1 patch-Makefile.in --- palm/jpilot/files/patch-Makefile.in 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-Makefile.in 2002/02/06 17:34:12 @@ -1,33 +1,51 @@ ---- Makefile.in.orig Mon Dec 18 16:53:30 2000 -+++ Makefile.in Thu Dec 21 21:22:37 2000 -@@ -43,7 +43,7 @@ - INTLLIBS = @INTLLIBS@ - - # Targets --all: po_dir intl_dir jpilot jpilot-sync jpilot-dump -+all: po_dir intl_dir jpilot jpilot-sync jpilot-dump synctime expense - - jpilot: jpilot.o datebook.o address.o todo.o memo.o \ - utils.o sync.o prefs.o log.o plugins.o \ -@@ -210,6 +210,12 @@ - intl_dir: - cd intl; $(MAKE) - -+synctime: -+ cd SyncTime; $(MAKE) -+ -+expense: -+ cd Expense; $(MAKE) -+ - clean: - rm -f *.o *~ config.cache - -@@ -236,6 +242,8 @@ - ./install-sh -c -m 755 empty/MemoDB.pdb $(prefix)/share/jpilot/ +--- Makefile.in.orig Tue Feb 5 22:29:18 2002 ++++ Makefile.in Wed Feb 6 09:33:52 2002 +@@ -427,39 +427,18 @@ + $(INSTALL) -m 644 empty/MemoDB.pdb $(prefix)/share/$(PACKAGE)/ + $(INSTALL) -m 644 empty/Memo32DB.pdb $(prefix)/share/$(PACKAGE)/ + $(INSTALL) -m 644 empty/ExpenseDB.pdb $(prefix)/share/$(PACKAGE)/ +- $(INSTALL) -d -m 755 $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/manual.html $(prefix)/doc/$(PACKAGE)-$(VERSION)/manual.html +- $(INSTALL) -m 644 docs/plugin.html $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-address.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-datebook.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-expense.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-install.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-memo.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-prefs.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-print.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-search.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-todo.png $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -m 644 docs/jpilot-toplogo.jpg $(prefix)/doc/$(PACKAGE)-$(VERSION) +- $(INSTALL) -d -m 644 $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons +- $(INSTALL) -m 644 icons/README $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/README +- $(INSTALL) -m 644 icons/jpilot-icon1.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/ +- $(INSTALL) -m 644 icons/jpilot-icon2.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/ +- $(INSTALL) -m 644 icons/jpilot-icon3.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/ +- $(INSTALL) -m 644 icons/jpilot-icon4.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/ +- $(INSTALL) -m 644 BUGS $(prefix)/doc/$(PACKAGE)-$(VERSION)/ +- $(INSTALL) -m 644 CHANGELOG $(prefix)/doc/$(PACKAGE)-$(VERSION)/ +- $(INSTALL) -m 644 COPYING $(prefix)/doc/$(PACKAGE)-$(VERSION)/ +- $(INSTALL) -m 644 CREDITS $(prefix)/doc/$(PACKAGE)-$(VERSION)/ +- $(INSTALL) -m 644 INSTALL $(prefix)/doc/$(PACKAGE)-$(VERSION)/ +- $(INSTALL) -m 644 README $(prefix)/doc/$(PACKAGE)-$(VERSION)/ +- $(INSTALL) -m 644 TODO $(prefix)/doc/$(PACKAGE)-$(VERSION)/ +- $(INSTALL) -m 644 UPGRADING $(prefix)/doc/$(PACKAGE)-$(VERSION)/ ++ $(INSTALL) -d -m 755 $(prefix)/share/jpilot/icons ++ $(INSTALL) -d -m 644 $(prefix)/share/jpilot/icons ++ $(INSTALL) -m 644 icons/jpilot-icon1.xpm $(prefix)/share/jpilot/icons/ ++ $(INSTALL) -m 644 icons/jpilot-icon2.xpm $(prefix)/share/jpilot/icons/ ++ $(INSTALL) -m 644 icons/jpilot-icon3.xpm $(prefix)/share/jpilot/icons/ ++ $(INSTALL) -m 644 icons/jpilot-icon4.xpm $(prefix)/share/jpilot/icons/ cd intl; $(MAKE) install cd po; $(MAKE) install -+ cd SyncTime; $(MAKE) install -+ cd Expense; $(MAKE) install + $(INSTALL) -d -m 755 $(mandir)/man1/ +- cat docs/jpilot.1 | gzip -9c > $(mandir)/man1/jpilot.1.gz +- cat docs/jpilot-sync.1 | gzip -9c > $(mandir)/man1/jpilot-sync.1.gz +- cat docs/jpilot-upgrade-99.1 | gzip -9c > $(mandir)/man1/jpilot-upgrade-99.1.gz ++ $(INSTALL) -m 644 docs/jpilot.1 $(mandir)/man1/ ++ $(INSTALL) -m 644 docs/jpilot-sync.1 $(mandir)/man1/ ++ $(INSTALL) -m 644 docs/jpilot-upgrade-99.1 $(mandir)/man1/ - uninstall: - rm $(prefix)/share/jpilot/* + install_plugins: + cd SyncTime; $(MAKE) install Index: palm/jpilot/files/patch-SyncTime_Makefile.in =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-SyncTime_Makefile.in,v retrieving revision 1.1 diff -u -w -r1.1 patch-SyncTime_Makefile.in --- palm/jpilot/files/patch-SyncTime_Makefile.in 2001/02/09 16:14:28 1.1 +++ palm/jpilot/files/patch-SyncTime_Makefile.in 2002/02/06 17:55:50 @@ -1,18 +1,12 @@ ---- SyncTime/Makefile.in.orig Fri Dec 8 06:44:26 2000 -+++ SyncTime/Makefile.in Fri Feb 9 23:46:00 2001 -@@ -52,13 +52,13 @@ - install: - ./install-sh -d -m 755 $(prefix)/lib/jpilot; \ - ./install-sh -d -m 755 $(prefix)/lib/jpilot/plugins; \ -- ../libtool --mode=install ./install-sh \ -+ ../libtool --mode=install ./install-sh -c \ - libsynctime.la $(prefix)/lib/jpilot/plugins +--- SyncTime/Makefile.in.orig Fri Jan 25 10:59:50 2002 ++++ SyncTime/Makefile.in Wed Feb 6 09:34:19 2002 +@@ -33,8 +33,7 @@ + $(CC) $(OPTIONS) -o libsynctime.la \ + synctime.lo \ + -rpath $(prefix)/lib/jpilot/plugins \ +- -version-info 1:1 \ +- -avoid-version ++ -version-info 1:1 - local_install: - ./install-sh -d -m 755 $(HOME)/.jpilot; \ - ./install-sh -d -m 755 $(HOME)/.jpilot/plugins; \ -- ../libtool --mode=install ./install-sh \ -+ ../libtool --mode=install ./install-sh -c \ - libsynctime.la $(HOME)/.jpilot/plugins - - uninstall: + synctime.o: synctime.c libplugin.h + $(LIBTOOL) --mode=compile \ Index: palm/jpilot/files/patch-address.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-address.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-address.c --- palm/jpilot/files/patch-address.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-address.c 2001/12/23 21:21:24 @@ -1,97 +0,0 @@ -Index: address.c -diff -u address.c:1.1.1.1 address.c:1.1.1.1.4.3 ---- address.c:1.1.1.1 Sun Feb 4 12:58:54 2001 -+++ address.c Sat Feb 17 20:37:52 2001 -@@ -31,10 +31,6 @@ - #include "libplugin.h" - #include "password.h" - --#include "japanese.h" --#include "cp1250.h" --#include "russian.h" -- - #define ADDRESS_EOF 7 - - static int glob_sort_by_company; -@@ -224,8 +220,16 @@ - unsigned int *unique_id) - { - char record[65536]; -- int rec_len; -+ int rec_len,i; - buf_rec br; -+ long char_set; -+ -+ get_pref(PREF_CHAR_SET, &char_set, NULL); -+ if (char_set != CHAR_SET_ENGLISH) { -+ for (i = 0; i < 19; i++) { -+ if (a->entry[i]) charset_j2p(a->entry[i], strlen(a->entry[i])+1, char_set); -+ } -+ } - - rec_len = pack_Address(a, record, 65535); - if (!rec_len) { -@@ -275,36 +279,22 @@ - return -1; - } - -- get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set==CHAR_SET_JAPANESE || -- char_set==CHAR_SET_1250 || -- char_set==CHAR_SET_1251 || -- char_set==CHAR_SET_1251_B -- ) { -+ get_pref(PREF_CHAR_SET, &char_set, NULL); -+ if (char_set != CHAR_SET_ENGLISH) { - /* Convert to character set */ -- { - int i; - for (i = 0; i < 16; i++) - if (ai->category.name[i][0] != '\0') { -- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->category.name[i], 16); -- if (char_set==CHAR_SET_1250) Win2Lat(ai->category.name[i], 16); -- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->category.name[i], 16); -+ charset_p2j(ai->category.name[i], 16, char_set); - } - for (i = 0; i < 19 + 3; i++) - if (ai->labels[i][0] != '\0') { -- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->labels[i], 16); -- if (char_set==CHAR_SET_1250) Win2Lat(ai->labels[i], 16); -- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->labels[i], 16); -- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(ai->labels[i], 16); -+ charset_p2j(ai->labels[i],16, char_set); - } - for (i = 0; i < 8; i++) - if (ai->phoneLabels[i][0] != '\0') { -- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->phoneLabels[i], 16); -- if (char_set==CHAR_SET_1250) Win2Lat(ai->phoneLabels[i], 16); -- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->phoneLabels[i], 16); -- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(ai->phoneLabels[i], 16); -+ charset_p2j(ai->phoneLabels[i],16, char_set); - } -- } - } - - return 0; -@@ -386,17 +376,11 @@ - } - - get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set==CHAR_SET_JAPANESE || -- char_set==CHAR_SET_1250 || -- char_set==CHAR_SET_1251 || -- char_set==CHAR_SET_1251_B -- ) { -- int i; -+ if (char_set != CHAR_SET_ENGLISH) { - for (i = 0; i < 19; i++) { -- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(a.entry[i], 65536); -- if (char_set==CHAR_SET_1250) Win2Lat(a.entry[i], 65536); -- if (char_set==CHAR_SET_1251) win1251_to_koi8(a.entry[i], 65536); -- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(a.entry[i], 65536); -+ if ((a.entry[i] != NULL) && (a.entry[i][0] != '\0')) { -+ charset_p2j(a.entry[i], strlen(a.entry[i])+1, char_set); -+ } - } - } - Index: palm/jpilot/files/patch-configure =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-configure,v retrieving revision 1.1 diff -u -w -r1.1 patch-configure --- palm/jpilot/files/patch-configure 2001/02/09 16:14:28 1.1 +++ palm/jpilot/files/patch-configure 2001/12/24 23:21:00 @@ -1,202 +1,20 @@ ---- configure.orig Fri Feb 9 23:35:45 2001 -+++ configure Fri Feb 9 23:35:48 2001 -@@ -5185,3 +5185,199 @@ - test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +--- configure.orig Sat Dec 22 22:44:47 2001 ++++ configure Sun Dec 23 14:42:24 2001 +@@ -6677,7 +6677,7 @@ + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='libtool' -+ -+if test "$no_recursion" != yes; then -+ -+ # Remove --cache-file and --srcdir arguments so they do not pile up. -+ ac_sub_configure_args= -+ ac_prev= -+ for ac_arg in $ac_configure_args; do -+ if test -n "$ac_prev"; then -+ ac_prev= -+ continue -+ fi -+ case "$ac_arg" in -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ ;; -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ ;; -+ *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; -+ esac -+ done -+ -+ for ac_config_dir in SyncTime; do -+ -+ # Do not complain, so a configure script can configure whichever -+ # parts of a large source tree are present. -+ if test ! -d $srcdir/$ac_config_dir; then -+ continue -+ fi -+ -+ echo configuring in $ac_config_dir -+ -+ case "$srcdir" in -+ .) ;; -+ *) -+ if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; -+ else -+ { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } -+ fi -+ ;; -+ esac -+ -+ ac_popdir=`pwd` -+ cd $ac_config_dir -+ -+ # A "../" for each directory in /$ac_config_dir. -+ ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` -+ -+ case "$srcdir" in -+ .) # No --srcdir option. We are building in place. -+ ac_sub_srcdir=$srcdir ;; -+ /*) # Absolute path. -+ ac_sub_srcdir=$srcdir/$ac_config_dir ;; -+ *) # Relative path. -+ ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; -+ esac -+ -+ # Check for guested configure; otherwise get Cygnus style configure. -+ if test -f $ac_sub_srcdir/configure; then -+ ac_sub_configure=$ac_sub_srcdir/configure -+ elif test -f $ac_sub_srcdir/configure.in; then -+ ac_sub_configure=$ac_configure -+ else -+ echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 -+ ac_sub_configure= -+ fi -+ -+ # The recursion is here. -+ if test -n "$ac_sub_configure"; then -+ -+ # Make the cache file name correct relative to the subdirectory. -+ case "$cache_file" in -+ /*) ac_sub_cache_file=$cache_file ;; -+ *) # Relative path. -+ ac_sub_cache_file="$ac_dots$cache_file" ;; -+ esac -+ case "$ac_given_INSTALL" in -+ [/$]*) INSTALL="$ac_given_INSTALL" ;; -+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -+ esac -+ -+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" -+ # The eval makes quoting arguments work. -+ if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir -+ then : -+ else -+ { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } -+ fi -+ fi -+ -+ cd $ac_popdir -+ done -+fi -+ -+ -+if test "$no_recursion" != yes; then -+ -+ # Remove --cache-file and --srcdir arguments so they do not pile up. -+ ac_sub_configure_args= -+ ac_prev= -+ for ac_arg in $ac_configure_args; do -+ if test -n "$ac_prev"; then -+ ac_prev= -+ continue -+ fi -+ case "$ac_arg" in -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ ;; -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ ;; -+ *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; -+ esac -+ done -+ -+ for ac_config_dir in Expense; do -+ -+ # Do not complain, so a configure script can configure whichever -+ # parts of a large source tree are present. -+ if test ! -d $srcdir/$ac_config_dir; then -+ continue -+ fi -+ -+ echo configuring in $ac_config_dir -+ -+ case "$srcdir" in -+ .) ;; -+ *) -+ if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; -+ else -+ { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } -+ fi -+ ;; -+ esac -+ -+ ac_popdir=`pwd` -+ cd $ac_config_dir -+ -+ # A "../" for each directory in /$ac_config_dir. -+ ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` -+ -+ case "$srcdir" in -+ .) # No --srcdir option. We are building in place. -+ ac_sub_srcdir=$srcdir ;; -+ /*) # Absolute path. -+ ac_sub_srcdir=$srcdir/$ac_config_dir ;; -+ *) # Relative path. -+ ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; -+ esac -+ -+ # Check for guested configure; otherwise get Cygnus style configure. -+ if test -f $ac_sub_srcdir/configure; then -+ ac_sub_configure=$ac_sub_srcdir/configure -+ elif test -f $ac_sub_srcdir/configure.in; then -+ ac_sub_configure=$ac_configure -+ else -+ echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 -+ ac_sub_configure= -+ fi -+ -+ # The recursion is here. -+ if test -n "$ac_sub_configure"; then -+ -+ # Make the cache file name correct relative to the subdirectory. -+ case "$cache_file" in -+ /*) ac_sub_cache_file=$cache_file ;; -+ *) # Relative path. -+ ac_sub_cache_file="$ac_dots$cache_file" ;; -+ esac -+ case "$ac_given_INSTALL" in -+ [/$]*) INSTALL="$ac_given_INSTALL" ;; -+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -+ esac -+ -+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" -+ # The eval makes quoting arguments work. -+ if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir -+ then : -+ else -+ { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } -+ fi -+ fi -+ -+ cd $ac_popdir -+ done -+fi -+ + # Prevent multiple expansion + +@@ -9504,7 +9504,7 @@ + enable_plugins=yes + fi; + +-PLUGIN_SUPPORT=0 ++PLUGIN_SUPPORT=1 + + if test "x$enable_plugins" = "xyes"; then + # dnl Check for shared library calls Index: palm/jpilot/files/patch-configure.in =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-configure.in,v retrieving revision 1.2 diff -u -w -r1.2 patch-configure.in --- palm/jpilot/files/patch-configure.in 2001/02/11 17:25:56 1.2 +++ palm/jpilot/files/patch-configure.in 2001/12/23 21:22:30 @@ -1,28 +0,0 @@ ---- configure.in.orig Tue Feb 6 11:26:38 2001 -+++ configure.in Fri Feb 9 10:24:46 2001 -@@ -170,15 +170,12 @@ - - - AC_ARG_ENABLE(plugins, [ --disable-plugins Do not compile plugin support]\ --, enable_plugins=no, enable_plugins=yes) -+, enable_plugins=yes, enable_plugins=yes) - - if test "x$enable_plugins" = "xyes"; then - dnl Check for shared library calls - AC_MSG_CHECKING(for dlopen) -- save_LIBS="$LIBS" -- LIBS="$LIBS -ldl" - AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);] , have_dlopen=yes, , ) -- LIBS="$save_LIBS" - - if test "x$have_dlopen" = "xyes"; then - AC_DEFINE(ENABLE_PLUGINS) -@@ -232,5 +229,8 @@ - - AC_OUTPUT([Makefile intl/Makefile po/Makefile.in], - [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) -+ -+AC_OUTPUT_SUBDIRS(SyncTime) -+AC_OUTPUT_SUBDIRS(Expense) - - dnl AC_OUTPUT(Makefile) Index: palm/jpilot/files/patch-datebook.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-datebook.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-datebook.c --- palm/jpilot/files/patch-datebook.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-datebook.c 2001/12/23 21:24:26 @@ -1,120 +0,0 @@ -Index: datebook.c -diff -u datebook.c:1.1.1.1 datebook.c:1.1.1.1.4.5 ---- datebook.c:1.1.1.1 Sun Feb 4 12:58:54 2001 -+++ datebook.c Sat Feb 17 21:51:55 2001 -@@ -37,10 +37,6 @@ - #include "libplugin.h" - #include "password.h" - --#include "japanese.h" --#include "cp1250.h" --#include "russian.h" -- - #ifndef FALSE - #define FALSE 0 - #endif -@@ -205,6 +201,13 @@ - char record[65536]; - int rec_len; - buf_rec br; -+ long char_set; -+ -+ get_pref(PREF_CHAR_SET, &char_set, NULL); -+ if (char_set != CHAR_SET_ENGLISH) { -+ if (a->description) charset_j2p(a->description, strlen(a->description)+1, char_set); -+ if (a->note) charset_j2p(a->note, strlen(a->note)+1, char_set); -+ } - - rec_len = pack_Appointment(a, record, 65535); - if (!rec_len) { -@@ -212,7 +215,7 @@ - jpilot_logf(LOG_WARN, "pack_Appointment %s\n", _("error")); - return -1; - } -- br.rt=rt; -+ br.rt=rt; - br.attrib = attrib; - br.buf = record; - br.size = rec_len; -@@ -535,9 +538,10 @@ - - int get_datebook_app_info(struct AppointmentAppInfo *ai) - { -- int num; -+ int num,i; - unsigned int rec_size; - unsigned char *buf; -+ long char_set; - - bzero(ai, sizeof(*ai)); - -@@ -550,6 +554,12 @@ - jpilot_logf(LOG_WARN, _("Error reading"), "DatebookDB.pdb"); - return -1; - } -+ get_pref(PREF_CHAR_SET, &char_set, NULL); -+ if (char_set != CHAR_SET_ENGLISH) { -+ for (i = 0; i < 16; i++) { -+ if (ai->category.name[i][0] != '\0') charset_p2j(ai->category.name[i], 16, char_set); -+ } -+ } - - return 0; - } -@@ -688,14 +698,14 @@ - AppointmentList *temp_a_list; - long keep_modified, keep_deleted; - int keep_priv; -- long char_set; - buf_rec *br; - #ifdef USE_DB3 - long use_db3_tags; - time_t ltime; - struct tm *today; - #endif -- -+ long char_set; -+ - #ifdef USE_DB3 - time(<ime); - today = localtime(<ime); -@@ -763,22 +773,8 @@ - } - - get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set==CHAR_SET_JAPANESE) { -- Sjis2Euc(a.description, 65536); -- Sjis2Euc(a.note, 65536); -- } -- if (char_set==CHAR_SET_1250) { -- Win2Lat(a.description, 65536); -- Win2Lat(a.note, 65536); -- } -- if (char_set==CHAR_SET_1251) { -- win1251_to_koi8(a.description, 65536); -- win1251_to_koi8(a.note, 65536); -- } -- if (char_set==CHAR_SET_1251_B) { -- koi8_to_win1251(a.description, 65536); -- koi8_to_win1251(a.note, 65536); -- } -+ if (a.description) charset_p2j(a.description, strlen(a.description)+1, char_set); -+ if (a.note) charset_p2j(a.note, strlen(a.note)+1, char_set); - - temp_a_list = malloc(sizeof(AppointmentList)); - if (!temp_a_list) { -@@ -793,6 +789,8 @@ - temp_a_list->next = *appointment_list; - *appointment_list = temp_a_list; - recs_returned++; -+ -+ - } - - jp_free_DB_records(&records); -@@ -803,3 +801,5 @@ - - return recs_returned; - } -+ -+ Index: palm/jpilot/files/patch-datebook_gui.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-datebook_gui.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-datebook_gui.c --- palm/jpilot/files/patch-datebook_gui.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-datebook_gui.c 2001/12/23 21:26:01 @@ -1,47 +0,0 @@ -Index: datebook_gui.c -diff -u datebook_gui.c:1.1.1.1 datebook_gui.c:1.1.1.1.4.4 ---- datebook_gui.c:1.1.1.1 Sun Feb 4 12:58:54 2001 -+++ datebook_gui.c Sat Feb 17 21:48:47 2001 -@@ -224,7 +224,6 @@ - - void cb_date_cats(GtkWidget *widget, gpointer data) - { -- unsigned char *buf; - int size; - struct AppointmentAppInfo ai; - int i; -@@ -241,13 +240,7 @@ - return; - } - -- get_app_info("DatebookDB", &buf, &size); -- jpilot_logf(LOG_DEBUG, "Got datebook app info, size = %d", size); -- if (size<1) { -- return; -- } -- unpack_AppointmentAppInfo(&ai, buf, size); -- free(buf); -+ get_datebook_app_info(&ai); - - window_date_cats = gtk_window_new(GTK_WINDOW_TOPLEVEL); - -@@ -268,10 +261,8 @@ - gtk_table_set_col_spacings(GTK_TABLE(table),0); - gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); - -- get_pref(PREF_CHAR_SET, &char_set, NULL); - for (i=0, bit=1; i<16; i++, bit <<= 1) { - if (ai.category.name[i][0]) { -- if (char_set == CHAR_SET_JAPANESE) Sjis2Euc(ai.category.name[i], 65536); - toggle_button[i]=gtk_toggle_button_new_with_label - (ai.category.name[i]); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_button[i]), -@@ -945,7 +936,7 @@ - if (a->note) { - jpilot_logf(LOG_DEBUG, "text2=[%s]\n",a->note); - } -- -+ - /* We won't allow a repeat frequency of less than 1 */ - if ((page != PAGE_NONE) && (a->repeatFrequency < 1)) { - jpilot_logf(LOG_WARN, Index: palm/jpilot/files/patch-japanese.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-japanese.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-japanese.c --- palm/jpilot/files/patch-japanese.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-japanese.c 2001/12/23 21:28:04 @@ -1,157 +0,0 @@ -Index: japanese.c -diff -u japanese.c:1.1.1.1 japanese.c:1.1.1.1.4.3 ---- japanese.c:1.1.1.1 Sun Feb 4 12:58:54 2001 -+++ japanese.c Sat Feb 17 21:19:41 2001 -@@ -10,7 +10,7 @@ - - #include <stdlib.h> - #include <stdio.h> -- -+ - /* In utils.c, also a prototype in utils.h */ - void multibyte_safe_strncpy(char *dst, char *src, size_t max_len); - -@@ -23,7 +23,14 @@ - #define isEuc(c) \ - (0xa0 < ((unsigned char) (c)) && ((unsigned char) (c)) < 0xff) - -+/* convert SJIS char to EUC char -+ -+ this does not support Machine dependent codes. -+ args: hi: first byte of sjis char. -+ lo: second byte of sjis char. -+ return: euc char in 16bit value. - -+ */ - static unsigned int SjisToEuc(unsigned char hi, unsigned char lo) - { - if (lo >= 0x9f) -@@ -32,8 +39,12 @@ - return ((hi * 2 - (hi >= 0xe0 ? 0xe1 : 0x61)) << 8) | - (lo + (lo >= 0x7f ? 0x60 : 0x61)); - } -- - -+/* -+ args: source char pointer, destination source pointer, a length of srting -+ Length include null termination. -+ return the pointer of nul termination code. -+ */ - unsigned char *Sjis2EucCpy(unsigned char *dest, unsigned char *src, int max_len) - { - unsigned char *p, *q; -@@ -43,8 +54,8 @@ - - p = src; - q = dest; -- while ((*p) && (n < max_len-1)) { -- if (isSjis1stByte(*p)) { -+ while ((*p) && (n < max_len-2)) { -+ if (isSjis1stByte(*p)) { - hi = *p++; - lo = *p++; - w = SjisToEuc(hi, lo); -@@ -58,27 +69,48 @@ - } else if ((*p) & 0x80) { /* irregular japanese char */ - p++; /* ??abort and return NULL?? */ - /* discard it */ -- } else { -+ } else { - *q++ = *p++; - n++; - } - } -- *q = '\0'; -- return dest; -+ if ((*p) && !(*p & 0x80) && (n < max_len-1)) { -+ *q++ = *p++; -+ *q = '\0'; -+ } else { -+ *q = '\0'; -+ } -+ return q; - } - -+/* -+ convert strings from Sjis to EUC. -+ max_len includes null termiantion. -+ size of buf must be more than max_len. -+ -+*/ -+ - void Sjis2Euc(unsigned char *buf, int max_len) - { - unsigned char *dst; - - if (buf == NULL) return; -- if ((dst = (unsigned char *)malloc(max_len*2)) != NULL) { -- if (Sjis2EucCpy(dst, buf, max_len*2) != NULL) -+ if ((dst = (unsigned char *)malloc(max_len)) != NULL) { -+ /* assign buffer for destination. */ -+ if (Sjis2EucCpy(dst, buf, max_len) != NULL) { - multibyte_safe_strncpy(buf, dst, max_len); -+ buf[max_len-1] = '\0'; /* i am a paranoire B-) */ -+ } - free(dst); -- } -+ } - } - -+/* -+ Convert one char from euc to sjis. -+ args: hi: first byte of euc code. -+ lo: second byte of euc code. -+ return: 16bit value of sjis char code. -+ */ - static unsigned int EucToSjis(unsigned char hi, unsigned char lo) - { - if (hi & 1) -@@ -88,6 +120,11 @@ - return ((hi / 2 + (hi < 0xdf ? 0x30 : 0x70)) << 8) | (lo - 2); - } - -+/* -+ Convert string from euc to sjis with coping to another buffer. -+ Theoritically, strlen(EUC) >= strlen(SJIS), -+ then it is ok that dest == src. -+ */ - unsigned char *Euc2SjisCpy(unsigned char *dest, unsigned char *src, int max_len) - { - unsigned char *p, *q; -@@ -97,7 +134,7 @@ - - p = src; - q = dest; -- while ((*p) && (n < max_len-1)) { -+ while ((*p) && (n < max_len-2)) { - if (isEucKana(*p)) { /* euc kana(2byte) -> sjis(1byte) */ - p++; - *q++ = *p++; -@@ -113,13 +150,25 @@ - *q++ = *p++; - n++; - } -+ } -+ if ((*p) && !(*p & 0x80) && n < max_len-1) { -+ *q++ = *p++; -+ *q = '\0'; -+ } else { -+ *q = '\0'; - } -- *q = '\0'; - return dest; - } -+/* -+ convert euc to sjis. -+ size of buf must be more than man_len. -+ it simply call Euc2SjisCpy(). -+ this function exists for symmetry. -+ */ - - void Euc2Sjis(unsigned char *buf, int max_len) - { - if (buf == NULL) return; -- Euc2SjisCpy(buf, buf, max_len); -+ if (max_len <= 0) return; -+ (void *)Euc2SjisCpy(buf, buf, max_len); - } Index: palm/jpilot/files/patch-memo.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-memo.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-memo.c --- palm/jpilot/files/patch-memo.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-memo.c 2001/12/23 21:29:13 @@ -1,86 +0,0 @@ -Index: memo.c -diff -u memo.c:1.1.1.1 memo.c:1.1.1.1.4.4 ---- memo.c:1.1.1.1 Sun Feb 4 12:58:54 2001 -+++ memo.c Sat Feb 17 21:47:54 2001 -@@ -32,10 +32,6 @@ - #include "libplugin.h" - #include "password.h" - --#include "japanese.h" --#include "cp1250.h" --#include "russian.h" -- - #define MEMO_EOF 7 - - int memo_compare(const void *v1, const void *v2) -@@ -133,6 +129,12 @@ - char record[65536]; - int rec_len; - buf_rec br; -+ long char_set; -+ -+ get_pref(PREF_CHAR_SET, &char_set, NULL); -+ if (char_set != CHAR_SET_ENGLISH) { -+ if (memo->text) charset_j2p(memo->text, strlen(memo->text)+1, char_set); -+ } - - rec_len = pack_Memo(memo, record, 65535); - if (!rec_len) { -@@ -165,7 +167,7 @@ - - int get_memo_app_info(struct MemoAppInfo *ai) - { -- int num; -+ int num,i; - unsigned int rec_size; - unsigned char *buf; - long char_set; -@@ -183,18 +185,12 @@ - } - - get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set==CHAR_SET_JAPANESE || -- char_set==CHAR_SET_1250 || -- char_set==CHAR_SET_1251 || -- char_set==CHAR_SET_1251_B) { -- int i; -- for (i = 0; i < 16; i++) -- if (ai->category.name[i][0] != '\0') { -- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->category.name[i], 16); -- if (char_set==CHAR_SET_1250) Win2Lat(ai->category.name[i], 16); -- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->category.name[i], 16); -- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(ai->category.name[i], 16); -- } -+ if (char_set != CHAR_SET_ENGLISH) { -+ for (i = 0; i < 16; i++) { -+ if (ai->category.name[i][0] != '\0') { -+ charset_p2j(ai->category.name[i], 16, char_set); -+ } -+ } - } - - return 0; -@@ -218,8 +214,8 @@ - MemoList *temp_memo_list; - long keep_modified, keep_deleted; - int keep_priv; -- long char_set; - buf_rec *br; -+ long char_set; - - jpilot_logf(LOG_DEBUG, "get_memos2()\n"); - if (modified==2) { -@@ -274,12 +270,8 @@ - if ( ((br->attrib & 0x0F) != category) && category != CATEGORY_ALL) { - continue; - } -- - get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(memo.text, 65536); -- if (char_set==CHAR_SET_1250) Win2Lat(memo.text, 65536); -- if (char_set==CHAR_SET_1251) win1251_to_koi8(memo.text, 65536); -- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(memo.text, 65536); -+ if (memo.text) charset_p2j(memo.text, strlen(memo.text)+1, char_set); - - temp_memo_list = malloc(sizeof(MemoList)); - if (!temp_memo_list) { Index: palm/jpilot/files/patch-sync.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-sync.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-sync.c --- palm/jpilot/files/patch-sync.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-sync.c 2001/12/23 21:30:43 @@ -1,155 +0,0 @@ -Index: sync.c -diff -u sync.c:1.1.1.1 sync.c:1.1.1.1.4.1 ---- sync.c:1.1.1.1 Sun Feb 4 12:58:55 2001 -+++ sync.c Sat Feb 17 17:07:51 2001 -@@ -105,10 +105,6 @@ - - int pdb_file_delete_record_by_id(char *DB_name, pi_uid_t uid_in); - -- --void recode_packed_record(char *DB_name, void *record, int rec_len, long char_seet); -- -- - void sig_handler(int sig) - { - jpilot_logf(LOG_DEBUG, "caught signal SIGCHLD\n"); -@@ -624,10 +620,8 @@ - return 0; - } - get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(buf, 1023); -- if (char_set == CHAR_SET_1250) Lat2Win(buf, 1023); -- if (char_set == CHAR_SET_1251) koi8_to_win1251(buf, 1023); -- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(buf, 1023); -+ charset_j2p(buf,1023,char_set); -+ - dlp_AddSyncLogEntry(sd, buf); - dlp_AddSyncLogEntry(sd, "\n\r"); - -@@ -751,15 +745,6 @@ - } - } - -- get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set==CHAR_SET_JAPANESE || -- char_set==CHAR_SET_1250 || -- char_set==CHAR_SET_1251 || -- char_set==CHAR_SET_1251_B -- ) { -- recode_packed_record(DB_name, record, rec_len, char_set); -- } -- - ret = dlp_WriteRecord(sd, db, header.attrib & dlpRecAttrSecret, - 0, header.attrib & 0x0F, - record, rec_len, &new_id); -@@ -1469,61 +1454,6 @@ - return 0; - } - --void recode_packed_record(char *DB_name, void *record, int rec_len, long char_set) --{ -- /*todo move this to before the record is written out?*/ -- /* Convert to SJIS Japanese Kanji code (Palm use this code) */ -- /* or convert to different encoding */ -- /*Write the record to the Palm Pilot */ -- if (!strcmp(DB_name, "DatebookDB")) { -- struct Appointment a; -- unpack_Appointment(&a, record, rec_len); -- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(a.description, 65536); -- if (char_set == CHAR_SET_1250) Lat2Win(a.description, 65536); -- if (char_set == CHAR_SET_1251) koi8_to_win1251(a.description, 65536); -- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(a.description, 65536); -- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(a.note, 65536); -- if (char_set == CHAR_SET_1250) Lat2Win(a.note, 65536); -- if (char_set == CHAR_SET_1251) koi8_to_win1251(a.note, 65536); -- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(a.note, 65536); -- rec_len = pack_Appointment(&a, record, 65535); -- } -- if (!strcmp(DB_name, "AddressDB")) { -- struct Address a; -- int i; -- unpack_Address(&a, record, rec_len); -- for (i = 0; i < 19; i++) { -- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(a.entry[i], 65536); -- if (char_set == CHAR_SET_1250) Lat2Win(a.entry[i], 65536); -- if (char_set == CHAR_SET_1251) koi8_to_win1251(a.entry[i], 65536); -- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(a.entry[i], 65536); -- } -- rec_len = pack_Address(&a, record, 65535); -- } -- if (!strcmp(DB_name, "ToDoDB")) { -- struct ToDo t; -- unpack_ToDo(&t, record, rec_len); -- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(t.description, 65536); -- if (char_set == CHAR_SET_1250) Lat2Win(t.description, 65536); -- if (char_set == CHAR_SET_1251) koi8_to_win1251(t.description, 65536); -- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(t.description, 65536); -- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(t.note, 65536); -- if (char_set == CHAR_SET_1250) Lat2Win(t.note, 65536); -- if (char_set == CHAR_SET_1251) koi8_to_win1251(t.note, 65536); -- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(t.note, 65536); -- rec_len = pack_ToDo(&t, record, 65535); -- } -- if (!strcmp(DB_name, "MemoDB")) { -- struct Memo m; -- unpack_Memo(&m, record, rec_len); -- if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(m.text, 65536); -- if (char_set == CHAR_SET_1250) Lat2Win(m.text, 65536); -- if (char_set == CHAR_SET_1251) koi8_to_win1251(m.text, 65536); -- if (char_set == CHAR_SET_1251_B) win1251_to_koi8(m.text, 65536); -- rec_len = pack_Memo(&m, record, 65535); -- } --} -- - int fast_sync_local_recs(char *DB_name, int sd, int db) - { - unsigned long new_id; -@@ -1541,7 +1471,6 @@ - char error_log_message_d[256]; - char delete_log_message[256]; - int index, size, attr, category; -- long char_set; - - jpilot_logf(LOG_DEBUG, "fast_sync_local_recs\n"); - -@@ -1599,14 +1528,6 @@ - if (ferror(pc_in)) { - break; - } -- } -- get_pref(PREF_CHAR_SET, &char_set, NULL); -- if (char_set==CHAR_SET_JAPANESE || -- char_set==CHAR_SET_1250 || -- char_set==CHAR_SET_1251 || -- char_set==CHAR_SET_1251_B -- ) { -- recode_packed_record(DB_name, record, rec_len, char_set); - } - - jpilot_logf(LOG_DEBUG, "Writing PC record to palm\n"); -Index: todo.c -diff -u todo.c:1.1.1.1 todo.c:1.1.1.1.4.3 ---- todo.c:1.1.1.1 Sun Feb 4 12:58:55 2001 -+++ todo.c Sat Feb 17 20:37:52 2001 -@@ -31,10 +31,6 @@ - #include "libplugin.h" - #include "password.h" - --#include "japanese.h" --#include "cp1250.h" --#include "russian.h" -- - #define TODO_EOF 7 - - static struct ToDoAppInfo *glob_Ptodo_app_info; -@@ -241,6 +237,13 @@ - char record[65536]; - int rec_len; - buf_rec br; -+ long char_set; -+ -+ get_pref(PREF_CHAR_SET, &char_set, NULL); -+ if (char_set != CHAR_SET_ENGLISH) { -+ if (todo->description) charset_j2p(todo->description, strlen(todo->description)+1, char_set); -+ if (todo->note) charset_j2p(todo->note, strlen(todo->note)+1, char_set); -+ } Index: palm/jpilot/files/patch-todo_gui.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-todo_gui.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-todo_gui.c --- palm/jpilot/files/patch-todo_gui.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-todo_gui.c 2001/12/23 21:31:08 @@ -1,21 +0,0 @@ -Index: todo_gui.c -diff -u todo_gui.c:1.1.1.1 todo_gui.c:1.1.1.1.4.1 ---- todo_gui.c:1.1.1.1 Sun Feb 4 12:58:55 2001 -+++ todo_gui.c Sat Feb 17 17:07:51 2001 -@@ -426,12 +426,16 @@ - /*it will show it though. I allow it. */ - new_todo->description = gtk_editable_get_chars - (GTK_EDITABLE(todo_text), 0, -1); -+/* charset_j2p(new_todo->description, 65536); */ - new_todo->note = gtk_editable_get_chars - (GTK_EDITABLE(todo_text_note), 0, -1); - if (new_todo->note[0]=='\0') { - free(new_todo->note); - new_todo->note=NULL; - } -+/* else { -+ charset_j2p(new_todo->note, 65536); -+ }*/ - - for (i=0; i<NUM_TODO_CAT_ITEMS; i++) { - if (GTK_IS_WIDGET(todo_cat_menu_item2[i])) { Index: palm/jpilot/files/patch-utils.c =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-utils.c,v retrieving revision 1.1 diff -u -w -r1.1 patch-utils.c --- palm/jpilot/files/patch-utils.c 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-utils.c 2001/12/23 21:32:10 @@ -1,70 +0,0 @@ -Index: utils.c -diff -u utils.c:1.1.1.1 utils.c:1.1.1.1.4.1 ---- utils.c:1.1.1.1 Sun Feb 4 12:58:55 2001 -+++ utils.c Sat Feb 17 17:07:51 2001 -@@ -40,6 +40,9 @@ - #include "plugins.h" - #include "libplugin.h" - -+#include "japanese.h" -+#include "cp1250.h" -+#include "russian.h" - - #include <pi-source.h> - #include <pi-socket.h> -@@ -1981,7 +1984,7 @@ - char *p, *q; - int n = 0; - p = src; q = dst; -- while ((*p) && n < (max_len-1)) { -+ while ((*p) && n < (max_len-2)) { - if ((*p) & 0x80) { - *q++ = *p++; - n++; -@@ -1994,11 +1997,10 @@ - n++; - } - } -- if ((*p & 0x80 ) && (n < max_len)) { -- *q = *p; -- } else { -- *q = '\0'; -- } -+ if (!(*p & 0x80 ) && (n < max_len-1)) -+ *q++ = *p++; -+ -+ *q = '\0'; - } else { - strncpy(dst, src, max_len); - } -@@ -2022,7 +2024,7 @@ - int n = 0; - - p = (char *)src; q = dst; -- while ((*p) && (n < (len -1))) { -+ while ((*p) && (n < (len -2))) { - if ((*p) & 0x80) { - *q++ = *p++; - n++; -@@ -2033,15 +2035,15 @@ - } else { - *q++ = *p++; - n++; -+ if (*(p-1) == (char)(c & 0xff)) return q; - } -- if (*(p-1) == (char)(c & 0xff)) return q; -- } -- if ((*p & 0x80) && (n < len)) { -- *q = *p; -- } else { -- *q = '\0'; - } -+ if (!(*p & 0x80) && (n < len-1)) -+ *q++ = *p++; -+ -+ *q = '\0'; - return NULL; - } else - return memccpy(dst, src, c, len); - } -+ Index: palm/jpilot/files/patch-utils.h =================================================================== RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-utils.h,v retrieving revision 1.1 diff -u -w -r1.1 patch-utils.h --- palm/jpilot/files/patch-utils.h 2001/03/06 11:17:09 1.1 +++ palm/jpilot/files/patch-utils.h 2001/12/23 21:32:23 @@ -1,23 +0,0 @@ -Index: utils.h -diff -u utils.h:1.1.1.1 utils.h:1.1.1.1.4.3 ---- utils.h:1.1.1.1 Sun Feb 4 12:58:55 2001 -+++ utils.h Sat Feb 17 21:56:24 2001 -@@ -303,3 +303,18 @@ - - void multibyte_safe_strncpy(char *dst, char *src, size_t max_len); - char *multibyte_safe_memccpy(char *dst, const char *src, int c, size_t len); -+ -+/************************************* -+ * convert char code -+ *************************************/ -+#define charset_j2p(buf, max_len, char_set) {\ -+ if (char_set == CHAR_SET_JAPANESE) Euc2Sjis(buf, max_len);\ -+ if (char_set == CHAR_SET_1250) Lat2Win(buf,max_len);\ -+ if (char_set == CHAR_SET_1251) koi8_to_win1251(buf, max_len);\ -+ if (char_set == CHAR_SET_1251_B) win1251_to_koi8(buf, max_len);} -+#define charset_p2j(buf, max_len, char_set) {\ -+ if (char_set == CHAR_SET_JAPANESE) Sjis2Euc(buf, max_len);\ -+ if (char_set == CHAR_SET_1250) Win2Lat(buf,max_len);\ -+ if (char_set == CHAR_SET_1251) win1251_to_koi8(buf, max_len);\ -+ if (char_set == CHAR_SET_1251_B) koi8_to_win1251(buf, max_len);} -+ --- palm/jpilot/files/patch-KeyRing_Makefile.in +++ palm/jpilot/files/patch-KeyRing_Makefile.in Wed Feb 6 16:04:52 2002 @@ -0,0 +1,10 @@ +--- KeyRing/Makefile.in.orig Fri Jan 25 11:00:06 2002 ++++ KeyRing/Makefile.in Wed Feb 6 16:02:50 2002 +@@ -35,7 +35,6 @@ + keyring.lo \ + -rpath $(prefix)/lib/jpilot/plugins \ + -version-info 1:1 \ +- -avoid-version \ + $(CRYPTO_LIBS) + + keyring.o: keyring.c libplugin.h >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202070018.g170Iv451021>