Update to 0.71, makes it compile again with latest jpilot.

Changes since 0.60:
0.71 - 4/27/2002
- Support for pilot-link 0.10
- syncmal.c now includes errno.h
  -- Thanks to Renaud Pacalet and Ludovic Rousseau, both of whom pointed out
these errors and how to fix them
- Added GPL exception text to the boilerplate in libplugin.h and prefs.h,
with Judd's permission

0.70 - 4/7/2002
- Distribution now includes necessary J-Pilot headers (libplugin.h and
prefs.h) and malsync-2.0.7 source.
- Updated README for vastly simplified build instructions
- Added jpilot-syncmal.spec

0.62.2 - 2/7/2002
- Updated prefs code to use the new API (J-Pilot 0.99.2 and later)

0.62 - 5/9/2001
- Fixed a typo in skip_sync which would cause it to fail if any interval
other than always was selected.  Thanks to Chris Bagwell for identifying
this bug.

0.61 - 3/3/2001  Very minor changes
- Fix an error in configure.in which caused the build to fail on Solaris
- Added some comments to syncmal.c

5 files changed, 58 insertions, 44 deletions

diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 8083a280fac..ae756cb33d4 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2002/09/21 07:25:02 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/13 13:21:07 wiz Exp $
 
-DISTNAME=		jpilot-syncmal_0.60
-PKGNAME=		jpilot-syncmal-0.60
-PKGREVISION=		1
+DISTNAME=		jpilot-syncmal_0.71
+PKGNAME=		jpilot-syncmal-0.71
 CATEGORIES=		comms
-MASTER_SITES=		http://people.atl.mediaone.net/jasonday/code/syncmal/
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		malsync_2.0.5.src${EXTRACT_SUFX}
+MASTER_SITES=		http://jasonday.home.att.net/code/syncmal/
 
 MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://people.atl.mediaone.net/jasonday/code/syncmal/syncmal.html
+HOMEPAGE=		http://jasonday.home.att.net/code/syncmal/syncmal.html
 COMMENT=		MAL synchronization plugin for J-Pilot
 
 BUILDLINK_DEPMETHOD.jpilot=	full
@@ -19,22 +16,18 @@ USE_X11=		# defined
 USE_GMAKE=		# defined
 
 USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
-CONFIGURE_ARGS+=	--with-mal-source="${WRKSRC}/../malsync"
-CONFIGURE_ARGS+=	--with-plugin-prefix="${BUILDLINK_PREFIX.jpilot}/include/jpilot"
-CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
-
+CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk}
+CONFIGURE_ARGS+=	--with-plugin-prefix=${BUILDLINK_PREFIX.jpilot}/include/jpilot
+CONFIGURE_ARGS+=	--with-pilot-prefix=${BUILDLINK_PREFIX.pilot-link-libs}
+MAKE_ENV+=		PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
 CFLAGS+=		-D__unix__=1
 
 PLUGINSDIR=		${PREFIX}/lib/jpilot/plugins
 PLIST_SUBST+=		PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///}
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR}
-
 .include "../../comms/jpilot/buildlink2.mk"
 .include "../../comms/pilot-link-libs/buildlink2.mk"
 
diff --git a/comms/jpilot-syncmal/PLIST b/comms/jpilot-syncmal/PLIST
index 6891afa803b..b81c78b5328 100644
--- a/comms/jpilot-syncmal/PLIST
+++ b/comms/jpilot-syncmal/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/13 13:21:08 wiz Exp $
+${PLUGINSDIR}/libsyncmal.la
 ${PLUGINSDIR}/libsyncmal.so
diff --git a/comms/jpilot-syncmal/distinfo b/comms/jpilot-syncmal/distinfo
index b7f9418c821..33081038474 100644
--- a/comms/jpilot-syncmal/distinfo
+++ b/comms/jpilot-syncmal/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 09:04:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/13 13:21:08 wiz Exp $
 
-SHA1 (jpilot-syncmal_0.60.tar.gz) = c7540a7f659848f59867bbca37f57f75bedc3315
-Size (jpilot-syncmal_0.60.tar.gz) = 124956 bytes
-SHA1 (malsync_2.0.5.src.tar.gz) = 47e0097f051b1ffb0be67cd092657ff9d80ade3c
-Size (malsync_2.0.5.src.tar.gz) = 178522 bytes
-SHA1 (patch-aa) = 8ae1ca6e229225f1a694d0401ee79906c7c3dfbd
+SHA1 (jpilot-syncmal_0.71.tar.gz) = 561b5b1e090d883cf4cd04d801ae24deeab391ad
+Size (jpilot-syncmal_0.71.tar.gz) = 302724 bytes
+SHA1 (patch-aa) = eaf02c8e0e0fc3664ed9f821aa30f06973039b92
+SHA1 (patch-ab) = 3cfe2caa22b973411602323bd922480815143e19
diff --git a/comms/jpilot-syncmal/patches/patch-aa b/comms/jpilot-syncmal/patches/patch-aa
index acacb49e1eb..85b86ffc15e 100644
--- a/comms/jpilot-syncmal/patches/patch-aa
+++ b/comms/jpilot-syncmal/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2001/03/02 17:38:10 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2003/01/13 13:21:09 wiz Exp $
 
---- ../malsync/mal/common/AGNet.h.orig	Sun May 14 17:17:36 2000
-+++ ../malsync/mal/common/AGNet.h
-@@ -54,6 +54,7 @@
- #       else /* defined(macintosh) */
- #           include <netdb.h>
- #           include <sys/types.h>
-+#           include <sys/param.h>
- #           include <sys/socket.h>
- #           include <unistd.h>
- #           include <netinet/in.h>
-@@ -61,7 +62,7 @@
- #               include <sys/filio.h>
- #               include <arpa/inet.h>
- #           else
--#               ifdef __FreeBSD__
-+#               if (defined(BSD) && BSD >= 199306)
- #                   include <sys/ioctl.h>
- #                   include <arpa/inet.h>
- #               else
+--- malsync/mal/client/unix/Makefile.orig	Sat Feb  9 20:21:06 2002
++++ malsync/mal/client/unix/Makefile
+@@ -16,7 +16,6 @@ LINKLIBS = -lm
+ endif
+ 
+ TREETOP = ../../..
+-PILOT_LINK_DIR = $(TREETOP)/vendor/pilot/pilot-link.0.9.5
+ 
+ CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
+   -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include -I.
+@@ -70,7 +69,7 @@ endif
+ 
+ $(TARGET): $(OBJS)
+ 	$(CC) $(DYNLINK) $(CFLAGS) -o $@ $(OBJS) \
+-          -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS)
++          -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS)
+ clean:
+ 	rm -f $(OBJS) $(TARGET)
+ 
diff --git a/comms/jpilot-syncmal/patches/patch-ab b/comms/jpilot-syncmal/patches/patch-ab
new file mode 100644
index 00000000000..cc0eddc151d
--- /dev/null
+++ b/comms/jpilot-syncmal/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2003/01/13 13:21:09 wiz Exp $
+
+--- malsync/mal/common/AGNet.h.orig	Fri Jan  5 17:50:07 2001
++++ malsync/mal/common/AGNet.h
+@@ -54,6 +54,7 @@
+ #       else /* defined(macintosh) */
+ #           include <netdb.h>
+ #           include <sys/types.h>
++#           include <sys/param.h>
+ #           include <sys/socket.h>
+ #           include <unistd.h>
+ #           include <netinet/in.h>
+@@ -61,7 +62,7 @@
+ #               include <sys/filio.h>
+ #               include <arpa/inet.h>
+ #           else
+-#               if defined(__FreeBSD__) || defined(_HPUX_SOURCE)
++#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE)
+ #                   include <sys/ioctl.h>
+ #                   include <arpa/inet.h>
+ #               else