Index: head/sysutils/am-utils/Makefile
===================================================================
--- head/sysutils/am-utils/Makefile	(revision 372433)
+++ head/sysutils/am-utils/Makefile	(revision 372434)
@@ -1,57 +1,61 @@
 # Created by: Jon Wilson <jon@phuq.co.uk>
 # $FreeBSD$
 
 PORTNAME=	am-utils
-PORTVERSION=	6.1.5
-PORTREVISION=	2
+PORTVERSION=	6.2
 PORTEPOCH=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \
 		ftp://ftp.cs.umn.edu/pub/am-utils/ \
 		ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils/ \
 		RINGSERVER/net/am-utils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Berkeley Automounter Suite of Utilities
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	OPENLDAP DOCS
 OPTIONS_DEFAULT=OPENLDAP
 OPENLDAP_DESC=	OpenLDAP support
 
-USES=		libtool makeinfo
+USES=		bison libtool makeinfo perl5
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
+# Enable some filesystems which are not auto-detected with GENERIC kernel.
+CONFIGURE_ARGS+=	ac_cv_fs_nullfs=yes ac_cv_mnttab_type_nullfs='"nullfs"' ac_cv_mount_type_nullfs='"nullfs"' \
+			ac_cv_fs_udf=yes ac_cv_mnttab_type_udf='"udf"' ac_cv_mount_type_udf='"udf"' \
+			ac_cv_fs_tmpfs=yes ac_cv_mnttab_type_tmpfs='"tmpfs"' ac_cv_mount_type_tmpfs='"tmpfs"'
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
+INSTALL_TARGET=	install-strip
 
 INFO=		am-utils
 DOCS=		AUTHORS BUGS FAQ NEWS README.attrcache
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENLDAP}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=yes \
 		--enable-ldflags=-L${LOCALBASE}/lib \
 		--enable-cppflags=-I${LOCALBASE}/include
 DOCS+=		README.ldap ldap-id.txt ldap.schema
 PLIST_SUB+=	LDAP_DOC=""
 .else
 PLIST_SUB+=	LDAP_DOC="@comment "
 CONFIGURE_ARGS+=--with-ldap=no
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/am-utils.info*
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/sysutils/am-utils/distinfo
===================================================================
--- head/sysutils/am-utils/distinfo	(revision 372433)
+++ head/sysutils/am-utils/distinfo	(revision 372434)
@@ -1,2 +1,2 @@
-SHA256 (am-utils-6.1.5.tar.gz) = d070682af75effd6b49ed3e893603039ecd0a013a49d8d09375187676d645178
-SIZE (am-utils-6.1.5.tar.gz) = 1922684
+SHA256 (am-utils-6.2.tar.gz) = 6d2e6efaf73fa97065fc8fd58493800797ba02c905b01cc535e248b43f5610fa
+SIZE (am-utils-6.2.tar.gz) = 2297161
Index: head/sysutils/am-utils/files/patch-conf_nfs__prot_nfs__prot__freebsd3.h
===================================================================
--- head/sysutils/am-utils/files/patch-conf_nfs__prot_nfs__prot__freebsd3.h	(nonexistent)
+++ head/sysutils/am-utils/files/patch-conf_nfs__prot_nfs__prot__freebsd3.h	(revision 372434)
@@ -0,0 +1,14 @@
+--- conf/nfs_prot/nfs_prot_freebsd3.h.orig	2014-10-28 17:12:59 UTC
++++ conf/nfs_prot/nfs_prot_freebsd3.h
+@@ -85,9 +85,11 @@ struct ufs_extattr_per_mount;
+ #define na_ctime	ctime
+ #define na_fileid	fileid
+ #define na_fsid		fsid
++#define na_gid		gid
+ #define na_mode		mode
+ #define na_mtime	mtime
+ #define na_nlink	nlink
++#define na_rdev		rdev
+ #define na_size		size
+ #define na_type		type
+ #define na_uid		uid

Property changes on: head/sysutils/am-utils/files/patch-conf_nfs__prot_nfs__prot__freebsd3.h
___________________________________________________________________
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
Index: head/sysutils/am-utils/pkg-plist
===================================================================
--- head/sysutils/am-utils/pkg-plist	(revision 372433)
+++ head/sysutils/am-utils/pkg-plist	(revision 372434)
@@ -1,46 +1,45 @@
-bin/expn
 bin/pawd
 etc/amd.conf-sample
 etc/lostaltmail.conf-sample
 lib/libamu.a
 lib/libamu.so
 lib/libamu.so.4
 lib/libamu.so.4.0.0
-man/man1/expn.1.gz
 man/man1/pawd.1.gz
 man/man5/amd.conf.5.gz
 man/man8/amd.8.gz
 man/man8/amq.8.gz
 man/man8/automount2amd.8.gz
 man/man8/fixmount.8.gz
 man/man8/fsinfo.8.gz
 man/man8/hlfsd.8.gz
 man/man8/mk-amd-map.8.gz
+man/man8/sun2amd.8.gz
 man/man8/wire-test.8.gz
 sbin/am-eject
 sbin/amd
 sbin/amd2ldif
 sbin/amd2sun
 sbin/amq
 sbin/automount2amd
 sbin/ctl-amd
 sbin/ctl-hlfsd
 sbin/fix-amd-map
 sbin/fixmount
 sbin/fixrmtab
 sbin/fsinfo
 sbin/hlfsd
 sbin/lostaltmail
 sbin/mk-amd-map
+sbin/sun2amd
 sbin/wait4amd
 sbin/wait4amd2die
 sbin/wire-test
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.attrcache
 %%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
 %%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
 %%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema
-%%PORTDOCS%%@dirrm %%DOCSDIR%%