- Update to 5.37

8 files changed, 48 insertions, 116 deletions

diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile
index 8be2d31ce1a5..189dc559c37e 100644
--- a/sysutils/smartmontools-devel/Makefile
+++ b/sysutils/smartmontools-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smartmontools
-PORTVERSION=	5.36
+PORTVERSION=	5.37
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,30 +16,17 @@ COMMENT=	S.M.A.R.T. disk monitoring tools
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-initscriptdir=${PREFIX}/etc/rc.d \
-		--with-docdir=${DOCSDIR} --enable-sample
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${PREFIX}/man --enable-sample
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	smartd
 
-PROGRAMS=	smartctl smartd
 MAN5=		smartd.conf.5
 MAN8=		smartd.8 smartctl.8
-DOCS=		AUTHORS CHANGELOG INSTALL NEWS README TODO WARNINGS
-EXAMPLES=	smartd.conf examplescripts/README examplescripts/Example?
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/sbin
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/smartd.conf.sample ${PREFIX}/etc
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's| install-initdDATA | |' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/smartmontools-devel/distinfo b/sysutils/smartmontools-devel/distinfo
index a0a3dea12b02..7b927a1c4ff0 100644
--- a/sysutils/smartmontools-devel/distinfo
+++ b/sysutils/smartmontools-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (smartmontools-5.36.tar.gz) = 2e424f2d35efa38a29ebca419c1dbe3c
-SHA256 (smartmontools-5.36.tar.gz) = f2032adf22f8d17aad7f3dbed0a9361c25e273d3ca6abb996c84159afd624bf4
-SIZE (smartmontools-5.36.tar.gz) = 540786
+MD5 (smartmontools-5.37.tar.gz) = 4ab3668b7d1362ce923f64a211e0e568
+SHA256 (smartmontools-5.37.tar.gz) = 2984645b207c52ea9b8ef3951af8bd0c5aab469607fabf63ade05f8fe87309c1
+SIZE (smartmontools-5.37.tar.gz) = 590605
diff --git a/sysutils/smartmontools-devel/files/patch-knowndrives.c b/sysutils/smartmontools-devel/files/patch-knowndrives.c
deleted file mode 100644
index ce2bbb1821c6..000000000000
--- a/sysutils/smartmontools-devel/files/patch-knowndrives.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- knowndrives.c.orig  Wed Apr  5 23:50:07 2006
-+++ knowndrives.c       Sun Apr 23 20:46:00 2006
-@@ -562,6 +562,20 @@
-     vendoropts_9_minutes,
-     NULL, NULL
-   },
-+  { "Maxtor MaXLine Pro 500",
-+    "^Maxtor 7H500[FR]0$",
-+    ".*",
-+    NULL,
-+    vendoropts_9_minutes,
-+    NULL, NULL
-+  },
-+  { "Maxtor MaXLine III family",
-+    "^Maxtor 7[LV](30|25)0[FRS]0$",
-+    ".*",
-+    NULL,
-+    vendoropts_9_minutes,
-+    NULL, NULL
-+  },
-   { "Maxtor MaXLine Plus II",
-     "^Maxtor 7Y250[PM]0$",
-     ".*",
diff --git a/sysutils/smartmontools-devel/pkg-plist b/sysutils/smartmontools-devel/pkg-plist
index 94fcba98e45a..4e77c480f242 100644
--- a/sysutils/smartmontools-devel/pkg-plist
+++ b/sysutils/smartmontools-devel/pkg-plist
@@ -4,17 +4,19 @@
 etc/smartd.conf.sample
 sbin/smartctl
 sbin/smartd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/WARNINGS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/Example1
-%%EXAMPLESDIR%%/Example2
-%%EXAMPLESDIR%%/Example3
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/smartd.conf
-@dirrm %%EXAMPLESDIR%%
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/CHANGELOG
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/WARNINGS
+%%DOCSDIR%%/examplescripts/Example1
+%%DOCSDIR%%/examplescripts/Example2
+%%DOCSDIR%%/examplescripts/Example3
+%%DOCSDIR%%/examplescripts/Example4
+%%DOCSDIR%%/examplescripts/README
+%%DOCSDIR%%/smartd.conf
+@dirrm %%DOCSDIR%%/examplescripts
+@dirrm %%DOCSDIR%%
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 8be2d31ce1a5..189dc559c37e 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smartmontools
-PORTVERSION=	5.36
+PORTVERSION=	5.37
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,30 +16,17 @@ COMMENT=	S.M.A.R.T. disk monitoring tools
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-initscriptdir=${PREFIX}/etc/rc.d \
-		--with-docdir=${DOCSDIR} --enable-sample
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${PREFIX}/man --enable-sample
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	smartd
 
-PROGRAMS=	smartctl smartd
 MAN5=		smartd.conf.5
 MAN8=		smartd.8 smartctl.8
-DOCS=		AUTHORS CHANGELOG INSTALL NEWS README TODO WARNINGS
-EXAMPLES=	smartd.conf examplescripts/README examplescripts/Example?
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/sbin
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/smartd.conf.sample ${PREFIX}/etc
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's| install-initdDATA | |' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo
index a0a3dea12b02..7b927a1c4ff0 100644
--- a/sysutils/smartmontools/distinfo
+++ b/sysutils/smartmontools/distinfo
@@ -1,3 +1,3 @@
-MD5 (smartmontools-5.36.tar.gz) = 2e424f2d35efa38a29ebca419c1dbe3c
-SHA256 (smartmontools-5.36.tar.gz) = f2032adf22f8d17aad7f3dbed0a9361c25e273d3ca6abb996c84159afd624bf4
-SIZE (smartmontools-5.36.tar.gz) = 540786
+MD5 (smartmontools-5.37.tar.gz) = 4ab3668b7d1362ce923f64a211e0e568
+SHA256 (smartmontools-5.37.tar.gz) = 2984645b207c52ea9b8ef3951af8bd0c5aab469607fabf63ade05f8fe87309c1
+SIZE (smartmontools-5.37.tar.gz) = 590605
diff --git a/sysutils/smartmontools/files/patch-knowndrives.c b/sysutils/smartmontools/files/patch-knowndrives.c
deleted file mode 100644
index ce2bbb1821c6..000000000000
--- a/sysutils/smartmontools/files/patch-knowndrives.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- knowndrives.c.orig  Wed Apr  5 23:50:07 2006
-+++ knowndrives.c       Sun Apr 23 20:46:00 2006
-@@ -562,6 +562,20 @@
-     vendoropts_9_minutes,
-     NULL, NULL
-   },
-+  { "Maxtor MaXLine Pro 500",
-+    "^Maxtor 7H500[FR]0$",
-+    ".*",
-+    NULL,
-+    vendoropts_9_minutes,
-+    NULL, NULL
-+  },
-+  { "Maxtor MaXLine III family",
-+    "^Maxtor 7[LV](30|25)0[FRS]0$",
-+    ".*",
-+    NULL,
-+    vendoropts_9_minutes,
-+    NULL, NULL
-+  },
-   { "Maxtor MaXLine Plus II",
-     "^Maxtor 7Y250[PM]0$",
-     ".*",
diff --git a/sysutils/smartmontools/pkg-plist b/sysutils/smartmontools/pkg-plist
index 94fcba98e45a..4e77c480f242 100644
--- a/sysutils/smartmontools/pkg-plist
+++ b/sysutils/smartmontools/pkg-plist
@@ -4,17 +4,19 @@
 etc/smartd.conf.sample
 sbin/smartctl
 sbin/smartd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/WARNINGS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/Example1
-%%EXAMPLESDIR%%/Example2
-%%EXAMPLESDIR%%/Example3
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/smartd.conf
-@dirrm %%EXAMPLESDIR%%
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/CHANGELOG
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/WARNINGS
+%%DOCSDIR%%/examplescripts/Example1
+%%DOCSDIR%%/examplescripts/Example2
+%%DOCSDIR%%/examplescripts/Example3
+%%DOCSDIR%%/examplescripts/Example4
+%%DOCSDIR%%/examplescripts/README
+%%DOCSDIR%%/smartd.conf
+@dirrm %%DOCSDIR%%/examplescripts
+@dirrm %%DOCSDIR%%