upgrade to 0.8.1.

PR:		13690
Reviewed by:	maintainer

6 files changed, 67 insertions, 23 deletions

diff --git a/palm/syncal/Makefile b/palm/syncal/Makefile
index 74169836fc85..5f0ef8323c87 100644
--- a/palm/syncal/Makefile
+++ b/palm/syncal/Makefile
@@ -6,13 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	syncal-0.5
+DISTNAME=	syncal-0.8.1
 CATEGORIES=	palm comms deskutils
-MASTER_SITES=	ftp://ryeham.ee.ryerson.ca/pub/PalmOS/	\
-		http://www.daveltd.com/pilot/PalmOS/	\
-		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
+MASTER_SITES=	http://hopf.math.nwu.edu/syncal/
 
-MAINTAINER=	Lars.Koeller@Uni-Bielefeled.DE
+MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link
 RUN_DEPENDS=	ical:${PORTSDIR}/deskutils/ical
@@ -26,6 +24,11 @@ MAN1=		syncal.1
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.patched
 	${SED} -e "s:@@PREFIX@@:${PREFIX}:g" ${WRKSRC}/Makefile.patched > ${WRKSRC}/Makefile
+	${MV} ${WRKSRC}/user.tcl ${WRKSRC}/user.tcl.patched
+	${SED} -e "s:@@PREFIX@@:${PREFIX}:g" ${WRKSRC}/user.tcl.patched > ${WRKSRC}/user.tcl
+	${MV} ${WRKSRC}/ical.patch ${WRKSRC}/ical.patch.patched
+	${SED} -e "s:@@PREFIX@@:${PREFIX}:g" ${WRKSRC}/ical.patch.patched > ${WRKSRC}/ical.patch
+	${RM} ${WRKSRC}/*.o
 
 #
 # ical V2.2 needs a little patch, don't know how to do better
diff --git a/palm/syncal/distinfo b/palm/syncal/distinfo
index 455fce7b28b3..ab0236af1aaf 100644
--- a/palm/syncal/distinfo
+++ b/palm/syncal/distinfo
@@ -1 +1 @@
-MD5 (syncal-0.5.tar.gz) = 0487b952f0bcea6a521b664c68114214
+MD5 (syncal-0.8.1.tar.gz) = 54cb4558ec3e02fd395ff03c7d87fc52
diff --git a/palm/syncal/files/patch-aa b/palm/syncal/files/patch-aa
index af8499e91e1a..9de3c65937be 100644
--- a/palm/syncal/files/patch-aa
+++ b/palm/syncal/files/patch-aa
@@ -1,7 +1,7 @@
-*** Makefile.org	Fri Apr  9 19:54:00 1999
---- Makefile	Sat Apr 24 13:26:57 1999
+*** Makefile.org	Fri Sep 17 21:54:21 1999
+--- Makefile	Fri Sep 17 21:56:57 1999
 ***************
-*** 13,19 ****
+*** 14,20 ****
   #
   # top_builddir = /home/john/pilot/src/pilot-link.0.9.1
   #
@@ -9,7 +9,7 @@
   
   ##########
   # Pick your C compiler
---- 13,19 ----
+--- 14,20 ----
   #
   # top_builddir = /home/john/pilot/src/pilot-link.0.9.1
   #
@@ -18,7 +18,7 @@
   ##########
   # Pick your C compiler
 ***************
-*** 25,31 ****
+*** 26,32 ****
   ##########
   # Where should I be installed?
   #
@@ -26,7 +26,7 @@
   INSTALLBIN = $(INSTALLTOP)/bin
   INSTALLMAN = $(INSTALLTOP)/man
   
---- 25,31 ----
+--- 26,32 ----
   ##########
   # Where should I be installed?
   #
@@ -35,35 +35,36 @@
   INSTALLMAN = $(INSTALLTOP)/man
   
 ***************
-*** 58,65 ****
+*** 65,72 ****
   #
   # Unless you're smarter than me, which is entirely possible. [JTL]
   #
 ! LIBDIR = -L$(top_builddir)
 ! INCDIR = -I$(top_builddir)
-  CFLAGS = -Wall $(INCDIR)
-  SYNCAL_OBJS = syncal.o syncal_list.o syncal_dates.o syncal_reconcile.o
-  LIBTOOL = $(top_builddir)/libtool
---- 58,65 ----
+  CFLAGS = -Wall $(INCDIR) $(DEFINES)
+  SYNCAL_OBJS = syncal.o syncal_cat.c syncal_list.o syncal_dates.o\
+  	syncal_reconcile.o syncal_gmt.o
+--- 65,72 ----
   #
   # Unless you're smarter than me, which is entirely possible. [JTL]
   #
 ! LIBDIR = -L$(top_builddir)/lib
 ! INCDIR = -I$(top_builddir)/include
-  CFLAGS = -Wall $(INCDIR)
-  SYNCAL_OBJS = syncal.o syncal_list.o syncal_dates.o syncal_reconcile.o
-  LIBTOOL = $(top_builddir)/libtool
+  CFLAGS = -Wall $(INCDIR) $(DEFINES)
+  SYNCAL_OBJS = syncal.o syncal_cat.c syncal_list.o syncal_dates.o\
+  	syncal_reconcile.o syncal_gmt.o
 ***************
-*** 81,86 ****
+*** 90,95 ****
   install:
   	install -d $(INSTALLBIN)
   	install -d $(INSTALLMAN)/man1
 ! 	install -s -g root -o root -m 755 syncal $(INSTALLBIN)
-! 
+  
 ! 	install -g root -o root -m 644 syncal.1 $(INSTALLMAN)/man1
---- 81,85 ----
+--- 90,95 ----
   install:
   	install -d $(INSTALLBIN)
   	install -d $(INSTALLMAN)/man1
 ! 	install -c -s -g bin -o bin -m 755 syncal $(INSTALLBIN)
+  
 ! 	install -c -m 644 syncal.1 $(INSTALLMAN)/man1
diff --git a/palm/syncal/files/patch-ab b/palm/syncal/files/patch-ab
new file mode 100644
index 000000000000..1f50a54fa284
--- /dev/null
+++ b/palm/syncal/files/patch-ab
@@ -0,0 +1,19 @@
+*** ical.patch.org	Fri Sep 17 22:29:27 1999
+--- ical.patch	Fri Sep 17 22:29:59 1999
+***************
+*** 17,23 ****
+  +    "Okay" "Cancel"]
+  +    
+  +    if { $result} {
+! +        exec syncal >/dev/null
+  +        io_read [ical_leader]
+  +    }
+  +    cal option AmPm $dm_AmPm
+--- 17,23 ----
+  +    "Okay" "Cancel"]
+  +
+  +    if { $result} {
+! +        exec @@PREFIX@@/bin/syncal >/dev/null
+  +        io_read [ical_leader]
+  +    }
+  +    cal option AmPm $dm_AmPm
diff --git a/palm/syncal/files/patch-ac b/palm/syncal/files/patch-ac
new file mode 100644
index 000000000000..ff7246fde930
--- /dev/null
+++ b/palm/syncal/files/patch-ac
@@ -0,0 +1,19 @@
+*** user.tcl~	Fri Sep 17 22:03:52 1999
+--- user.tcl	Fri Sep 17 22:05:58 1999
+***************
+*** 24,30 ****
+      "Okay" "Cancel"]
+      
+      if { $result} {
+!         exec syncal >/dev/null
+          io_read [ical_leader]
+      }
+      cal option AmPm $dm_AmPm
+--- 24,30 ----
+      "Okay" "Cancel"]
+  
+      if { $result} {
+!         exec @@PREFIX@@/bin/syncal >/dev/null
+          io_read [ical_leader]
+      }
+      cal option AmPm $dm_AmPm
diff --git a/palm/syncal/pkg-plist b/palm/syncal/pkg-plist
index 423c80208ba4..1efd03d87d2e 100644
--- a/palm/syncal/pkg-plist
+++ b/palm/syncal/pkg-plist
@@ -1 +1,3 @@
 bin/syncal
+@unexec mv -f /usr/local/lib/ical/v2.2/actions.tcl.orig /usr/local/lib/ical/v2.2/actions.tcl
+@unexec mv -f /usr/local/lib/ical/v2.2/dayview.tcl.orig /usr/local/lib/ical/v2.2/dayview.tcl