Fix build by upgrading to 2.1.0 after pilot-link upgrade.

Approved by:	portmgr

4 files changed, 36 insertions, 39 deletions

diff --git a/palm/malsync/Makefile b/palm/malsync/Makefile
index b32ef4b40797..b63030875c74 100644
--- a/palm/malsync/Makefile
+++ b/palm/malsync/Makefile
@@ -6,27 +6,23 @@
 #
 
 PORTNAME=	malsync
-PORTVERSION=	2.06
-PORTREVISION=	2
+PORTVERSION=	2.10
 CATEGORIES=	palm
 MASTER_SITES=	http://www.tomw.org/malsync/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dirk
-DISTNAME=	malsync_2.0.6.src
+DISTNAME=	malsync_2.1.0.src
 
 MAINTAINER=	dirk@FreeBSD.org
 
 LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/malsync/mal/client/unix
+WRKSRC=		${WRKDIR}/malsync
 
 pre-patch:
 	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
-		${WRKSRC}/MAL31DBConfig.c
-
-pre-build:
-	cd ${WRKSRC} && ${GMAKE} clean
+		${WRKSRC}/mal/client/unix/MAL31DBConfig.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/malsync ${PREFIX}/bin
diff --git a/palm/malsync/distinfo b/palm/malsync/distinfo
index 861084758d50..979f81156446 100644
--- a/palm/malsync/distinfo
+++ b/palm/malsync/distinfo
@@ -1 +1 @@
-MD5 (malsync_2.0.6.src.tar.gz) = 08ff5b0ce3d2c7eaf616929f4ada913d
+MD5 (malsync_2.1.0.src.tar.gz) = 7fb71bba9d83ed2f0758b807ab4cc6a2
diff --git a/palm/malsync/files/patch-aa b/palm/malsync/files/patch-aa
index 227f35f109de..c6858d686b5e 100644
--- a/palm/malsync/files/patch-aa
+++ b/palm/malsync/files/patch-aa
@@ -1,48 +1,38 @@
---- Makefile.orig	Sun May 14 21:17:35 2000
-+++ Makefile	Mon Feb 11 19:30:47 2002
+--- Makefile.orig	Sat Apr 20 23:45:19 2002
++++ Makefile	Tue Sep 24 22:36:44 2002
 @@ -1,4 +1,3 @@
 -CC = gcc
  TARGET = malsync
  
  PLAT := $(shell uname)
-@@ -12,10 +11,16 @@
+@@ -16,9 +15,9 @@
  endif
  
- TREETOP = ../../..
--PILOT_LINK_DIR = $(TREETOP)/vendor/pilot/pilot-link.0.9.3
-+PILOT_LINK_DIR = $(PREFIX)/pilot
-+  
-+DEFINES = -DMALSYNC
+ TREETOP = .
+-PILOT_LINK_DIR = $(TREETOP)/pilot-link-0.10.99
++PILOT_LINK_DIR = $(PREFIX)
  
 -CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
--  -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include -I.
-+ifeq ($(PLAT),FreeBSD)
-+LINKFLAGS = -Wl,--rpath -Wl,$(PREFIX)/lib
-+endif
-+
-+CFLAGS += $(DEFINES) -I$(TREETOP)/mal/common \
-+  -I$(TREETOP)/mal/client/common -I$(PREFIX)/include -I.
- 
- 
- SRC = malsync.c  MAL31ServerConfig.c MAL31DBConfig.c MAL31UserConfig.c \
-@@ -55,17 +60,12 @@
++CFLAGS += -DMALSYNC -I$(TREETOP)/mal/common \
+   -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include \
+   -I$(TREETOP)/mal/client/unix
  
- OBJS = $(SRC:.c=.o)
+@@ -72,14 +71,14 @@
+ DYNLINK = -rdynamic
+ endif
  
 +all: $(TARGET)
- 
++
  $(TARGET): $(OBJS)
--	$(CC) -rdynamic  $(CFLAGS) -o $@ $(OBJS) \
--          -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS)
+-	$(CC) $(DYNLINK) $(CFLAGS) -o $@ $(OBJS) \
+-          -L${PILOT_LINK_DIR}/libpisock/.libs -lpisock $(LINKLIBS)
 +	$(CC) $(CFLAGS) -o $@ $(OBJS) \
-+	-L${PREFIX}/lib -lpisock $(LINKLIBS) $(LINKFLAGS)
-+ 
++          -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS)
  clean:
  	rm -f $(OBJS) $(TARGET)
--
+ 
 -.c.o:
 -	gcc $(CFLAGS) -c -o $@ $<
--
--
--
--
+ 
+ 
+ 
diff --git a/palm/malsync/files/patch-ab b/palm/malsync/files/patch-ab
new file mode 100644
index 000000000000..3dd27bcc9d06
--- /dev/null
+++ b/palm/malsync/files/patch-ab
@@ -0,0 +1,11 @@
+--- malsync.c.orig	Tue Apr  9 18:17:54 2002
++++ malsync.c	Tue Sep 24 22:26:24 2002
+@@ -64,8 +64,6 @@
+ #include <pi-version.h>
+ #include <pi-header.h>
+ 
+-int pilot_connect(const char *port);
+-
+ #define DEFAULT_CARD_NUM 0
+ 
+ #define VERSION_STRING "malsync version 2.1.0"