>Number:         24635
>Category:       pkg
>Synopsis:       comms/jpilot upgraded to 0.99.7
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Mar 02 01:07:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Brian de Alwis
>Release:        NetBSD 1.6ZK
>Organization:
     Brian de Alwis | Graduate student | Software Practices Lab | UBC
"There is much pleasure to be gained in useless knowledge." - Bertrand Russell
>Environment:
System: NetBSD slab 1.6ZK NetBSD 1.6ZK (GENERIC_LAPTOP) #0: Thu Feb 26 07:08:23 UTC 2004 autobuild@tgm.netbsd.org:/autobuild/HEAD/i386/OBJ/autobuild/HEAD/src/sys/arch/i386/compile/GENERIC_LAPTOP i386
Architecture: i386
Machine: i386
>Description:
	JPilot 0.99.7 was just released; pkgsrc is 0.99.5.
>How-To-Repeat:
>Fix:
	- patches/patch-aa is no longer necessary
	- patches/patch-ab and patch-ad need a bit of modification
	- PLIST needs to be modified for new files

	The pkgsrc Makefile does some explicit post-install copying
	to put some files in .../share/doc/jpilot and
	.../share/doc/html/jpilot.  JPilot itself now places everything
	in .../share/doc/jpilot-0.99.7; I'm not sure what pkgsrc
	wanted to do.

patches/patch-ab
------------------------------------------------------------
$NetBSD$

--- KeyRing/keyring.c.orig	2004-02-17 16:59:38.000000000 -0800
+++ KeyRing/keyring.c
@@ -182,7 +182,7 @@ static int pack_KeyRing(struct KeyRing *
    for (i=strlen(kr->name)+1; i<n; i=i+8) {
       /* des_encrypt3((DES_LONG *)&buf[i], s1, s2, s1); */
 #ifdef HEADER_NEW_DES_H
-      DES_ecb3_encrypt((const_des_cblock *)&buf[i], (des_cblock *)(&buf[i]), 
+      DES_ecb3_encrypt((const_DES_cblock *)&buf[i], (DES_cblock *)(&buf[i]), 
 		       &s1, &s2, &s1, DES_ENCRYPT);
 #else
       des_ecb3_encrypt((const_des_cblock *)&buf[i], (des_cblock *)(&buf[i]),
@@ -281,7 +281,7 @@ static int unpack_KeyRing(struct KeyRing
       /* des_decrypt3((DES_LONG *)chunk, s1, s2, s1); */
       /* memcpy(clear_text+i, chunk, 8); */
 #ifdef HEADER_NEW_DES_H
-      DES_ecb3_encrypt((const_des_cblock *)&P[i], (DES_cblock *)(clear_text+i),
+      DES_ecb3_encrypt((const_DES_cblock *)&P[i], (DES_cblock *)(clear_text+i),
 		       &s1, &s2, &s1, DES_DECRYPT);
 #else
       des_ecb3_encrypt((const_des_cblock *)&P[i], (des_cblock *)(clear_text+i),
------------------------------------------------------------

patches/patch-ad
------------------------------------------------------------
$NetBSD$

--- 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

------------------------------------------------------------

PLIST
------------------------------------------------------------
--- PLIST.orig	2004-03-01 15:28:50.000000000 -0800
+++ PLIST	2004-03-01 16:49:36.000000000 -0800
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/03/04 16:29:28 wiz Exp $
+@comment $NetBSD$
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
@@ -20,6 +20,7 @@
 lib/jpilot/plugins/libsynctime.so
 lib/jpilot/plugins/libsynctime.so.0
 lib/jpilot/plugins/libsynctime.so.0.0
+man/man1/jpilot-dial.1
 man/man1/jpilot-dump.1
 man/man1/jpilot-sync.1
 man/man1/jpilot-upgrade-99.1
@@ -77,12 +78,14 @@
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/jpilot.mo
 @dirrm share/jpilot
-@dirrm share/doc/jpilot
+@dirrm share/gnome/apps/Applications
 @dirrm share/doc/${PKGNAME}/icons
 @dirrm share/doc/${PKGNAME}
+@dirrm share/doc/jpilot
 @dirrm share/doc/html/jpilot
 @dirrm lib/jpilot/plugins
 @dirrm lib/jpilot
------------------------------------------------------------
>Release-Note:
>Audit-Trail:
>Unformatted: