Fri Jun 12 13:58:07 2015 UTC ()
Fix Solaris support which has been broken since -r1.3 of patch-ag, which
removed all comments at the same time.  Put those comments back, and tidy
up the patch.

Bump PKGREVISION.


(jperkin)
diff -r1.26 -r1.27 pkgsrc/sysutils/smartmontools/Makefile
diff -r1.23 -r1.24 pkgsrc/sysutils/smartmontools/distinfo
diff -r1.4 -r1.5 pkgsrc/sysutils/smartmontools/patches/patch-ag
cvs diff -r1.26 -r1.27 pkgsrc/sysutils/smartmontools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/smartmontools/Makefile 2015/04/08 01:43:32 1.26
+++ pkgsrc/sysutils/smartmontools/Makefile 2015/06/12 13:58:07 1.27
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.26 2015/04/08 01:43:32 rodent Exp $ 1# $NetBSD: Makefile,v 1.27 2015/06/12 13:58:07 jperkin Exp $
2 2
3DISTNAME= smartmontools-6.3 3DISTNAME= smartmontools-6.3
 4PKGREVISION= 1
4CATEGORIES= sysutils 5CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://smartmontools.sourceforge.net/ 9HOMEPAGE= http://smartmontools.sourceforge.net/
9COMMENT= Control and monitor storage systems using SMART 10COMMENT= Control and monitor storage systems using SMART
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12ONLY_FOR_PLATFORM= Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-* 13ONLY_FOR_PLATFORM= Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-*
13ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-* 14ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-*
14 15
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
cvs diff -r1.23 -r1.24 pkgsrc/sysutils/smartmontools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/smartmontools/distinfo 2015/04/08 01:43:32 1.23
+++ pkgsrc/sysutils/smartmontools/distinfo 2015/06/12 13:58:07 1.24
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.23 2015/04/08 01:43:32 rodent Exp $ 1$NetBSD: distinfo,v 1.24 2015/06/12 13:58:07 jperkin Exp $
2 2
3SHA1 (smartmontools-6.3.tar.gz) = 716c5dc339d408d628c55dbe69028b1561df4c7e 3SHA1 (smartmontools-6.3.tar.gz) = 716c5dc339d408d628c55dbe69028b1561df4c7e
4RMD160 (smartmontools-6.3.tar.gz) = b51fa0dfd15820d33fb00506853b34bbebadd096 4RMD160 (smartmontools-6.3.tar.gz) = b51fa0dfd15820d33fb00506853b34bbebadd096
5Size (smartmontools-6.3.tar.gz) = 809790 bytes 5Size (smartmontools-6.3.tar.gz) = 809790 bytes
6SHA1 (patch-aa) = 93a7725aa9e240d950d76f0da2d6b96f8d24f112 6SHA1 (patch-aa) = 93a7725aa9e240d950d76f0da2d6b96f8d24f112
7SHA1 (patch-ag) = f30c7e98d87b1fd253589f107ac60f1b8709e8dd 7SHA1 (patch-ag) = bbf85278f08390d51ac9bb428ac7026763e5ffcf
8SHA1 (patch-os__netbsd.cpp) = 9c197ae492ef377d72df009be40d0abc1a827a31 8SHA1 (patch-os__netbsd.cpp) = 9c197ae492ef377d72df009be40d0abc1a827a31
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/smartmontools/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/sysutils/smartmontools/patches/patch-ag 2015/04/08 01:43:33 1.4
+++ pkgsrc/sysutils/smartmontools/patches/patch-ag 2015/06/12 13:58:07 1.5
@@ -1,18 +1,22 @@ @@ -1,18 +1,22 @@
1$NetBSD: patch-ag,v 1.4 2015/04/08 01:43:33 rodent Exp $ 1$NetBSD: patch-ag,v 1.5 2015/06/12 13:58:07 jperkin Exp $
 2
 3Match x86 SunOS platforms correctly.
 4Remove os_solaris=yes to avoid special man page section handling (PR 38199).
2 5
3--- configure.orig 2014-07-26 09:50:18.000000000 +0000 6--- configure.orig 2014-07-26 09:50:18.000000000 +0000
4+++ configure 7+++ configure
5@@ -6670,13 +6670,8 @@ else 8@@ -6569,13 +6569,11 @@ fi
6 OS_DARWIN_FALSE= 9 sparc-*-solaris*)
7 fi 10 os_deps='os_solaris.o os_solaris_ata.o'
8  11 os_mailer='mailx'
9- if test "$os_solaris" = "yes"; then 12- os_solaris=yes
10- OS_SOLARIS_TRUE= 13 os_man_filter=Solaris
11- OS_SOLARIS_FALSE='#' 14 ;;
12-else 15- *-pc-solaris*)
13 OS_SOLARIS_TRUE='#' 16+ *-solaris*)
14 OS_SOLARIS_FALSE= 17 os_deps='os_solaris.o'
15-fi 18 os_mailer='mailx'
16  19- os_solaris=yes
17 if test "$os_win32" = "yes"; then 20 os_man_filter=Solaris
18 OS_WIN32_TRUE= 21 ;;
 22 *-*-netbsd*)