diff options
| author | wennmach <wennmach@pkgsrc.org> | 2002-10-07 19:01:24 +0000 |
|---|---|---|
| committer | wennmach <wennmach@pkgsrc.org> | 2002-10-07 19:01:24 +0000 |
| commit | 6a3451efcc115b9aa321010b14ee2696a2917557 (patch) | |
| tree | 05a343b5d2adc0cb457dd6469e091a5e22791845 /net/arla | |
| parent | 6686dfaba57b5443622fff07223c76b316eeef03 (diff) | |
| download | pkgsrc-6a3451efcc115b9aa321010b14ee2696a2917557.tar.gz | |
Make arla compile on -current. Patch from Love <lha@netbsd.org>.
Bump nb version to 2.
Diffstat (limited to 'net/arla')
| -rw-r--r-- | net/arla/Makefile | 4 | ||||
| -rw-r--r-- | net/arla/distinfo | 4 | ||||
| -rw-r--r-- | net/arla/patches/patch-ak | 36 |
3 files changed, 32 insertions, 12 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile index 41b55b479aa..ef4f66a8de1 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2002/09/25 00:06:34 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2002/10/07 19:01:24 wennmach Exp $ DISTNAME= arla-0.35.9 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net security MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/ diff --git a/net/arla/distinfo b/net/arla/distinfo index ec5c358dc81..c559f50be47 100644 --- a/net/arla/distinfo +++ b/net/arla/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/09/25 00:06:34 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/10/07 19:01:24 wennmach Exp $ SHA1 (arla-0.35.9.tar.gz) = e61f73dced5ec2951d7f0641bfdd6e1acb2cacaa Size (arla-0.35.9.tar.gz) = 1341786 bytes @@ -7,7 +7,7 @@ SHA1 (patch-ad) = c5c33c0daf8174b2f8f76119f97725cd61015bb6 SHA1 (patch-ae) = f9255bc814f38cb8309380a44c1942d3d2cb233e SHA1 (patch-af) = 90b230d2f462a01528c157352e257e3c3e58c7b5 SHA1 (patch-ah) = 8386d4062aedbfe24c66cad84cfdcf3a2617848e -SHA1 (patch-ak) = 2ff053009ac94ea23b24494462e79e7507c0c1cb +SHA1 (patch-ak) = f48e7885a87cb4eda21ff11e933165806a598302 SHA1 (patch-as) = 28d61906be25fc803882d4ccbe584f57e51dec63 SHA1 (patch-at) = 190da9b9d9da90166845383856508187d9d1ca8f SHA1 (patch-bd) = b57dceb3e40b82c199c599152b5273cd2555dbe8 diff --git a/net/arla/patches/patch-ak b/net/arla/patches/patch-ak index ef517f7cb6c..85f4e22725e 100644 --- a/net/arla/patches/patch-ak +++ b/net/arla/patches/patch-ak @@ -1,11 +1,13 @@ -$NetBSD: patch-ak,v 1.3 2001/08/09 13:49:00 wennmach Exp $ +$NetBSD: patch-ak,v 1.4 2002/10/07 19:01:25 wennmach Exp $ + +Make arla work on -current (post NetBSD 1.6). Do not print a cryptic message after xfs_mod has been modloaded, say it in clear text. ---- xfs/bsd/xfs_wrap-bsd.c.orig Tue May 9 05:17:00 2000 -+++ xfs/bsd/xfs_wrap-bsd.c Mon Nov 6 16:08:55 2000 -@@ -36,6 +36,8 @@ +--- xfs/bsd/xfs_wrap-bsd.c.~1.33.~ Mon Sep 30 21:58:30 2002 ++++ xfs/bsd/xfs_wrap-bsd.c Mon Sep 30 22:22:24 2002 +@@ -31,6 +31,8 @@ * SUCH DAMAGE. */ @@ -14,13 +16,31 @@ in clear text. #include <xfs/xfs_locl.h> #include <xfs/xfs_message.h> #include <xfs/xfs_fs.h> -@@ -308,8 +310,7 @@ +@@ -205,7 +207,9 @@ + #elif defined(__FreeBSD__) + MOD_DEV(xfs,LM_DT_CHAR,-1,&xfs_dev); + #else +-#if !defined(__APPLE__) ++#if __NetBSD_Version__ >= 106080000 ++MOD_DEV("xfs_mod","xfs_mod", NULL, -1, &xfs_dev, -1) ++#elif !defined(__APPLE__) + MOD_DEV("xfs_mod",LM_DT_CHAR,-1,&xfs_dev) + #endif + #endif +@@ -302,8 +306,14 @@ + } ret = lkmdispatch(lkmtp, cmd); if(cmd == LKM_E_LOAD) { ++#if __NetBSD_Version__ >= 106080000 ++ xfs_dev_major = _module.lkm_cdevmaj; ++#else xfs_dev_major = _module.lkm_offset; - printf ("xfs: cdev: %d, syscall: %d\n", -- xfs_dev_major, xfs_syscall_num); -+ printf("xfs (%s): using cdev %d, syscall %d\n", arla_version, xfs_dev_major, xfs_syscall_num); ++#endif ++ printf ("xfs (%s): " ++ "using cdev: %d, syscall: %d\n", ++ arla_version, + xfs_dev_major, xfs_syscall_num); } return ret; - } + |