summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-03-02 00:04:26 +0000
committerjlam <jlam@pkgsrc.org>2001-03-02 00:04:26 +0000
commit2fae512c13d26f632cdaafe82fde570c12262d34 (patch)
treedb52c26e6ed54b124f066a971135062d82d8f77d
parent40550e2c792b105a4fd8014216eaf8a5f7e12f1a (diff)
downloadpkgsrc-2fae512c13d26f632cdaafe82fde570c12262d34.tar.gz
Include malsync_2.0.5.src.tar.gz in DISTFILES and refer to the local
source extraction instead of reaching across the pkgsrc tree to comms/malsync. Add a source patch from comms/malsync. Fixes 2nd half of pkg/12308.
-rw-r--r--comms/jpilot-syncmal/Makefile13
-rw-r--r--comms/jpilot-syncmal/files/md53
-rw-r--r--comms/jpilot-syncmal/files/patch-sum3
-rw-r--r--comms/jpilot-syncmal/patches/patch-aa21
4 files changed, 30 insertions, 10 deletions
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index ce4a538cfc7..bf770f8307f 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2001/03/01 20:57:59 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/02 00:04:26 jlam Exp $
DISTNAME= jpilot-syncmal_0.60
PKGNAME= jpilot-syncmal-0.60
CATEGORIES= comms
MASTER_SITES= http://people.atl.mediaone.net/jasonday/code/syncmal/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+= malsync_2.0.5.src${EXTRACT_SUFX}
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://people.atl.mediaone.net/jasonday/code/syncmal/syncmal.html
COMMENT= MAL synchronization plugin for J-Pilot
-BUILD_DEPENDS+= ${MALSRC}/client/unix/MAL31UserConfig.c:${MALDIR}:patch
DEPENDS+= jpilot>=0.99:../../comms/jpilot
-MALDIR= ${PKGSRCDIR}/comms/malsync
-MALSRC= ${MALDIR}/${WRKDIR:T}/malsync
-
GNU_CONFIGURE= # defined
USE_X11= # defined
USE_GMAKE= # defined
@@ -28,14 +26,11 @@ EVAL_PREFIX+= GTKDIR=gtk+
EVAL_PREFIX+= JPILOTDIR=jpilot
EVAL_PREFIX+= PILOTLINKDIR=pilot-link
CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}"
-CONFIGURE_ARGS+= --with-mal-source="${MALSRC}"
+CONFIGURE_ARGS+= --with-mal-source="${WRKSRC}/../malsync"
CONFIGURE_ARGS+= --with-plugin-prefix="${JPILOTDIR}/include/jpilot"
CONFIGURE_ARGS+= --with-pilot-prefix="${PILOTLINKDIR}"
do-install:
${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR}
-pre-clean:
- @cd ${MALDIR} && ${MAKE} clean
-
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot-syncmal/files/md5 b/comms/jpilot-syncmal/files/md5
index 62c38c7f3cd..7d29bea59ee 100644
--- a/comms/jpilot-syncmal/files/md5
+++ b/comms/jpilot-syncmal/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 2001/03/01 20:40:06 jlam Exp $
+$NetBSD: md5,v 1.2 2001/03/02 00:04:27 jlam Exp $
MD5 (jpilot-syncmal_0.60.tar.gz) = 93f550ec5835b17d6eb49063e5e6ff6f
+MD5 (malsync_2.0.5.src.tar.gz) = d6b0aef7b177ca58aee9344377c9aa35
diff --git a/comms/jpilot-syncmal/files/patch-sum b/comms/jpilot-syncmal/files/patch-sum
new file mode 100644
index 00000000000..332baceae6d
--- /dev/null
+++ b/comms/jpilot-syncmal/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 2001/03/02 00:04:27 jlam Exp $
+
+MD5 (patch-aa) = 18a9228e7e5be79ca1511d6fa670cf70
diff --git a/comms/jpilot-syncmal/patches/patch-aa b/comms/jpilot-syncmal/patches/patch-aa
new file mode 100644
index 00000000000..29b1505e71e
--- /dev/null
+++ b/comms/jpilot-syncmal/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2001/03/02 00:04:27 jlam Exp $
+
+--- ../malsync/mal/common/AGNet.h.orig Sun May 14 23:17:36 2000
++++ ../malsync/mal/common/AGNet.h Thu Jun 15 14:20:07 2000
+@@ -54,6 +54,7 @@
+ # else /* defined(macintosh) */
+ # include <netdb.h>
+ # include <sys/types.h>
++# include <sys/param.h>
+ # include <sys/socket.h>
+ # include <unistd.h>
+ # include <netinet/in.h>
+@@ -61,7 +62,7 @@
+ # include <sys/filio.h>
+ # include <arpa/inet.h>
+ # else
+-# ifdef __FreeBSD__
++# if (defined(BSD) && BSD >= 199306)
+ # include <sys/ioctl.h>
+ # include <arpa/inet.h>
+ # else