5 files changed, 38 insertions, 32 deletions
diff --git a/sysutils/smartmontools/patches/patch-aa b/sysutils/smartmontools/patches/patch-aa
index 39712f67158..64a58921051 100644
--- a/sysutils/smartmontools/patches/patch-aa
+++ b/sysutils/smartmontools/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2007/06/03 10:40:07 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2008/05/17 13:07:54 obache Exp $
 
---- Makefile.in.orig	2006-12-20 21:38:50.000000000 +0100
+--- Makefile.in.orig	2008-03-10 10:44:13.000000000 +0000
 +++ Makefile.in
-@@ -92,7 +92,7 @@ CONFIG_HEADER = config.h
+@@ -87,7 +87,7 @@ CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
  am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \
  	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docsdir)" \
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2007/06/03 10:40:07 jmmv Exp $
  sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(sbin_PROGRAMS)
  am__smartctl_SOURCES_DIST = smartctl.cpp smartctl.h atacmdnames.cpp \
-@@ -353,8 +353,7 @@ docs_DATA = AUTHORS     \
+@@ -347,8 +347,7 @@ docs_DATA = AUTHORS     \
              NEWS        \
              README      \
              TODO        \
@@ -21,12 +21,12 @@ $NetBSD: patch-aa,v 1.4 2007/06/03 10:40:07 jmmv Exp $
  
  sysconf_DATA = smartd.conf$(smartd_suffix)
  EXTRA_DIST = smartmontools.spec                    \
-@@ -1122,7 +1121,7 @@ info: info-recursive
+@@ -1115,7 +1114,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-docsDATA install-initdDATA install-man
 +install-data-am: install-docsDATA install-man
  
- install-exec-am: install-sbinPROGRAMS install-sysconfDATA
+ install-dvi: install-dvi-recursive
  
diff --git a/sysutils/smartmontools/patches/patch-ae b/sysutils/smartmontools/patches/patch-ae
deleted file mode 100644
index 31b0876108c..00000000000
--- a/sysutils/smartmontools/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/10/19 03:56:13 taca Exp $
-
---- smartctl.cpp.orig	Mon Oct  9 20:45:12 2006
-+++ smartctl.cpp
-@@ -82,7 +82,7 @@ void PrintOneCVS(const char *a_cvs_id){
- }
- 
- void printcopy(){
--  char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]";
-+  const char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]";
- 
-   pout("smartctl comes with ABSOLUTELY NO WARRANTY. This\n");
-   pout("is free software, and you are welcome to redistribute it\n");
diff --git a/sysutils/smartmontools/patches/patch-af b/sysutils/smartmontools/patches/patch-af
deleted file mode 100644
index c88f0c5e8f0..00000000000
--- a/sysutils/smartmontools/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/10/19 03:56:14 taca Exp $
-
---- smartd.cpp.orig	Sun Nov 12 13:49:09 2006
-+++ smartd.cpp
-@@ -310,7 +310,7 @@ void PrintOneCVS(const char *a_cvs_id){
- 
- // prints CVS identity information for the executable
- void PrintCVS(void){
--  char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]";
-+  const char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]";
- 
-   PrintOut(LOG_INFO,(char *)copyleftstring);
-   PrintOut(LOG_INFO,"CVS version IDs of files used to build this code are:\n");
diff --git a/sysutils/smartmontools/patches/patch-ag b/sysutils/smartmontools/patches/patch-ag
new file mode 100644
index 00000000000..0f7b8a94161
--- /dev/null
+++ b/sysutils/smartmontools/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.1 2008/05/17 13:07:54 obache Exp $
+
+Avoid special man page section handling for Solaris (PR 38199).
+
+--- configure.orig	2008-03-10 10:44:14.000000000 +0000
++++ configure
+@@ -8141,13 +8141,8 @@ else
+   OS_DARWIN_FALSE=
+ fi
+ 
+- if echo $host_os | grep '^solaris' > /dev/null; then
+-  OS_SOLARIS_TRUE=
+-  OS_SOLARIS_FALSE='#'
+-else
+   OS_SOLARIS_TRUE='#'
+   OS_SOLARIS_FALSE=
+-fi
+ 
+  if echo $host_os | grep '^mingw' > /dev/null; then
+   OS_WIN32_MINGW_TRUE=
diff --git a/sysutils/smartmontools/patches/patch-ah b/sysutils/smartmontools/patches/patch-ah
new file mode 100644
index 00000000000..bc62ff2502a
--- /dev/null
+++ b/sysutils/smartmontools/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2008/05/17 13:07:54 obache Exp $
+
+--- os_freebsd.cpp.orig	2008-03-04 22:09:47.000000000 +0000
++++ os_freebsd.cpp
+@@ -272,7 +272,6 @@ int marvell_command_interface(__unused i
+ }
+ 
+ int highpoint_command_interface(__unused int fd, __unused smart_command_set command, __unused int select, __unused char *data) {
+-{
+   return -1;
+ }
+