Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/gdisk/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	24 Oct 2010 20:15:09 -0000	1.2
+++ Makefile	21 Nov 2010 18:31:13 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdisk
-PORTVERSION=	0.6.11
+PORTVERSION=	0.6.13
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gptfdisk/gptfdisk/${PORTVERSION}
@@ -23,7 +23,7 @@
 
 FETCH_ARGS=	-Rr
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 .include <bsd.port.pre.mk>
 
@@ -35,6 +35,9 @@
 
 MAN8=		gdisk.8 sgdisk.8
 
+post-patch:
+	${REINPLACE_CMD} -e 's|/usr/include/||' ${WRKSRC}/guid.h
+
 do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/gdisk/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	24 Oct 2010 20:15:09 -0000	1.2
+++ distinfo	21 Nov 2010 18:31:13 -0000
@@ -1,3 +1,2 @@
-MD5 (gdisk-0.6.11.tgz) = 4572755a47977a0d1f385f6ee1b00643 
-SHA256 (gdisk-0.6.11.tgz) = 8d4990ef04f166f42e279e23b445f561206fd2fcc000962095e3dfd41cccc0d2
-SIZE (gdisk-0.6.11.tgz) = 133535 
+SHA256 (gdisk-0.6.13.tgz) = 47bb07d92ab13d652eacd6c8118fdf05d05168afae6691824099e4db8217f4a6
+SIZE (gdisk-0.6.13.tgz) = 135082
Index: files/patch-Makefile.freebsd
===================================================================
RCS file: files/patch-Makefile.freebsd
diff -N files/patch-Makefile.freebsd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.freebsd	21 Nov 2010 18:31:13 -0000
@@ -0,0 +1,10 @@
+--- ./Makefile.freebsd.orig	2010-11-21 19:20:03.000000000 +0100
++++ ./Makefile.freebsd	2010-11-21 19:20:31.000000000 +0100
+@@ -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+=