diff options
Diffstat (limited to 'palm')
| -rw-r--r-- | palm/malsync/Makefile | 11 | ||||
| -rw-r--r-- | palm/malsync/distinfo | 2 | ||||
| -rw-r--r-- | palm/malsync/files/patch-aa | 41 |
3 files changed, 25 insertions, 29 deletions
diff --git a/palm/malsync/Makefile b/palm/malsync/Makefile index 476606fcae7a..76f9d50486a0 100644 --- a/palm/malsync/Makefile +++ b/palm/malsync/Makefile @@ -6,20 +6,19 @@ # 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 diff --git a/palm/malsync/distinfo b/palm/malsync/distinfo index d8d14bfcd1ab..33cd8e5741f3 100644 --- a/palm/malsync/distinfo +++ b/palm/malsync/distinfo @@ -1 +1 @@ -MD5 (malsync_src_1_8.tar.gz) = d43dcc97b4b7288a2e36f9f08e44f00a +MD5 (malsync_2.0.4.src.tar.gz) = 781f9e19333817dd75623becb085a309 diff --git a/palm/malsync/files/patch-aa b/palm/malsync/files/patch-aa index ae54dda55bbd..6b49d4dc49e2 100644 --- a/palm/malsync/files/patch-aa +++ b/palm/malsync/files/patch-aa @@ -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 @@ - OBJS = $(SRC:.c=.o) +@@ -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 $@ $< - - +- +- +- +- |