From 2fac29e044904c94adc7d6dd4869e294d2de051e Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 2 Mar 2001 17:38:09 +0000
Subject: Define __unix__=1 for malsync code to compile correctly.  Fixes
 pkg/12308.

---
 comms/jpilot-syncmal/Makefile         |  4 +++-
 comms/jpilot-syncmal/files/patch-sum  |  4 ++--
 comms/jpilot-syncmal/patches/patch-aa | 11 +++--------
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'comms')

diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index bf770f8307f..69b32237f37 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/03/02 00:04:26 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/02 17:38:09 jlam Exp $
 
 DISTNAME=		jpilot-syncmal_0.60
 PKGNAME=		jpilot-syncmal-0.60
@@ -30,6 +30,8 @@ CONFIGURE_ARGS+=	--with-mal-source="${WRKSRC}/../malsync"
 CONFIGURE_ARGS+=	--with-plugin-prefix="${JPILOTDIR}/include/jpilot"
 CONFIGURE_ARGS+=	--with-pilot-prefix="${PILOTLINKDIR}"
 
+CFLAGS+=		-D__unix__=1
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR}
 
diff --git a/comms/jpilot-syncmal/files/patch-sum b/comms/jpilot-syncmal/files/patch-sum
index 6a80631ba45..495cba8927d 100644
--- a/comms/jpilot-syncmal/files/patch-sum
+++ b/comms/jpilot-syncmal/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 2001/03/02 00:14:22 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/02 17:38:10 jlam Exp $
 
-MD5 (patch-aa) = 17b6ce8a44b309a5d98644df9bd96f50
+MD5 (patch-aa) = 48fd165539110a2569a47f7363075971
diff --git a/comms/jpilot-syncmal/patches/patch-aa b/comms/jpilot-syncmal/patches/patch-aa
index edb342638b5..acacb49e1eb 100644
--- a/comms/jpilot-syncmal/patches/patch-aa
+++ b/comms/jpilot-syncmal/patches/patch-aa
@@ -1,21 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2001/03/02 00:14:23 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/03/02 17:38:10 jlam Exp $
 
 --- ../malsync/mal/common/AGNet.h.orig	Sun May 14 17:17:36 2000
 +++ ../malsync/mal/common/AGNet.h
-@@ -52,8 +52,12 @@
-                 typedef int AGFd;
- #           endif /* if (!defined(__palmos__)) */
+@@ -54,6 +54,7 @@
  #       else /* defined(macintosh) */
-+#           if (!defined(__unix__))
-+#               define __unix__ 1
-+#           endif
  #           include <netdb.h>
  #           include <sys/types.h>
 +#           include <sys/param.h>
  #           include <sys/socket.h>
  #           include <unistd.h>
  #           include <netinet/in.h>
-@@ -61,7 +65,7 @@
+@@ -61,7 +62,7 @@
  #               include <sys/filio.h>
  #               include <arpa/inet.h>
  #           else
-- 
cgit v1.2.3