diff --git a/sysutils/gdisk/Makefile b/sysutils/gdisk/Makefile index a83681dc5c69..983387cb1d7b 100644 --- a/sysutils/gdisk/Makefile +++ b/sysutils/gdisk/Makefile @@ -1,48 +1,47 @@ PORTNAME= gdisk -PORTVERSION= 1.0.9 -PORTREVISION= 4 +PORTVERSION= 1.0.10 CATEGORIES= sysutils MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION} DISTNAME= gptfdisk-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= GPT fdisk -WWW= https://www.rodsbooks.com/fixparts/ +WWW= https://www.rodsbooks.com/gdisk/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 armv7 i386 powerpc powerpc64 powerpc64le LIB_DEPENDS= libpopt.so:devel/popt \ libuuid.so:misc/e2fsprogs-libuuid USES= localbase:ldflags ALL_TARGET= fixparts gdisk sgdisk MAKEFILE= Makefile.freebsd OPTIONS_DEFINE= CGDISK UTF16 OPTIONS_SUB= yes CGDISK_DESC= Curses-based interactive program UTF16_DESC= Support for Unicode partition names CGDISK_ALL_TARGET= cgdisk CGDISK_USES= ncurses UTF16_USES= compiler:c++11-lib UTF16_CPPFLAGS= -DUSE_UTF16 UTF16_CXXFLAGS= -std=gnu++11 UTF16_LDFLAGS= -licuio -licuuc UTF16_LIB_DEPENDS= libicuuc.so:devel/icu do-install: .for i in fixparts gdisk sgdisk ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/${i}.8 ${STAGEDIR}${PREFIX}/share/man/man8 .endfor do-install-CGDISK-on: ${INSTALL_PROGRAM} ${WRKSRC}/cgdisk ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/cgdisk.8 ${STAGEDIR}${PREFIX}/share/man/man8 .include diff --git a/sysutils/gdisk/distinfo b/sysutils/gdisk/distinfo index 08cac7a4de3a..a68c87528a71 100644 --- a/sysutils/gdisk/distinfo +++ b/sysutils/gdisk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650228694 -SHA256 (gptfdisk-1.0.9.tar.gz) = dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 -SIZE (gptfdisk-1.0.9.tar.gz) = 215065 +TIMESTAMP = 1709390420 +SHA256 (gptfdisk-1.0.10.tar.gz) = 2abed61bc6d2b9ec498973c0440b8b804b7a72d7144069b5a9209b2ad693a282 +SIZE (gptfdisk-1.0.10.tar.gz) = 220787 diff --git a/sysutils/gdisk/files/patch-gptcl.cc b/sysutils/gdisk/files/patch-gptcl.cc deleted file mode 100644 index 4b89d9c51625..000000000000 --- a/sysutils/gdisk/files/patch-gptcl.cc +++ /dev/null @@ -1,37 +0,0 @@ ---- gptcl.cc.orig 2022-04-14 23:17:12 UTC -+++ gptcl.cc -@@ -71,7 +71,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - uint64_t low, high, startSector, endSector, sSize, mainTableLBA; - uint64_t temp; // temporary variable; free to use in any case - char *device; -- string cmd, typeGUID, name; -+ string cmd, typeGUID, name, devstr; - PartType typeHelper; - - struct poptOption theOptions[] = -@@ -156,12 +156,14 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - - // Assume first non-option argument is the device filename.... - device = (char*) poptGetArg(poptCon); -+ if (device != NULL) -+ devstr = device; - poptResetContext(poptCon); - -- if (device != NULL) { -+ if (!devstr.empty()) { - JustLooking(); // reset as necessary - BeQuiet(); // Tell called functions to be less verbose & interactive -- if (LoadPartitions((string) device)) { -+ if (LoadPartitions(devstr)) { - if ((WhichWasUsed() == use_mbr) || (WhichWasUsed() == use_bsd)) - saveNonGPT = 0; // flag so we don't overwrite unless directed to do so - sSize = GetBlockSize(); -@@ -498,7 +500,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - cerr << "Error encountered; not saving changes.\n"; - retval = 4; - } // if -- } // if (device != NULL) -+ } // if (devstr empty) - poptFreeContext(poptCon); - return retval; - } // GPTDataCL::DoOptions() diff --git a/sysutils/gdisk/pkg-descr b/sysutils/gdisk/pkg-descr index df5c3da413bc..9ba6e272b471 100644 --- a/sysutils/gdisk/pkg-descr +++ b/sysutils/gdisk/pkg-descr @@ -1,14 +1,12 @@ GPT fdisk (aka gdisk) is intended as a (somewhat) fdisk-workalike program for GPT-partitioned disks. Specific advantages of gdisk, cgdisk and sgdisk include: - Edit GUID partition table (GPT) definitions in Linux, FreeBSD, MacOS X, or Windows - Convert MBR to GPT or back without data loss - Convert BSD disklabels to GPT without data loss - Create hybrid MBR, which permits GPT-unaware OSes to access up to three GPT partitions on the disk - Repair damaged GPT data structures - The ability to specify sector-exact partition sizes - Clear identification of the number of unallocated sectors on a disk - -See also: https://www.rodsbooks.com/gdisk/