o) Fix perl usage. Use sed_reinplace instead

o) Upgrade to version 0.8.7
o) Fix compile problems with pilot-link-0.11.X

6 files changed, 92 insertions, 9 deletions

diff --git a/palm/syncal/Makefile b/palm/syncal/Makefile
index cb5538a..4a396fa 100644
--- a/palm/syncal/Makefile
+++ b/palm/syncal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	syncal
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	0.8.7
 CATEGORIES=	palm comms deskutils
 MASTER_SITES=	http://hopf.math.nwu.edu/syncal/ \
 		ftp://ftp.Uni-Bielefeld.DE/pub/systems/FreeBSD/lkoeller/
@@ -17,13 +16,15 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 RUN_DEPENDS=	ical:${PORTSDIR}/deskutils/ical
 
+USE_REINPLACE=	yes
+
 NO_PACKAGE=	patches installed ical port
 
 MAN1=		syncal.1
 
 post-patch:
 .for file in Makefile user.tcl ical.patch
-	${PERL} -pi -e "s|\@\@PREFIX\@\@|${LOCALBASE}|g" ${WRKSRC}/${file}
+	${REINPLACE_CMD} -e "s|\@\@PREFIX\@\@|${LOCALBASE}|g" ${WRKSRC}/${file}
 .endfor
 
 # 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 fffb27e..ae83646 100644
--- a/palm/syncal/distinfo
+++ b/palm/syncal/distinfo
@@ -1 +1 @@
-MD5 (syncal-0.8.6.tar.gz) = 52d66b11453ba4a16d6166176cd8701d
+MD5 (syncal-0.8.7.tar.gz) = 860b2924c254c746401d286db026ffd9
diff --git a/palm/syncal/files/patch-aa b/palm/syncal/files/patch-aa
index 1bd1a44c..ff72131 100644
--- a/palm/syncal/files/patch-aa
+++ b/palm/syncal/files/patch-aa
@@ -1,5 +1,5 @@
-*** Makefile.org	Fri Dec 22 14:08:08 2000
---- Makefile	Fri Dec 22 14:10:01 2000
+*** Makefile.org	Mon Jan 20 21:06:28 2003
+--- Makefile	Mon Jan 20 21:07:55 2003
 ***************
 *** 14,20 ****
   #
@@ -40,8 +40,8 @@
   # Unless you're smarter than me, which is entirely possible. [JTL]
   #
 ! LIBDIR = -L$(top_builddir)
-! INCDIR = -I$(top_builddir)
-  CFLAGS = -Wall -g $(INCDIR) $(DEFINES)
+! INCDIR = -I$(top_builddir) -I/usr/include/libpisock
+  CFLAGS =  -Wall -w -O -g $(INCDIR) $(DEFINES)
   SYNCAL_OBJS = syncal.o syncal_cat.c syncal_list.o syncal_dates.o\
   	syncal_reconcile.o syncal_gmt.o
 --- 65,72 ----
@@ -50,7 +50,7 @@
   #
 ! LIBDIR = -L$(top_builddir)/lib
 ! INCDIR = -I$(top_builddir)/include
-  CFLAGS = -Wall -g $(INCDIR) $(DEFINES)
+  CFLAGS =  -Wall -w -O -g $(INCDIR) $(DEFINES)
   SYNCAL_OBJS = syncal.o syncal_cat.c syncal_list.o syncal_dates.o\
   	syncal_reconcile.o syncal_gmt.o
 ***************
diff --git a/palm/syncal/files/patch-ba b/palm/syncal/files/patch-ba
new file mode 100644
index 0000000..71be3d5
--- /dev/null
+++ b/palm/syncal/files/patch-ba
@@ -0,0 +1,46 @@
+*** syncal.c.org	Mon Jan 20 21:44:11 2003
+--- syncal.c	Mon Jan 20 21:41:26 2003
+***************
+*** 15,20 ****
+--- 15,21 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <ctype.h>
++ #include <errno.h>
+  #include <sys/stat.h>
+  #include <sys/types.h>
+  #include <sys/signal.h>
+***************
+*** 1449,1455 ****
+  
+  
+  static void
+! create_uid( char * buf, recordid_t pil_id __attribute__((__unused)) )
+  {
+  #ifndef MAXHOSTNAMELEN
+  #define MAXHOSTNAMELEN	(64)
+--- 1450,1456 ----
+  
+  
+  static void
+! create_uid( char * buf, recordid_t pil_id )
+  {
+  #ifndef MAXHOSTNAMELEN
+  #define MAXHOSTNAMELEN	(64)
+***************
+*** 1720,1726 ****
+  }
+  
+  static void
+! syncal_timeout( int sig __attribute__((__unused)) )
+  {
+  	signal( SIGALRM, SIG_DFL);
+  	alarm( 0);
+--- 1721,1727 ----
+  }
+  
+  static void
+! syncal_timeout( int sig )
+  {
+  	signal( SIGALRM, SIG_DFL);
+  	alarm( 0);
diff --git a/palm/syncal/files/patch-bb b/palm/syncal/files/patch-bb
new file mode 100644
index 0000000..f880573
--- /dev/null
+++ b/palm/syncal/files/patch-bb
@@ -0,0 +1,24 @@
+*** syncal.h.org	Mon Jan 20 21:44:20 2003
+--- syncal.h	Mon Jan 20 21:34:53 2003
+***************
+*** 20,25 ****
+--- 20,29 ----
+  #define DEFAULT_ALARM	(0)
+  
+  
++ #ifndef PI_AF_SLP
++ #define PI_AF_SLP 0x0051
++ #endif
++ 
+  /*
+   * These are the calendar file suffixes which indicate
+   * an ical dominant file and a Pilot dominant file respectively.
+***************
+*** 232,237 ****
+          *str_ndup( char *, int),
+          *str_bytestuff( char *, char *, char),
+          *str_byteunstuff( char *, char);
+- 
+- 
+- 
+--- 236,238 ----
diff --git a/palm/syncal/files/patch-bc b/palm/syncal/files/patch-bc
new file mode 100644
index 0000000..9389068
--- /dev/null
+++ b/palm/syncal/files/patch-bc
@@ -0,0 +1,12 @@
+*** syncal_cat.c.org	Mon Jan 20 21:49:52 2003
+--- syncal_cat.c	Mon Jan 20 21:50:06 2003
+***************
+*** 11,16 ****
+--- 11,17 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #include <errno.h>
+  #include <sys/stat.h>
+  #include <time.h>
+  #include <ctype.h>