summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comms/pilotmgr/Makefile20
-rw-r--r--comms/pilotmgr/PLIST5
-rw-r--r--comms/pilotmgr/distinfo14
-rw-r--r--comms/pilotmgr/patches/patch-aa42
-rw-r--r--comms/pilotmgr/patches/patch-ab114
-rw-r--r--comms/pilotmgr/patches/patch-ac40
-rw-r--r--comms/pilotmgr/patches/patch-ad15
-rw-r--r--comms/pilotmgr/patches/patch-ae63
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
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 23:59:13 +0000