Index: head/palm/malsync/Makefile
===================================================================
--- head/palm/malsync/Makefile	(revision 31051)
+++ head/palm/malsync/Makefile	(revision 31052)
@@ -1,27 +1,26 @@
 # ports collection makefile for:	malsync
 # Date created:			Tue Feb 22 00:06:07 CET 2000
 # Whom:				Dirk Froemberg <dirk@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	malsync
-PORTVERSION=	1.8
+PORTVERSION=	2.04
 CATEGORIES=	palm
-MASTER_SITES=	http://www.tomw.org/ \
+MASTER_SITES=	http://www.tomw.org/%SUBDIR%/ \
 		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dirk
-DISTNAME=	malsync_src_1_8
+MASTER_SITE_SUBDIR=	malsync
+DISTNAME=	malsync_2.0.4.src
 
 MAINTAINER=	dirk@FreeBSD.org
 
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link
 
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/malsync_src/mal/client/unix
-FETCH_BEFORE_ARGS=	-b
+WRKSRC=		${WRKDIR}/malsync/mal/client/unix
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/malsync ${PREFIX}/bin
 
 .include <bsd.port.mk>

Property changes on: head/palm/malsync/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/palm/malsync/distinfo
===================================================================
--- head/palm/malsync/distinfo	(revision 31051)
+++ head/palm/malsync/distinfo	(revision 31052)
@@ -1 +1 @@
-MD5 (malsync_src_1_8.tar.gz) = d43dcc97b4b7288a2e36f9f08e44f00a
+MD5 (malsync_2.0.4.src.tar.gz) = 781f9e19333817dd75623becb085a309

Property changes on: head/palm/malsync/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/palm/malsync/files/patch-aa
===================================================================
--- head/palm/malsync/files/patch-aa	(revision 31051)
+++ head/palm/malsync/files/patch-aa	(revision 31052)
@@ -1,50 +1,47 @@
---- Makefile.orig	Wed Sep 22 01:48:40 1999
-+++ Makefile	Tue Feb 22 21:13:18 2000
+--- Makefile.orig	Sun May 14 23:17:35 2000
++++ Makefile	Tue Jul 25 14:25:02 2000
 @@ -1,4 +1,3 @@
 -CC = gcc
  TARGET = malsync
  
  PLAT := $(shell uname)
-@@ -6,9 +5,14 @@
+@@ -12,9 +11,15 @@
+ endif
  
- 
  TREETOP = ../../..
 -PILOT_LINK_DIR = $(TREETOP)/vendor/pilot/pilot-link.0.9.3
 +PILOT_LINK_DIR = $(PREFIX)/pilot
++  
++DEFINES = -DMALSYNC
  
- DEFINES = -DMALSYNC
-+
+-CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
 +ifeq ($(PLAT),FreeBSD)
 +LINKFLAGS = -Wl,--rpath -Wl,$(PILOT_LINK_DIR)/lib
 +endif
 +
- ifeq ($(PLAT),Linux)
- DEFINES += -DHAVE_GETOPTLONG
- LINKFLAGS = -rdynamic
-@@ -21,7 +25,7 @@
- 
- endif
- 
--CFLAGS = -Wall -g $(DEFINES) -I$(TREETOP)/mal/common \
 +CFLAGS += $(DEFINES) -I$(TREETOP)/mal/common \
    -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include -I.
  
  
-@@ -63,14 +67,13 @@
+@@ -55,17 +60,12 @@
+ 
  OBJS = $(SRC:.c=.o)
  
- 
 +all: $(TARGET)
-+
- $(TARGET): $(OBJS)
--	$(CC) $(CFLAGS) -o $@ $(OBJS) -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS) $(LINKFLAGS)
  
+ $(TARGET): $(OBJS)
+-	$(CC) -rdynamic  $(CFLAGS) -o $@ $(OBJS) \
+-          -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS)
++	$(CC) $(CFLAGS) -o $@ $(OBJS) \
++	-L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS) $(LINKFLAGS)
++ 
  clean:
  	rm -f $(OBJS) $(TARGET)
 -
 -.c.o:
 -	gcc $(CFLAGS) -c -o $@ $<
- 
- 
+-
+-
+-
+-
  

Property changes on: head/palm/malsync/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property