Index: head/sysutils/container-diff/Makefile
===================================================================
--- head/sysutils/container-diff/Makefile	(revision 458954)
+++ head/sysutils/container-diff/Makefile	(revision 458955)
@@ -1,33 +1,26 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	container-diff
 PORTVERSION=	0.6.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Diff your Docker containers
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 USES=		go
 
 PLIST_FILES=	bin/container-diff
 
 GH_ACCOUNT=	GoogleCloudPlatform
 USE_GITHUB=	yes
 
-.include <bsd.port.options.mk>
-
-# Change inode size from 64 bits to 32 bits for systems without ino64 support
-.if ${OSVERSION} < 1200031
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-without-ino64
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/container-diff ${STAGEDIR}${PREFIX}/bin/container-diff
 
 .include <bsd.port.mk>
Index: head/sysutils/container-diff/files/extra-patch-without-ino64
===================================================================
--- head/sysutils/container-diff/files/extra-patch-without-ino64	(revision 458954)
+++ head/sysutils/container-diff/files/extra-patch-without-ino64	(nonexistent)
@@ -1,53 +0,0 @@
---- vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig	2017-12-27 17:49:24 UTC
-+++ vendor/github.com/docker/docker/pkg/archive/archive_unix.go
-@@ -58,7 +58,7 @@ func setHeaderForSpecialDevice(hdr *tar.
- 	return
- }
- 
--func getInodeFromStat(stat interface{}) (inode uint64, err error) {
-+func getInodeFromStat(stat interface{}) (inode uint32, err error) {
- 	s, ok := stat.(*syscall.Stat_t)
- 
- 	if ok {
---- vendor/github.com/docker/docker/pkg/archive/archive.go.orig	2017-12-27 17:49:24 UTC
-+++ vendor/github.com/docker/docker/pkg/archive/archive.go
-@@ -378,7 +378,7 @@ type tarAppender struct {
- 	Buffer    *bufio.Writer
- 
- 	// for hardlink mapping
--	SeenFiles  map[uint64]string
-+	SeenFiles  map[uint32]string
- 	IDMappings *idtools.IDMappings
- 	ChownOpts  *idtools.IDPair
- 
-@@ -391,7 +391,7 @@ type tarAppender struct {
- 
- func newTarAppender(idMapping *idtools.IDMappings, writer io.Writer, chownOpts *idtools.IDPair) *tarAppender {
- 	return &tarAppender{
--		SeenFiles:  make(map[uint64]string),
-+		SeenFiles:  make(map[uint32]string),
- 		TarWriter:  tar.NewWriter(writer),
- 		Buffer:     pools.BufioWriter32KPool.Get(nil),
- 		IDMappings: idMapping,
---- vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig	2017-12-27 17:49:24 UTC
-+++ vendor/github.com/docker/docker/pkg/archive/changes_unix.go
-@@ -28,7 +28,7 @@ func (info *FileInfo) isDir() bool {
- 	return info.parent == nil || info.stat.Mode()&unix.S_IFDIR != 0
- }
- 
--func getIno(fi os.FileInfo) uint64 {
-+func getIno(fi os.FileInfo) uint32 {
- 	return fi.Sys().(*syscall.Stat_t).Ino
- }
- 
---- vendor/github.com/docker/docker/pkg/archive/changes.go.orig	2017-12-27 17:49:24 UTC
-+++ vendor/github.com/docker/docker/pkg/archive/changes.go
-@@ -363,7 +363,7 @@ func ChangesDirs(newDir, oldDir string) 
- func ChangesSize(newDir string, changes []Change) int64 {
- 	var (
- 		size int64
--		sf   = make(map[uint64]struct{})
-+		sf   = make(map[uint32]struct{})
- 	)
- 	for _, change := range changes {
- 		if change.Kind == ChangeModify || change.Kind == ChangeAdd {

Property changes on: head/sysutils/container-diff/files/extra-patch-without-ino64
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/container-diff/files/patch-uint32-Ino
===================================================================
--- head/sysutils/container-diff/files/patch-uint32-Ino	(nonexistent)
+++ head/sysutils/container-diff/files/patch-uint32-Ino	(revision 458955)
@@ -0,0 +1,53 @@
+--- vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig	2017-12-27 17:49:24 UTC
++++ vendor/github.com/docker/docker/pkg/archive/archive_unix.go
+@@ -58,7 +58,7 @@ func setHeaderForSpecialDevice(hdr *tar.
+ 	return
+ }
+ 
+-func getInodeFromStat(stat interface{}) (inode uint64, err error) {
++func getInodeFromStat(stat interface{}) (inode uint32, err error) {
+ 	s, ok := stat.(*syscall.Stat_t)
+ 
+ 	if ok {
+--- vendor/github.com/docker/docker/pkg/archive/archive.go.orig	2017-12-27 17:49:24 UTC
++++ vendor/github.com/docker/docker/pkg/archive/archive.go
+@@ -378,7 +378,7 @@ type tarAppender struct {
+ 	Buffer    *bufio.Writer
+ 
+ 	// for hardlink mapping
+-	SeenFiles  map[uint64]string
++	SeenFiles  map[uint32]string
+ 	IDMappings *idtools.IDMappings
+ 	ChownOpts  *idtools.IDPair
+ 
+@@ -391,7 +391,7 @@ type tarAppender struct {
+ 
+ func newTarAppender(idMapping *idtools.IDMappings, writer io.Writer, chownOpts *idtools.IDPair) *tarAppender {
+ 	return &tarAppender{
+-		SeenFiles:  make(map[uint64]string),
++		SeenFiles:  make(map[uint32]string),
+ 		TarWriter:  tar.NewWriter(writer),
+ 		Buffer:     pools.BufioWriter32KPool.Get(nil),
+ 		IDMappings: idMapping,
+--- vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig	2017-12-27 17:49:24 UTC
++++ vendor/github.com/docker/docker/pkg/archive/changes_unix.go
+@@ -28,7 +28,7 @@ func (info *FileInfo) isDir() bool {
+ 	return info.parent == nil || info.stat.Mode()&unix.S_IFDIR != 0
+ }
+ 
+-func getIno(fi os.FileInfo) uint64 {
++func getIno(fi os.FileInfo) uint32 {
+ 	return fi.Sys().(*syscall.Stat_t).Ino
+ }
+ 
+--- vendor/github.com/docker/docker/pkg/archive/changes.go.orig	2017-12-27 17:49:24 UTC
++++ vendor/github.com/docker/docker/pkg/archive/changes.go
+@@ -363,7 +363,7 @@ func ChangesDirs(newDir, oldDir string) 
+ func ChangesSize(newDir string, changes []Change) int64 {
+ 	var (
+ 		size int64
+-		sf   = make(map[uint64]struct{})
++		sf   = make(map[uint32]struct{})
+ 	)
+ 	for _, change := range changes {
+ 		if change.Kind == ChangeModify || change.Kind == ChangeAdd {

Property changes on: head/sysutils/container-diff/files/patch-uint32-Ino
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property