- Update to 6.1

PR:		ports/134334
Submitted by:	Dominic Fandrey <kamikaze AT bsdforen.de> (maintainer)
Approved by:	miwi (mentor)

4 files changed, 10 insertions, 16 deletions

diff --git a/sysutils/bsdadminscripts/Makefile b/sysutils/bsdadminscripts/Makefile
index a08439ee089f..77d4f1d344cb 100644
--- a/sysutils/bsdadminscripts/Makefile
+++ b/sysutils/bsdadminscripts/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bsdadminscripts
-PORTVERSION=	6.0
+PORTVERSION=	6.1
 CATEGORIES=	sysutils ports-mgmt
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,12 +39,12 @@ MLINKS+=	${RC_SCRIPTS:S,^,rc,:S,$,.1,:S,^,rcstart.1 ,} \
 .endif
 
 plist: patch
-	@cd ${WRKSRC}; ./list.sh -nodoc > ${PLIST}
+	@cd ${WRKSRC}; ./plist.sh -nodoc > ${PLIST}
 	@${ECHO} "@dirrm ${DATADIR_REL}" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC}; ./install.sh \
-		-prefix=${PREFIX} -ports=${PORTSDIR} -distdir=${DISTDIR} \
-			${NOPORTDOCS}
+		-prefix=${PREFIX} -ports=${PORTSDIR} -distdir=${DISTDIR}  \
+		-datadir=${DATADIR} ${NOPORTDOCS}
 
 .include <bsd.port.mk>
diff --git a/sysutils/bsdadminscripts/distinfo b/sysutils/bsdadminscripts/distinfo
index 4420806265c6..6fc9a945e80a 100644
--- a/sysutils/bsdadminscripts/distinfo
+++ b/sysutils/bsdadminscripts/distinfo
@@ -1,3 +1,3 @@
-MD5 (bsdadminscripts-6.0.tar.gz) = cd25a5b9015b5b5af0fbc7316ce61acb
-SHA256 (bsdadminscripts-6.0.tar.gz) = 354e5ae26bb7e15fe13c60d5086d323a7594d5a87371f24aedc230a3d65a461a
-SIZE (bsdadminscripts-6.0.tar.gz) = 53172
+MD5 (bsdadminscripts-6.1.tar.gz) = b7e8f520526d713c3567b3a48a27e6ca
+SHA256 (bsdadminscripts-6.1.tar.gz) = 5b6afdd0a04ba977fa0fb4f921b733f9bee9eb11b8242ed49bfbe136a6e50519
+SIZE (bsdadminscripts-6.1.tar.gz) = 73877
diff --git a/sysutils/bsdadminscripts/pkg-message b/sysutils/bsdadminscripts/pkg-message
deleted file mode 100644
index 3404fb398058..000000000000
--- a/sysutils/bsdadminscripts/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
--------------------------------------------------------------------------------
-The documentation of the scripts has moved into manual pages, please run:
-
-	man 1 bsdadminscripts
-
-to get an overview of the available documentation.
--------------------------------------------------------------------------------
diff --git a/sysutils/bsdadminscripts/pkg-plist b/sysutils/bsdadminscripts/pkg-plist
index 0c5fc67e5317..f4f5ec244a1f 100644
--- a/sysutils/bsdadminscripts/pkg-plist
+++ b/sysutils/bsdadminscripts/pkg-plist
@@ -1,6 +1,6 @@
-share/bsdadminscripts/buildflags.awk
+%%DATADIR%%/buildflags.awk
 etc/buildflags.conf.sample
-share/bsdadminscripts/buildflags.mk
+%%DATADIR%%/buildflags.mk
 sbin/distviper
 sbin/pkg_libchk
 sbin/pkg_upgrade
@@ -8,6 +8,7 @@ sbin/pkg_validate
 sbin/portconfig
 sbin/rcstart
 sbin/uma
+etc/uma.conf.sample
 sbin/rcstatus
 sbin/rcstop
 sbin/rcrestart