diff options
| author | hasso <hasso> | 2008-12-26 20:23:45 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2008-12-26 20:23:45 +0000 |
| commit | 2e7e6e8361b82238de4cc02824fc0e80ec82ed20 (patch) | |
| tree | 2f87545e03ebfdf2f1407b3fd57fb449439fe4c9 /sysutils | |
| parent | 430c62cd57e4a7737ca40387ff855a3da767d66b (diff) | |
| download | pkgsrc-2e7e6e8361b82238de4cc02824fc0e80ec82ed20.tar.gz | |
Make it work on DragonFly.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gpart/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/gpart/patches/patch-aa | 27 | ||||
| -rw-r--r-- | sysutils/gpart/patches/patch-ab | 10 |
3 files changed, 30 insertions, 13 deletions
diff --git a/sysutils/gpart/distinfo b/sysutils/gpart/distinfo index 6aaaf75764b..ea13400a897 100644 --- a/sysutils/gpart/distinfo +++ b/sysutils/gpart/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2006/03/24 12:35:18 joerg Exp $ +$NetBSD: distinfo,v 1.6 2008/12/26 20:23:45 hasso Exp $ SHA1 (gpart-0.1h.tar.gz) = 23f66162e1d85977ea43bfe6b5e5bff0ad2d566e RMD160 (gpart-0.1h.tar.gz) = 1cdfb1779801ee8755b05975ced24441a3a2b639 Size (gpart-0.1h.tar.gz) = 52352 bytes -SHA1 (patch-aa) = 3bf1e9090e1b95acb474adca77325e65505e71b3 -SHA1 (patch-ab) = f02ecad5e82849b66b1fdfcd8599ac4aa93608a7 +SHA1 (patch-aa) = f971cc7ae0efbacd64e8f5e6bf9c2496f75320a3 +SHA1 (patch-ab) = 43fda85fe6b11c00b256682c7184578a985b9397 SHA1 (patch-ac) = 15a57dd0e9b57c7a64869b43df37a5b2493e77d2 SHA1 (patch-ad) = e53ca24886c072d514802e7dca7a79da2e1916d0 SHA1 (patch-ae) = e9126b145ec8995645d79cd5d569da6e882b3c89 diff --git a/sysutils/gpart/patches/patch-aa b/sysutils/gpart/patches/patch-aa index 2e5c856a06d..1ac6c5f89e1 100644 --- a/sysutils/gpart/patches/patch-aa +++ b/sysutils/gpart/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2006/03/24 12:35:19 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2008/12/26 20:23:45 hasso Exp $ ---- src/disku.c Sun May 14 14:04:23 2000 -+++ src/disku.c Sun Jul 16 10:58:08 2000 -@@ -25,7 +25,7 @@ +--- src/disku.c.orig 2001-02-07 21:04:07 +0200 ++++ src/disku.c 2008-12-25 21:25:33 +0200 +@@ -26,12 +26,14 @@ #include <linux/hdreg.h> #endif @@ -11,12 +11,29 @@ $NetBSD: patch-aa,v 1.2 2006/03/24 12:35:19 joerg Exp $ #include <errno.h> #include <sys/disklabel.h> #endif -@@ -52,7 +52,7 @@ + +- ++#ifdef __DragonFly__ ++#include <sys/disklabel32.h> ++#endif + + /* + * get disk geometry. The medium is opened for reading, +@@ -60,10 +62,16 @@ struct disk_geom *disk_geometry(disk_des #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) ++#ifdef __DragonFly__ ++ struct disklabel32 dl; ++ if (ioctl(d->d_fd,DIOCGDINFO32,&dl) == -1) ++ pr(FATAL,EM_IOCTLFAILED,"DIOCGDINFO32",strerror(errno)); ++#else struct disklabel dl; if (ioctl(d->d_fd,DIOCGDINFO,&dl) == -1) pr(FATAL,EM_IOCTLFAILED,"DIOCGDINFO",strerror(errno)); ++#endif + g.d_c = dl.d_ncylinders; + g.d_h = dl.d_ntracks; + g.d_s = dl.d_nsectors; diff --git a/sysutils/gpart/patches/patch-ab b/sysutils/gpart/patches/patch-ab index bcbf4eca497..7a990e2e8f4 100644 --- a/sysutils/gpart/patches/patch-ab +++ b/sysutils/gpart/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.3 2006/03/24 12:35:19 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2008/12/26 20:23:45 hasso Exp $ ---- src/gpart.c.orig 2004-01-31 23:50:30.000000000 +0100 -+++ src/gpart.c 2004-01-31 23:51:53.000000000 +0100 -@@ -300,9 +300,10 @@ +--- src/gpart.c.orig 2001-02-07 20:08:08 +0200 ++++ src/gpart.c 2008-12-25 21:31:22 +0200 +@@ -300,9 +300,10 @@ static char *get_part_type(int type) { 0x8E, "Linux LVM physical volume" }, { 0x93, "Amoeba filesystem" }, { 0x94, "Amoeba bad block table" }, - { 0xA5, "FreeBSD/NetBSD/386BSD" }, -+ { 0xA5, "FreeBSD/DragonFl/386BSD or old NetBSD" }, ++ { 0xA5, "FreeBSD/DragonFly/386BSD or old NetBSD" }, { 0xA6, "OpenBSD" }, { 0xA7, "NEXTSTEP" }, + { 0xA9, "NetBSD" }, |