Update to 1.109, provided by Sergey Svishchev in private mail.

Changes from v1.108 to v1.109

	* Conduits included in the PilotManager distribution now have
	version numbers identical to the PilotManager version.
	Third-party conduits can (and should) continue to have their own
	version number schemes.

	* Change the way we reference constants exported from libpisock,
	in preparation for pilot-link 0.12.0-pre5.  Backwards
	compatibility is maintained.  Use symbolic constants instead of
	hard-coded integer values, if running with a version of pilot-link
	that provides them.

	* A second attempt to fix the bug in the Properties dialog with
	Tk-804.  The first one didn't work with certain combinations of
	libraries.

	* Fix bug introduced in 1.108 that broke -syncwith and -install
	for normally inactive conduits.

	* Don't call conduitQuit on conduits that haven't been loaded.
	Eliminates an error message when using -syncwith (bug introduced
	in 1.108).

	* Fix bug where PilotManager would report a successful connection
	and then a Perl error, when what really happened was simply a
	timeout.

	* Eliminated numerous -w warnings

	* PilotSync.pm (affects SyncAB, SyncFood, and some third-party
	conduits; all changes by Ralf Schlatterbeck): fix some crash bugs
	and a bug that caused creation of empty fields; add support for
	full sync; some new functionality for use by conduit authors:
	possibility to skip some pilot records, and to generate local ID
	based on contents of pilot record.

	* SyncMemo conduit: work around a bug in perl 5.8.0 that was
	causing the filename filters not to work sometimes.  The
	workaround involves forcing these filters to be ASCII-only; this
	could conceivably be a problem for people using non-ASCII
	filenames.  Fix bug that caused spurious conflict to be detected
	when doing full sync and a file had changed but the corresponding
	pilot memo had not.  Eliminate some barewords to avoid strict subs
	warnings in some versions of perl (bug report from Ralf
	Schlatterbeck).

	* SyncCM conduit: Work around libcsa bug that was causing "INVALID
	DATE TIME" error when syncing "all dates" in a timezone east of
	GMT; workaround for dtcm bug that made weekly repeating
	appointments created on the pilot uneditable in dtcm; fix up
	repeating appointments from the pilot whose start date isn't one
	of the repeat days.  The following patches from Alan Harder: if cm
	appointment has no end time, use end time equal to start time on
	pilot (rather than refusing to sync the appointment); clearer and
	more informative log messages; when doing "Sync All (dates)", use
	2021 instead of 2010 as the end of the range; propagate
	appointment deletion from palm to desktop even if the archive flag
	is set.

	* Installer conduit: Respect -rcdir argument when running
	installer from command line (Alan Harder)

	* Backup conduit: add an option "Ignore modify date (backup every
	time)"; more informative log messages.  (Both by Alan Harder.)
	For deciding whether to back up a database, use a different scheme
	that doesn't depend on the two clocks being synchronized.

	* SyncTime conduit: remove workaround for some ancient pilot-link
	version (Alan Harder).

	* SyncFood conduit: Refuse to sync if $FOODFILE has been deleted,
	in order to avoid wiping everything out. Patch from Alan Harder, I
	haven't tested it.

	* SyncAB conduit: fix bug in setting vCard file name, and in
	handling of newlines (Alan Harder).  Implement full sync, allowing
	sync with multiple desktop machines (Ralf Schlatterbeck).  Allow
	filtering by private flag and by category (Ralf Schlatterbeck).

	* SyncPlan conduit: Appointments that repeat more than one day a
	week, every n weeks, where n > 1, are possible on the pilot but
	not in plan.  Signal them as unsyncable, rather than converting
	them to once-per-week repeats (Thomas DeWeese).  Show progress bar
	while reading Pilot records.  Re-fix bug about plan alarms getting
	turned off that was supposed to be fixed in 1.108 but really
	wasn't.  Fix some bugs related to time zone conversion: end date
	of repeating appointments would move back a day when synced from
	pilot to plan in time zones east of GMT, and appointment times
	shown in the log window would be in GMT rather than local time.

	* SendMail conduit: fix bug that comes up when the database
	doesn't exist on the pilot.

	* Remove contrib/dinesh-dutt, which was an old version of software
	that was later distributed on its own (the syncbbdb project on
	sourceforge, not to be confused with syncbbdb2, which is an
	unrelated project and is the one I recommend for bbdb syncing).


Changes from v1.107 to v1.108

	* Add error checking throughought PilotManager and several
	  conduits to fix a bug that caused data loss when the link to the
	  pilot was lost during a sync.

	* Only load active conduits, rather than all conduits, at
	  startup.  This means that you no longer need to rename or delete
	  unused conduits that have missing dependencies.  As a side
	  effect, the "Load New Conduits..." menu item is gone, replaced
	  by a "Rescan" button on the "Properties" dialog.

	* Changes for compatibility with pilot-link 0.12.0.  Backwards
	  compatibility with earlier pilot-link versions is matained.

	* Changes for compatibility with Tk 804. fixes bug causing some
	  color preferences to be ignored when using Tk 804, and fixes
	  buggy behavior of the Up and Down buttons in the Preferences
	  dialog.

	* Fix pcid corruption in preferences file that could cause every sync
	  to be a full sync.

	* Fix hang when trying to sync to a USB device that wasn't connected.

	* Applied patch to fix problems with PalmOS 3.5 and above.

	* Fix purely cosmetic y2k display bug.

	* Use Digest::MD5 instead of the deprecated MD5.

	* Patch from NWalsh to lib/perl5/PilotSync.pm, fixes unreliability
	  problems, esp. with newer versions of Perl.

	* Change the dates in the log messages to be ISO compliant instead
	  of US-centric mm/dd/yyyy (Mark Staveley).

	* Replaced Setup script with Setup.pl.  The script is no longer
	  invoked automatically the first time PilotManager is run; rather,
	  it must be run by hand (perl Setup.pl) to create the executable
	  PilotManager.

	* If Setup.pl is given a -conduitdir argument, then PilotManager
	  will look in that directory for loadable conduit modules (in
	  addition to the directories it already looked in).

	* Updated developer contact information

	* Backup conduit: update to version 1.008, which had been released
	  separately as 1.008ea.
	  - Better, more consistent filename handling throughout.

	* Installer conduit: update to version 1.009, which had been released
	  separately as 1.009ea2.
	  - Recognizes .pqa files as well as .pdb/.prc.
	  - Only use included "MultiFileSelect.pm" with Tk 4.0,
	    otherwise, use Tk::Fileselect module.
	  - Print message after each file is installed.

	* SendMail conduit: new version 0.900
	  - only perform wordwrap on body of mail message, not
	    headers. (Chris Waters)
	  - Check for I/O errors (see comment at top of ChangeLog)

	* SyncAB conduit: no changes, version number stays at 0.96 BETAp1.

	* SyncCM conduit: new version 1.103
	  - Check for I/O errors (see comment at top of ChangeLog)

	* SyncFood conduit: no changes, version number stays at 0.96 BETA.

	* SyncMemo conduit: new version 1.9 integrates changes from
	  version 1.8-ea2, which had been released separately, plus
	  additional changes.
	  - from 1.8ea2: Use internal checksum function instead of
	    Shell::sum.
	  - from 1.8ea2: Use internal isPilotText function instead of
	    Shell::file
	  - from 1.8ea2: Use opendir/readdir/closedir for directory access
	    rather than relying on globbing.  Fixes breakage when category
	    names have whitespace.
 	  - Eliminate discrepancy between behavior of full sync and fast
	    sync.  In earlier versions, a memo deleted from the desktop would
	    be deleted from the pilot during a fast sync, but recopied from
	    the pilot to the desktop on a full sync.  A preferences option
	    allows you to keep the old behavior if you wish.
	  - Process all file deletions before any file creations, to avoid
	    unnecessary file name collisions.
	  - Use gtkdiff or tkdiff if filemerge not available (Mark
	    Staveley). Better would be to allow merge program to be chosen
	    via the configuration gui--patches welcome.
	  - Remove special characters from filenames (idea from Mark
	    Staveley)
	  - Increase maximum file name length (Mark Staveley)
	  - Check for I/O errors (see comment at top of ChangeLog)

	* SyncPlan conduit: new version 0.97 integrates changes from
	  version 0.96BETA, which had been released separately, plus
	  additional changes.
	  - from 0.96BETA: Support for weekly appts from pilot with
	    frequency > 1 (patch by Alan Harder based on changes in
	    sync-plan)
	  - from 0.96BETA: Fix repeat end date for daily repeating plan
	    records (patch by Alan Harder based on research by Aaron
	    Kaplan)
	  - from 0.96BETA: Patch to support plan records with two alarms
	    (just use earlier one for pilot) by Kevin Fink
	  - from 0.96BETA: Configurable level of verbose output and
	    configurable netplan port, patch by Andreas S. Oesterhelt
	    (oes@paradis.rhein.de)
	  - Fix a bug that caused deleted records to reappear when
	    syncing one pilot with more than one desktop machine.
	  - Fix a bug that would cause an alarm to be disabled in plan if
	    the appointment was modified on the pilot.  As a side-effect,
	    any appointment created on the pilot will now have an alarm
	    set in plan.
	  - Check for I/O errors (see comment at top of ChangeLog)

	* Updated version of contrib/alan-harder/UpdateMemos.pl

	* Added SyncAB_plusBBDB to contrib/dinesh-dutt.  This had never
	  been released as part of a PilotManager package, but was available
	  separately on moshpit.org.  Since I'm already supporting
	  SyncBBDB, I don't intend to support SyncAB_plusBBDB.

	* SourceForge CVS repository set up (Chris Waters)

	* Development now coordinated by Aaron Kaplan

8 files changed, 19 insertions, 294 deletions

diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index 5c10e720ba7..d4e66dbc72d 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,28 +1,25 @@
-# $NetBSD: Makefile,v 1.42 2007/02/02 19:35:12 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2007/03/08 19:43:10 wiz Exp $
 
-DISTNAME=	pilotmgr-1.107p2
-PKGNAME=	pilotmgr-1.107.2
-PKGREVISION=	3
+DISTNAME=	pilotmgr-1.109
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pilotmanager/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.moshpit.org/pilotmgr/
+HOMEPAGE=	http://pilotmanager.sourceforge.net/
 COMMENT=	Synchronize databases on any 3Com Palm device
 
 DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
 DEPENDS+=	p5-pilot-link-[0-9]*:../../comms/p5-pilot-link
 
-WRKSRC=			${WRKDIR}/${DISTNAME:C/-.*$//}
 HAS_CONFIGURE=		YES
 NO_BUILD=		YES
 USE_TOOLS+=		perl:run
 
 CONFIGURE_ARGS+=	</dev/null
 CONFIGURE_ENV+=		PERL="${LOCALBASE}/bin/perl" WRKDIR=${WRKDIR:Q}
-CONFIGURE_SCRIPT=	./Setup
+CONFIGURE_SCRIPT=	perl Setup.pl
 
 PM_PERL_DIR=	${PREFIX}/lib/${DISTNAME:C/-.*$//}
 PM_DOC_DIR=	${PREFIX}/share/doc/${DISTNAME:C/-.*$//}
@@ -31,7 +28,6 @@ INSTALLATION_DIRS=	bin
 
 post-extract:
 	@${RM} -f ${WRKSRC}/SyncCM.pm
-	@${CHMOD} +x ${WRKSRC}/Setup
 
 pre-install:
 	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
@@ -39,11 +35,11 @@ pre-install:
 do-install:
 	${INSTALL_DATA_DIR} ${PM_PERL_DIR}
 	${INSTALL_DATA_DIR} ${PM_DOC_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/PilotManager ${PM_PERL_DIR}
 	for FILE in ${WRKSRC}/*.pm; do \
 		${INSTALL_DATA} $$FILE ${PM_PERL_DIR}; \
 	done
-	${CHMOD} ${BINMODE} ${PM_PERL_DIR}/PilotMgr.pm
-	${LN} -fs ${PM_PERL_DIR}/PilotMgr.pm ${PREFIX}/bin/PilotManager
+	${LN} -fs ${PM_PERL_DIR}/PilotManager ${PREFIX}/bin/PilotManager
 	cd ${WRKSRC} && \
 		for DIR in lib/*; do \
 			${INSTALL_DATA_DIR} ${PM_PERL_DIR}/$$DIR; \
diff --git a/comms/pilotmgr/PLIST b/comms/pilotmgr/PLIST
index 6c3f3ea3d69..f3dd0d3d268 100644
--- a/comms/pilotmgr/PLIST
+++ b/comms/pilotmgr/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/16 18:10:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/03/08 19:43:13 wiz Exp $
 bin/PilotManager
 lib/pilotmgr/Backup.pm
 lib/pilotmgr/Installer.pm
 lib/pilotmgr/PilotMgr.pm
+lib/pilotmgr/PilotManager
 lib/pilotmgr/SendMail.pm
 lib/pilotmgr/SyncAB.pm
 lib/pilotmgr/SyncFood.pm
@@ -19,9 +20,7 @@ lib/pilotmgr/lib/perl5/PilotSync.pm
 lib/pilotmgr/lib/perl5/TkUtils.pm
 lib/pilotmgr/lib/test/SyncCM.t
 lib/pilotmgr/lib/test/SyncPlan.t
-share/doc/pilotmgr/AnncAlias.txt
 share/doc/pilotmgr/Conduit.api
-share/doc/pilotmgr/DiscAlias.txt
 share/doc/pilotmgr/SyncPlan.help
 share/doc/pilotmgr/WelcomeMessage
 @dirrm lib/pilotmgr/lib/test
diff --git a/comms/pilotmgr/distinfo b/comms/pilotmgr/distinfo
index 88f8058e606..ad582a7cf14 100644
--- a/comms/pilotmgr/distinfo
+++ b/comms/pilotmgr/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 16:05:30 agc Exp $
+$NetBSD: distinfo,v 1.7 2007/03/08 19:43:14 wiz Exp $
 
-SHA1 (pilotmgr-1.107p2.tar.bz2) = 3eda213891fbddc1239c49b7f704bd1447dd9112
-RMD160 (pilotmgr-1.107p2.tar.bz2) = 6d69c565090f800bab922ba83ec23c33bef14c9e
-Size (pilotmgr-1.107p2.tar.bz2) = 161129 bytes
-SHA1 (patch-aa) = a61287599e52580e9e56acfadc60e98f16555b5c
-SHA1 (patch-ab) = 2c6bca3b173574830866d4fc5a2909345dff4109
-SHA1 (patch-ac) = d8482ee4c6e20b264cb5262d1674a2f292d61384
-SHA1 (patch-ad) = 809277732a213516c184b8d8ba8e810c8973f82e
-SHA1 (patch-ae) = 5241ea2684628c85ee6374ddc2b399135cc9200f
+SHA1 (pilotmgr-1.109.tgz) = c6a98cc59a6de340acb140b86e1d0fb74e5a9eb1
+RMD160 (pilotmgr-1.109.tgz) = 2c7140a700f158b124f43565499936108dd20858
+Size (pilotmgr-1.109.tgz) = 201952 bytes
+SHA1 (patch-aa) = 2844f24a8e8d04773a1f023650ca38b2634d2aee
diff --git a/comms/pilotmgr/patches/patch-aa b/comms/pilotmgr/patches/patch-aa
index 4b36fac1a02..28874839db6 100644
--- a/comms/pilotmgr/patches/patch-aa
+++ b/comms/pilotmgr/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/03/23 15:29:00 magick Exp $
+$NetBSD: patch-aa,v 1.5 2007/03/08 19:43:14 wiz Exp $
 
---- PilotMgr.pm.orig	Wed Mar 24 23:59:59 1999
+--- PilotMgr.pm.orig	2005-04-10 17:56:58.000000000 +0000
 +++ PilotMgr.pm
-@@ -604,14 +604,18 @@
+@@ -503,14 +503,18 @@ sub createPropsDialog
      my ($image);
  
      my (@TTYMENU) =
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2002/03/23 15:29:00 magick Exp $
  	 "/dev/pilot", [],
  	 "Other...", []);
  
-@@ -1586,7 +1590,7 @@
+@@ -1366,7 +1370,7 @@ sub loadPrefs
  	do "$RCFILE";
      }
  
@@ -38,37 +38,3 @@ $NetBSD: patch-aa,v 1.4 2002/03/23 15:29:00 magick Exp $
  	unless (exists $PREFS->{'gPort'});
      $PREFS->{'gRate'} = '9600'
  	unless (exists $PREFS->{'gRate'});
-@@ -2636,7 +2640,7 @@
- 
-     $mon++;
-     return sprintf("%02d/%02d/%02d %2d:%02d:%02d",
--		   $mon, $mday, $year, $hour, $min, $sec);
-+		   $mon, $mday, 1900 + $year, $hour, $min, $sec);
- }
- 
- sub loadDBList
-@@ -2656,14 +2660,17 @@
- 	$count_max = 0;
-     }
- 
--    do
--    {
--	status("Refreshing Database List", int(100 * $count++ / $count_max))
--	    if ($count_max);
--	push(@$result, $dlp->getDBInfo($i,1,0));
--	$i = $result->[-1]->{"index"}+1;
-+    my $rec;
-+    eval { do
-+     {
-+      status("Refreshing Database List", int(100 * $count++ / $count_max))
-+	if ($count_max);
-+      $rec = $dlp->getDBInfo($i,1,0);
-+      push(@$result, $rec) if (exists $rec->{"name"} and $rec->{"name"});
-+      $i = $rec->{"index"}+1;
-     }
--    while ($result->[-1]->{"more"});
-+    while ($rec->{"more"}); };
-+
- 
-     fullStatus("Pilot Manager", "Refreshing Database List", 100);
- 
diff --git a/comms/pilotmgr/patches/patch-ab b/comms/pilotmgr/patches/patch-ab
deleted file mode 100644
index 52ec5acb954..00000000000
--- a/comms/pilotmgr/patches/patch-ab
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/10/22 23:31:53 tron Exp $
-
---- /usr/pkg/lib/pilotmgr/Backup.pm	Tue Jul  6 21:41:45 1999
-+++ Backup.pm	Thu Oct 21 08:14:38 1999
-@@ -33,7 +33,7 @@
- my ($DEBUG) = 1;			  # Debug mode on/off
- my ($DEBUGFILE);			  # Location of debug file
- my ($RCFILE);				  # Location of resource file
--my ($VERSION) = "1.007";		  # Version number
-+my ($VERSION) = "1.007+";		  # Version number
- my ($PREFS);				  # Preferences
- my ($MAXARCHIVES) = 7;		          # Max number of archives
- my ($MANIFEST) = ".archive_manifest";     # Tag to help protect
-@@ -626,7 +626,7 @@
- 	    if (&fetchDB($dlp, "$PREFS->{gBackupDir}/$arch", $dbname, $info))
- 	    {
- 		$PREFS->{"backuprecord"}->{$dbname} = time;
--		push(@success, $dbname);
-+		push(@success, &makeFilename($dbname, $info));
- 		$STATS{"success"}++;
- 	    }
- 	    else
-@@ -655,13 +655,9 @@
- 		my $dir = shift @archList;
- 		next if ($dir eq $arch);
- 
--		$file = "$dbname.pdb"
--		    if (-f "$dir/$dbname.pdb");
-+		$file = &makeFilename($dbname, $info);
- 
--		$file = "$dbname.prc"
--		    if (-f "$dir/$dbname.prc");
--
--		if ($file)
-+		if (-f "$dir/$file")
- 		{
- 		    PilotMgr::status("$dbname [from archive]", 
- 				     int(100 * $count / $count_max));
-@@ -690,7 +686,7 @@
- 			     $dbname, $info))
- 		{
- 		    $PREFS->{"backuprecord"}->{$dbname} = time;
--		    push(@success, $dbname);
-+		    push(@success, &makeFilename($dbname, $info));
- 		    $STATS{"success"}++;
- 		}
- 		else
-@@ -705,7 +701,7 @@
- 	    {
- 		# Update the backup manifest
- 		#
--		push(@success, $dbname);
-+		push(@success, &makeFilename($dbname, $info));
- 	    }
- 	}
- 
-@@ -797,13 +793,10 @@
-     {
- 	while (<FD>)
- 	{
--	    chop;
--
--	    unlink "$dir/$_.pdb"
--		if (-f "$dir/$_.pdb");
-+	    chomp;
- 
--	    unlink "$dir/$_.prc"
--		if (-f "$dir/$_.prc");
-+	    unlink "$dir/$_"
-+		if (-f "$dir/$_");
- 	}
- 	close(FD);
- 
-@@ -840,7 +833,7 @@
-     {
- 	chomp($buf);
- 	
--	chop($time = `date +"%D %T`);
-+	chomp($time = `date +"%D %T`);
- 	$time .= "   ";
- 	$pad = " " x length($time);
- 	$buf =~ s/\n/\n$pad/g;
-@@ -857,11 +850,9 @@
-     return Dumper($obj);
- }
- 
--sub fetchDB
-+sub makeFilename
- {
--    my ($dlp, $dir, $filename, $info) = @_;
--    my ($file);
--    my ($err);
-+    my ($filename, $info) = @_;
- 
-     # Protect any special characters
-     $filename =~ s|=|=3D|g;
-@@ -875,7 +866,16 @@
-     {
- 	$filename .= ".pdb";
-     }
--    $filename = $dir . "/" . $filename;
-+    return $filename;
-+}
-+
-+sub fetchDB
-+{
-+    my ($dlp, $dir, $filename, $info) = @_;
-+    my ($file);
-+    my ($err);
-+
-+    $filename = $dir . "/" . &makeFilename($filename, $info);
- 
-     $file = PDA::Pilot::File::create($filename, $info);
-     $dlp->getStatus();
diff --git a/comms/pilotmgr/patches/patch-ac b/comms/pilotmgr/patches/patch-ac
deleted file mode 100644
index b450d249457..00000000000
--- a/comms/pilotmgr/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/10/02 06:43:39 jlam Exp $
-
---- SyncPlan.pm.orig	Wed Mar 24 18:00:01 1999
-+++ SyncPlan.pm
-@@ -17,7 +17,7 @@
- use IO::Socket;
- use IO::Select;
- use Time::Local;
--use MD5;
-+use Digest::MD5;
- use Carp;
- use strict;
- 
-@@ -363,7 +363,7 @@
- 		}
- 	}
- 
--	my($hash) = new MD5;
-+	my($hash) = Digest::MD5->new;
- 	foreach (@output) {
- 		#print "Adding |$_| to hash\n";
- 		$hash->add($_);
-@@ -553,7 +553,7 @@
- 	my(@l) = split(/\n/,$r);
- 	my($rec) = { raw => [@l], other => [] };
- 	my(@E,@R,@N,@M,@S,@US);
--	my($hash) = new MD5;
-+	my($hash) = Digest::MD5->new;
- 	$l[0] =~ s/\s+/ /g;
- 	$hash->add($l[0]);
- 	my($date, $time, $length, $early, $late, $flags, $color) = split(/\s+/, shift @l);
-@@ -629,7 +629,7 @@
- 
- sub HashPilotRecord {
- 	my($record) = @_;
--	my($hash) = new MD5;
-+	my($hash) = Digest::MD5->new;
- 	$hash->add($record->{raw});
- 	$hash->hexdigest;
- }
diff --git a/comms/pilotmgr/patches/patch-ad b/comms/pilotmgr/patches/patch-ad
deleted file mode 100644
index a4731cb5ba3..00000000000
--- a/comms/pilotmgr/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/10/02 06:43:39 jlam Exp $
-
---- lib/test/SyncPlan.t.orig	Tue Mar 17 14:31:03 1998
-+++ lib/test/SyncPlan.t
-@@ -30,8 +30,8 @@
- eval "use IO::Select";
- &complain("IO::Select", $@) if ($@);
- 
--eval "use MD5";
--&complain("MD5", $@) if ($@);
-+eval "use Digest::MD5";
-+&complain("Digest::MD5", $@) if ($@);
- 
- print qq|
- All required modules are installed properly on your system,
diff --git a/comms/pilotmgr/patches/patch-ae b/comms/pilotmgr/patches/patch-ae
deleted file mode 100644
index a4cf12ba56b..00000000000
--- a/comms/pilotmgr/patches/patch-ae
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/02/13 20:36:11 tron Exp $
-
---- Setup.orig	1999-03-24 23:00:00.000000000 +0000
-+++ Setup	2005-02-13 20:34:12.000000000 +0000
-@@ -36,50 +36,11 @@
- read foo
- 
- VERS="5.003"
--PERL=
--
--echo "Locating Perl 5..."
--for dir in `echo $PATH | sed -e 's/:/ /g'`
--do
--	for cmd in perl5 perl
--	do
--		if [ -n "$dir" -a -x "$dir/$cmd" ]
--		then
--			MAYBE=`$dir/$cmd -e 'print $^X'`
--	
--			if [ "$MAYBE" != "" ]
--			then
--				`$MAYBE -e "eval{require $VERS}; \
--					    exit 0 if \\$@; exit 1"`
--			fi
--
--			if [ $? -eq 1 ]
--			then
--				PERL=$MAYBE
--				break 2
--			fi
--		fi
--	done
--done
--
--# Now, either we've found the right version of Perl and we 
--# can continue, or we haven't and we should fail.
--#
--
--if [ -z "$PERL" ]
--then
--	cat<<EOF
--Setup was unable to locate an appropriate version of
--Perl from your path.  You need to have Perl v5.003 or
--later in your path for PilotManager to work.
--EOF
--	exit 1;
--fi
- 
- echo "Perl 5 found [at $PERL]"
- echo "Please wait..."
- 
--cat > /tmp/pmgr-setup.pl <<EOF
-+cat > ${WRKDIR}/pmgr-setup.pl <<EOF
- 
- use Config;
- 
-@@ -212,5 +173,5 @@
- 
- EOF
- 
--$PERL /tmp/pmgr-setup.pl
-+$PERL ${WRKDIR}/pmgr-setup.pl
-