diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-10-07 14:34:50 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-10-07 14:34:50 +0000 |
| commit | 2530ea84c58780defb9eadbf3b8aec3bc3cf98de (patch) | |
| tree | 6e9003a7f5db2c5a5466f70efb71fb910c941cfc /sysutils | |
| parent | Update to latest version of gcc 3.3.1. Enable Java. (diff) | |
- fix md5 checksum (There are no changes in files. Only man directory modification date/time changes.)
- fix run on current (couldn't calculate disk geometry)
- remove dead URLs from MASTER_SITES
- change obsoleted disk name wd -> ad in manpage example
PR: 57555
Submitted By: Sergey Matveychuk <sem@ciam.ru>
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gpart/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gpart/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/gpart/files/patch-ac | 51 | ||||
| -rw-r--r-- | sysutils/gpart/files/patch-ad | 11 |
4 files changed, 64 insertions, 4 deletions
diff --git a/sysutils/gpart/Makefile b/sysutils/gpart/Makefile index f9b530de7ac7..7ab8c069b5e3 100644 --- a/sysutils/gpart/Makefile +++ b/sysutils/gpart/Makefile @@ -8,9 +8,7 @@ PORTNAME= gpart PORTVERSION= 0.1h CATEGORIES= sysutils -MASTER_SITES= http://home.pages.de/~michab/gpart/ \ - http://www.stud.uni-hannover.de/user/76201/gpart/ \ - ${MASTER_SITE_SUNSITE} +MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= system/filesystems MAINTAINER= andrew@ugh.net.au diff --git a/sysutils/gpart/distinfo b/sysutils/gpart/distinfo index edd1f978f712..ed7de4f739a5 100644 --- a/sysutils/gpart/distinfo +++ b/sysutils/gpart/distinfo @@ -1 +1 @@ -MD5 (gpart-0.1h.tar.gz) = ee3a2d2dde70bcf404eb354b3d1ee6d4 +MD5 (gpart-0.1h.tar.gz) = 23a7620394033e478d0d03c392c405bd diff --git a/sysutils/gpart/files/patch-ac b/sysutils/gpart/files/patch-ac new file mode 100644 index 000000000000..a9e542ecfdd7 --- /dev/null +++ b/sysutils/gpart/files/patch-ac @@ -0,0 +1,51 @@ +--- src/disku.c.orig Sat Oct 4 04:33:32 2003 ++++ src/disku.c Sat Oct 4 04:33:38 2003 +@@ -28,7 +28,11 @@ + + #if defined(__FreeBSD__) + #include <errno.h> ++#include <sys/param.h> + #include <sys/disklabel.h> ++#if __FreeBSD_version >= 500040 ++#include <sys/disk.h> ++#endif + #endif + + +@@ -61,12 +65,36 @@ + #endif + + #if defined(__FreeBSD__) ++#if __FreeBSD_version < 500040 + struct disklabel dl; + if (ioctl(d->d_fd,DIOCGDINFO,&dl) == -1) + pr(FATAL,EM_IOCTLFAILED,"DIOCGDINFO",strerror(errno)); + g.d_c = dl.d_ncylinders; + g.d_h = dl.d_ntracks; + g.d_s = dl.d_nsectors; ++#else ++ struct disklabel loclab; ++ u_int u; ++ ++ if (ioctl(d->d_fd, DIOCGFWSECTORS, &u) == 0) ++ loclab.d_nsectors = u; ++ else ++ loclab.d_nsectors = 63; ++ if (ioctl(d->d_fd, DIOCGFWHEADS, &u) == 0) ++ loclab.d_ntracks = u; ++ else if (loclab.d_secperunit <= 63*1*1024) ++ loclab.d_ntracks = 1; ++ else if (loclab.d_secperunit <= 63*16*1024) ++ loclab.d_ntracks = 16; ++ else ++ loclab.d_ntracks = 255; ++ loclab.d_secpercyl = loclab.d_ntracks * loclab.d_nsectors; ++ loclab.d_ncylinders = loclab.d_secperunit / loclab.d_secpercyl; ++ ++ g.d_c = loclab.d_ncylinders; ++ g.d_h = loclab.d_ntracks; ++ g.d_s = loclab.d_nsectors; ++#endif + #endif + + return (&g); diff --git a/sysutils/gpart/files/patch-ad b/sysutils/gpart/files/patch-ad new file mode 100644 index 000000000000..3c7561d21846 --- /dev/null +++ b/sysutils/gpart/files/patch-ad @@ -0,0 +1,11 @@ +--- man/gpart.man.orig Sat Oct 4 04:34:37 2003 ++++ man/gpart.man Sat Oct 4 04:34:43 2003 +@@ -378,7 +378,7 @@ + drive without starting the scan loop in FreeBSD type + + .RS +-gpart -vvd /dev/wd2 ++gpart -vvd /dev/ad2 + .RE + .RE + |