- Update to 6.2

- Clarify License
- Strip library

PR:		ports/194852
Submitted by:	Yasuhiro KIMURA

4 files changed, 26 insertions, 9 deletions

diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index d80e8e5c39b8..113567920438 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -2,8 +2,7 @@
 # $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/ \
@@ -14,19 +13,24 @@ MASTER_SITES=	ftp://ftp.am-utils.org/pub/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
diff --git a/sysutils/am-utils/distinfo b/sysutils/am-utils/distinfo
index e86f9abed51c..b16efab1cf8c 100644
--- a/sysutils/am-utils/distinfo
+++ b/sysutils/am-utils/distinfo
@@ -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
diff --git a/sysutils/am-utils/files/patch-conf_nfs__prot_nfs__prot__freebsd3.h b/sysutils/am-utils/files/patch-conf_nfs__prot_nfs__prot__freebsd3.h
new file mode 100644
index 000000000000..9552dd74ff5b
--- /dev/null
+++ b/sysutils/am-utils/files/patch-conf_nfs__prot_nfs__prot__freebsd3.h
@@ -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
diff --git a/sysutils/am-utils/pkg-plist b/sysutils/am-utils/pkg-plist
index 5bd4f006725a..8e77c147fd68 100644
--- a/sysutils/am-utils/pkg-plist
+++ b/sysutils/am-utils/pkg-plist
@@ -1,4 +1,3 @@
-bin/expn
 bin/pawd
 etc/amd.conf-sample
 etc/lostaltmail.conf-sample
@@ -6,7 +5,6 @@ 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
@@ -16,6 +14,7 @@ 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
@@ -32,6 +31,7 @@ sbin/fsinfo
 sbin/hlfsd
 sbin/lostaltmail
 sbin/mk-amd-map
+sbin/sun2amd
 sbin/wait4amd
 sbin/wait4amd2die
 sbin/wire-test
@@ -43,4 +43,3 @@ sbin/wire-test
 %%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
 %%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
 %%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema
-%%PORTDOCS%%@dirrm %%DOCSDIR%%