kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2.1.1 to make it work with current pilot-link-libs.

Browse source 
Changes since 2.0.5: ChangeLog only documents portability
fixes, but is incomplete.
This commit is contained in:
wiz 2003-01-13 18:29:52 +00:00
parent 60ace37e98
commit 3a15fc9fae
4 changed files with 34 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
comms/malsync/Makefile
View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.6 2002/10/05 03:43:42 wiz Exp $
# $NetBSD: Makefile,v 1.7 2003/01/13 18:29:52 wiz Exp $
#
DISTNAME= ${PKGNAME_NOREV:S/-/_/}.src
PKGNAME= malsync-2.0.5
PKGREVISION= 1
WRKSRC= ${WRKDIR}/malsync/mal/client/unix
PKGNAME= malsync-2.1.1
WRKSRC= ${WRKDIR}/malsync
CATEGORIES= comms
MASTER_SITES= http://www.tomw.org/malsync/
@ -14,6 +13,8 @@ COMMENT= utility to synchronize Palm Pilots to the AvantGo.com service
USE_BUILDLINK2= YES
USE_GMAKE= YES
MAKE_ENV+= PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
CPPFLAGS+= -D__unix__=1
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/malsync ${PREFIX}/bin

10
comms/malsync/distinfo
View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.3 2001/06/27 18:07:55 jlam Exp $
$NetBSD: distinfo,v 1.4 2003/01/13 18:29:52 wiz Exp $
SHA1 (malsync_2.0.5.src.tar.gz) = 47e0097f051b1ffb0be67cd092657ff9d80ade3c
Size (malsync_2.0.5.src.tar.gz) = 178522 bytes
SHA1 (patch-aa) = 55c856379af88b90e098b2cfb1457c98bc79f415
SHA1 (patch-ab) = dc5247e4b4a8df76b4d19c4b298bbb7c50e1fc3a
SHA1 (malsync_2.1.1.src.tar.gz) = c2746f25cd7a10409c342f34675dd072b6ea1cdd
Size (malsync_2.1.1.src.tar.gz) = 171745 bytes
SHA1 (patch-aa) = 31179e60ebb301a612fc8339795d7e185667005f
SHA1 (patch-ab) = de38ceb03f777bac1f4612517850e023dee946b7

43
comms/malsync/patches/patch-aa
View file

@ -1,35 +1,30 @@
$NetBSD: patch-aa,v 1.2 2001/06/27 18:07:55 jlam Exp $
$NetBSD: patch-aa,v 1.3 2003/01/13 18:29:52 wiz Exp $
--- Makefile.orig Sun May 14 17:17:35 2000
--- Makefile.orig Sun Nov 17 19:52:53 2002
+++ Makefile
@@ -1,4 +1,3 @@
-CC = gcc
@@ -1,5 +1,7 @@
TARGET = malsync
PLAT := $(shell uname)
@@ -12,9 +11,9 @@
endif
TREETOP = ../../..
-PILOT_LINK_DIR = $(TREETOP)/vendor/pilot/pilot-link.0.9.3
+PILOT_LINK_DIR = ${BUILDLINK_DIR}
-CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
+CFLAGS+=-DMALSYNC -D__unix__ -I$(TREETOP)/mal/common \
-I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include -I.
@@ -55,10 +54,12 @@
OBJS = $(SRC:.c=.o)
+all: ${TARGET}
+
PLAT := $(shell uname)
ifeq ($(PLAT),SunOS)
@@ -15,7 +17,6 @@ LINKLIBS = -lm
endif
TREETOP = .
-PILOT_LINK_DIR = $(TREETOP)/pilot-link-0.11.5
CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
-I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include \
@@ -72,8 +73,8 @@ DYNLINK = -rdynamic
endif
$(TARGET): $(OBJS)
- $(CC) -rdynamic $(CFLAGS) -o $@ $(OBJS) \
- -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS)
+ $(CC) -rdynamic $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) \
- $(CC) $(DYNLINK) $(CFLAGS) -o $@ $(OBJS) \
- -L${PILOT_LINK_DIR}/libpisock/.libs -lpisock $(LINKLIBS)
+ $(CC) $(DYNLINK) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) \
+ -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS)
clean:
rm -f $(OBJS) $(TARGET)

10
comms/malsync/patches/patch-ab
View file

@ -1,7 +1,7 @@
$NetBSD: patch-ab,v 1.1.1.1 2000/06/15 14:04:47 rh Exp $
$NetBSD: patch-ab,v 1.2 2003/01/13 18:29:53 wiz Exp $
--- ../../../mal/common/AGNet.h.orig Sun May 14 23:17:36 2000
+++ ../../../mal/common/AGNet.h Thu Jun 15 14:20:07 2000
--- mal/common/AGNet.h.orig Fri Jan 5 17:50:07 2001
+++ mal/common/AGNet.h
@@ -54,6 +54,7 @@
# else /* defined(macintosh) */
# include <netdb.h>
@ -14,8 +14,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/06/15 14:04:47 rh Exp $
# include <sys/filio.h>
# include <arpa/inet.h>
# else
-# ifdef __FreeBSD__
+# if (defined(BSD) && BSD >= 199306)
-# if defined(__FreeBSD__) || defined(_HPUX_SOURCE)
+# if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE)
# include <sys/ioctl.h>
# include <arpa/inet.h>
# else