Attachment 118553 Details for Bug 160812 – gdisk-0.8.0.patch

[patch] gdisk-0.8.0.patch

gdisk-0.8.0.patch (text/plain), 10.12 KB, created by Dmitry Fomin on 2011-09-18 22:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Fomin

Created: 2011-09-18 22:40:05 UTC

Size: 10.12 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/gdisk/Makefile gdisk/Makefile
>--- /usr/ports/sysutils/gdisk/Makefile	2011-04-06 21:16:28.000000000 +0000
>+++ gdisk/Makefile	2011-09-18 20:17:55.000000000 +0000
>@@ -6,11 +6,11 @@
> #
> 
> PORTNAME=	gdisk
>-PORTVERSION=	0.6.14
>+PORTVERSION=	0.8.0
> CATEGORIES=	sysutils
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	gptfdisk/gptfdisk/${PORTVERSION}
>-EXTRACT_SUFX=	.tgz
>+MASTER_SITES=	http://sourceforge.net/projects/%SUBDIR%/
>+MASTER_SITE_SUBDIR=	gptfdisk/files/gptfdisk/${PORTVERSION}
>+DISTNAME=	gptfdisk-${PORTVERSION}
> 
> MAINTAINER=	fdn@okbire.ru
> COMMENT=	GPT fdisk
>@@ -18,6 +18,8 @@
> LIB_DEPENDS=	uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
> 		popt.0:${PORTSDIR}/devel/popt
> 
>+WRKSRC=		${WRKDIR}/gptfdisk-${PORTVERSION}
>+
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>@@ -25,6 +27,9 @@
> 
> ONLY_FOR_ARCHS=	i386 amd64
> 
>+OPTIONS=	CGDISK "A curses-based interactive program" off \
>+		UTF16 "Support for Unicode partition names" off
>+
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 701100
>@@ -33,22 +38,39 @@
> 
> MAKEFILE=	Makefile.freebsd
> 
>-MAN8=		gdisk.8 sgdisk.8
>+PROGRAM_LIST=	fixparts gdisk sgdisk
>+
>+.if defined(WITH_CGDISK)
>+PROGRAM_LIST+=	cgdisk
>+LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
>+.endif
>+
>+MAN8=
>+.for i in ${PROGRAM_LIST}
>+MAN8+=	${i}.8
>+.endfor
>+
>+.if defined(WITH_UTF16)
>+LIB_DEPENDS+=	icuuc.48:${PORTSDIR}/devel/icu
>+.endif
> 
> post-patch:
> 	${REINPLACE_CMD} -e 's|/usr/include/||' ${WRKSRC}/guid.h
>-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.freebsd
>+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${MAKEFILE}
> 
>-do-install:
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>+.if !defined(WITH_CGDISK)
>+	${REINPLACE_CMD} -e '/^all:/s| cgdisk||' ${WRKSRC}/${MAKEFILE}
>+.endif
>+
>+.if !defined(WITH_UTF16)
>+	${REINPLACE_CMD} -e 's| -D USE_UTF16||' \
>+			 -e 's| -licuio||' ${WRKSRC}/${MAKEFILE}
> .endif
>-.for i in gdisk sgdisk
>+
>+do-install:
>+.for i in ${PROGRAM_LIST}
> 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/sbin
> 	${INSTALL_MAN} ${WRKSRC}/${i}.8 ${MANPREFIX}/man/man8
>-.if !defined(NOPORTDOCS)
>-	${INSTALL_MAN} ${WRKSRC}/${i}.html ${DOCSDIR}
>-.endif
> .endfor
> 
> post-install:
>diff -ruN /usr/ports/sysutils/gdisk/distinfo gdisk/distinfo
>--- /usr/ports/sysutils/gdisk/distinfo	2011-04-06 21:16:28.000000000 +0000
>+++ gdisk/distinfo	2011-09-18 12:32:17.000000000 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (gdisk-0.6.14.tgz) = 9e8ff1d5fe17b9f2d00e8c51ccaa5d8d55e7e74f5cd8d936b99ea9366dd7c93c
>-SIZE (gdisk-0.6.14.tgz) = 136062
>+SHA256 (gptfdisk-0.8.0.tar.gz) = 613c4b5e3d776a2bb723ee1d071ff9121d0f5a6df0f2f760a4536ecd30add824
>+SIZE (gptfdisk-0.8.0.tar.gz) = 154431 
>diff -ruN /usr/ports/sysutils/gdisk/files/patch-Makefile.freebsd gdisk/files/patch-Makefile.freebsd
>--- /usr/ports/sysutils/gdisk/files/patch-Makefile.freebsd	2010-11-28 09:58:54.000000000 +0000
>+++ gdisk/files/patch-Makefile.freebsd	2011-09-18 20:24:01.000000000 +0000
>@@ -1,10 +1,10 @@
>---- ./Makefile.freebsd.orig	2010-11-21 19:20:03.000000000 +0100
>-+++ ./Makefile.freebsd	2010-11-21 19:20:31.000000000 +0100
>+--- Makefile.freebsd	2011-09-11 00:51:13.000000000 +0000
>++++ Makefile.freebsd	2011-09-18 20:22:41.000000000 +0000
> @@ -1,5 +1,5 @@
> -CC=gcc
> -CXX=g++
> +CC?=gcc
> +CXX?=g++
> CFLAGS+=-D_FILE_OFFSET_BITS=64
>- CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I/usr/local/include
>- LDFLAGS+=
>+ CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 -I/usr/local/include
>+ #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include 
>diff -ruN /usr/ports/sysutils/gdisk/files/patch-cgdisk.8 gdisk/files/patch-cgdisk.8
>--- /usr/ports/sysutils/gdisk/files/patch-cgdisk.8	1970-01-01 00:00:00.000000000 +0000
>+++ gdisk/files/patch-cgdisk.8	2011-09-18 15:44:48.000000000 +0000
>@@ -0,0 +1,25 @@
>+--- cgdisk.8	2011-09-11 00:51:13.000000000 +0000
>++++ cgdisk.8	2011-09-18 15:43:22.000000000 +0000
>+@@ -365,14 +365,14 @@
>+ 
>+ 
>+ .SH "SEE ALSO"
>+-\fBcfdisk (8)\fR,
>+-\fBfdisk (8)\fR,
>+-\fBgdisk (8)\fR,
>+-\fBmkfs (8)\fR,
>+-\fBparted (8)\fR,
>+-\fBsfdisk (8)\fR
>+-\fBsgdisk (8)\fR
>+-\fBfixparts (8)\fR
>++\fBbsdlabel(8)\fR,
>++\fBfdisk(8)\fR,
>++\fBfixparts(8)\fR,
>++\fBgdisk(8)\fR,
>++\fBgpart(8)\fR,
>++\fBgpt(8)\fR,
>++\fBnewfs(8)\fR,
>++\fBsgdisk(8)\fR
>+ 
>+ \fIhttp://en.wikipedia.org/wiki/GUID_Partition_Table\fR
>+ 
>diff -ruN /usr/ports/sysutils/gdisk/files/patch-fixparts.8 gdisk/files/patch-fixparts.8
>--- /usr/ports/sysutils/gdisk/files/patch-fixparts.8	1970-01-01 00:00:00.000000000 +0000
>+++ gdisk/files/patch-fixparts.8	2011-09-18 15:35:08.000000000 +0000
>@@ -0,0 +1,25 @@
>+--- fixparts.8	2011-09-11 00:51:13.000000000 +0000
>++++ fixparts.8	2011-09-18 15:23:35.000000000 +0000
>+@@ -265,14 +265,14 @@
>+ 
>+ 
>+ .SH "SEE ALSO"
>+-\fBcfdisk (8)\fR,
>+-\fBcgdisk (8)\fR,
>+-\fBfdisk (8)\fR,
>+-\fBmkfs (8)\fR,
>+-\fBparted (8)\fR,
>+-\fBsfdisk (8)\fR
>+-\fBgdisk (8)\fR
>+-\fBsgdisk (8)\fR
>++\fBbsdlabel(8)\fR,
>++\fBcgdisk(8)\fR,
>++\fBfdisk(8)\fR,
>++\fBgdisk(8)\fR,
>++\fBgpart(8)\fR,
>++\fBgpt(8)\fR,
>++\fBnewfs(8)\fR,
>++\fBsgdisk(8)\fR
>+ 
>+ \fIhttp://en.wikipedia.org/wiki/Master_boot_record\fR
>+ 
>diff -ruN /usr/ports/sysutils/gdisk/files/patch-gdisk.8 gdisk/files/patch-gdisk.8
>--- /usr/ports/sysutils/gdisk/files/patch-gdisk.8	2010-08-22 16:54:24.000000000 +0000
>+++ gdisk/files/patch-gdisk.8	2011-09-18 15:34:32.000000000 +0000
>@@ -1,21 +1,25 @@
>---- gdisk.8	2010-07-04 05:25:20.000000000 +0000
>-+++ gdisk.8	2010-07-13 20:20:44.000000000 +0000
>-@@ -652,12 +652,12 @@
>+--- gdisk.8	2011-09-11 00:51:13.000000000 +0000
>++++ gdisk.8	2011-09-18 15:33:20.000000000 +0000
>+@@ -666,14 +666,14 @@
> 
> 
> .SH "SEE ALSO"
> -\fBcfdisk (8)\fR,
>+-\fBcgdisk (8)\fR,
> -\fBfdisk (8)\fR,
> -\fBmkfs (8)\fR,
> -\fBparted (8)\fR,
> -\fBsfdisk (8)\fR
> -\fBsgdisk (8)\fR
>+-\fBfixparts (8)\fR
> +\fBbsdlabel(8)\fR,
>-+\fBfdisk(8)\fR,
>++\fBcgdisk(8)\fR,
>++\fBfdisk(8)\fR, 
>++\fBfixparts(8)\fR,
> +\fBgpart(8)\fR,
> +\fBgpt(8)\fR,
>-+\fBnewfs(8)\fR,
>-+\fBsgdisk(8)\fR
>++\fBnewfs(8)\fR, 
>++\fBsgdisk(8)\fR 
> 
> \fIhttp://en.wikipedia.org/wiki/GUID_Partition_Table\fR
> 
>diff -ruN /usr/ports/sysutils/gdisk/files/patch-gdisk.html gdisk/files/patch-gdisk.html
>--- /usr/ports/sysutils/gdisk/files/patch-gdisk.html	2010-10-24 20:15:09.000000000 +0000
>+++ gdisk/files/patch-gdisk.html	1970-01-01 00:00:00.000000000 +0000
>@@ -1,21 +0,0 @@
>---- gdisk.html	2010-09-25 23:48:12.000000000 +0000
>-+++ gdisk.html	2010-10-02 23:02:08.000000000 +0000
>-@@ -775,12 +775,12 @@
>- <A NAME="lbAH">&nbsp;</A>
>- <H2>SEE ALSO</H2>
>- 
>--cfdisk (8),
>--fdisk (8),
>--mkfs (8),
>--parted (8),
>--sfdisk (8)
>--sgdisk (8)
>-+bsdlabel(8),
>-+fdisk(8),
>-+gpart(8),
>-+gpt(8),
>-+newfs(8),
>-+sgdisk(8)
>- 
>- <A HREF="http://en.wikipedia.org/wiki/GUID_Partition_Table">http://en.wikipedia.org/wiki/GUID_Partition_Table</A>
>- 
>diff -ruN /usr/ports/sysutils/gdisk/files/patch-sgdisk.8 gdisk/files/patch-sgdisk.8
>--- /usr/ports/sysutils/gdisk/files/patch-sgdisk.8	2010-08-22 16:54:24.000000000 +0000
>+++ gdisk/files/patch-sgdisk.8	2011-09-18 15:38:51.000000000 +0000
>@@ -1,17 +1,21 @@
>---- sgdisk.8	2010-07-04 05:25:20.000000000 +0000
>-+++ sgdisk.8	2010-07-13 20:21:03.000000000 +0000
>-@@ -535,12 +535,12 @@
>- * Justin Maggard (justin.maggard@netgear.com)
>+--- sgdisk.8	2011-09-11 00:51:13.000000000 +0000
>++++ sgdisk.8	2011-09-18 15:37:53.000000000 +0000
>+@@ -578,14 +578,14 @@
>+ 
> 
> .SH "SEE ALSO"
> -\fBcfdisk (8)\fR,
>+-\fBcgdisk (8)\fR,
> -\fBfdisk (8)\fR,
> -\fBgdisk (8)\fR,
> -\fBmkfs (8)\fR,
> -\fBparted (8)\fR,
> -\fBsfdisk (8)\fR
>+-\fBfixparts (8)\fR
> +\fBbsdlabel(8)\fR,
>++\fBcgdisk(8)\fR,
> +\fBfdisk(8)\fR,
>++\fBfixparts(8)\fR,
> +\fBgdisk(8)\fR,
> +\fBgpart(8)\fR,
> +\fBgpt(8)\fR,
>diff -ruN /usr/ports/sysutils/gdisk/files/patch-sgdisk.html gdisk/files/patch-sgdisk.html
>--- /usr/ports/sysutils/gdisk/files/patch-sgdisk.html	2010-08-22 16:54:24.000000000 +0000
>+++ gdisk/files/patch-sgdisk.html	1970-01-01 00:00:00.000000000 +0000
>@@ -1,21 +0,0 @@
>---- sgdisk.html	2010-07-04 05:25:20.000000000 +0000
>-+++ sgdisk.html	2010-07-14 00:42:23.000000000 +0000
>-@@ -620,12 +620,12 @@
>- <A NAME="lbAI">&nbsp;</A>
>- <H2>SEE ALSO</H2>
>- 
>--cfdisk (8),
>--fdisk (8),
>--gdisk (8),
>--mkfs (8),
>--parted (8),
>--sfdisk (8)
>-+bsdlabel(8),
>-+fdisk(8),
>-+gdisk(8),
>-+gpart(8),
>-+gpt(8),
>-+newfs(8)
>- 
>- <A HREF="http://en.wikipedia.org/wiki/GUID_Partition_Table">http://en.wikipedia.org/wiki/GUID_Partition_Table</A>
>- 
>diff -ruN /usr/ports/sysutils/gdisk/pkg-descr gdisk/pkg-descr
>--- /usr/ports/sysutils/gdisk/pkg-descr	2010-08-22 16:54:24.000000000 +0000
>+++ gdisk/pkg-descr	2011-09-18 19:49:57.000000000 +0000
>@@ -1,7 +1,8 @@
> GPT fdisk (aka gdisk) by Roderick W. Smith, rodsmith@rodsbooks.com
> 
> This software is intended as a (somewhat) fdisk-workalike program for
>-GPT-partitioned disks. Specific advantages of gdisk and sgdisk include:
>+GPT-partitioned disks. Specific advantages of gdisk, cgdisk and
>+sgdisk include:
> 
> * Edit GUID partition table (GPT) definitions in Linux, FreeBSD, MacOS X,
> or Windows
>@@ -14,3 +15,4 @@
> * Clear identification of the number of unallocated sectors on a disk
> 
> WWW: http://www.rodsbooks.com/gdisk/
>+ http://www.rodsbooks.com/fixparts/
>diff -ruN /usr/ports/sysutils/gdisk/pkg-message gdisk/pkg-message
>--- /usr/ports/sysutils/gdisk/pkg-message	2010-08-22 16:54:24.000000000 +0000
>+++ gdisk/pkg-message	2011-09-18 20:15:23.000000000 +0000
>@@ -3,11 +3,10 @@
> 
> PLEASE, READ DOCUMENTATION BEFORE USE
> 
>-See `man gdisk' , `man sgdisk' , `${DOCSDIR}/gdisk.html' ,
>-`${DOCSDIR}/sgdisk.html'.
>+See `man gdisk' , `man cgdisk', `man sgdisk', `man fixparts'.
> 
>-Any errors in usage gdisk (sgdisk) or not understanding
>-of that you do, can call loss of your data.
>+Any errors in usage gdisk (cgdisk, sgdisk, fixparts) or
>+not understanding of that you do, can call loss of your data.
> Make a backup copy of all data of a disk before you use
> these programs for its processing.
> 
>diff -ruN /usr/ports/sysutils/gdisk/pkg-plist gdisk/pkg-plist
>--- /usr/ports/sysutils/gdisk/pkg-plist	2010-08-22 16:54:24.000000000 +0000
>+++ gdisk/pkg-plist	2011-09-18 12:28:57.000000000 +0000
>@@ -1,5 +1,4 @@
>+sbin/cgdisk
>+sbin/fixparts
> sbin/gdisk
> sbin/sgdisk
>-%%PORTDOCS%%%%DOCSDIR%%/gdisk.html
>-%%PORTDOCS%%%%DOCSDIR%%/sgdisk.html
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 160812: 118553