diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-06-12 13:58:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-06-12 13:58:07 +0000 |
| commit | 6186fb1aa92f4cbe7ca2ed80dbddfa0dfb9a6561 (patch) | |
| tree | bf2d0543a81bf3f9c96a7d962f53a9315be4e92a /sysutils | |
| parent | 230fb7206f2dfb0b8bcad12ff3cd15c2fd77c9df (diff) | |
| download | pkgsrc-6186fb1aa92f4cbe7ca2ed80dbddfa0dfb9a6561.tar.gz | |
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.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/smartmontools/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/smartmontools/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/smartmontools/patches/patch-ag | 34 |
3 files changed, 23 insertions, 18 deletions
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 39224925b98..4e94ddb0697 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2015/04/08 01:43:32 rodent Exp $ +# $NetBSD: Makefile,v 1.27 2015/06/12 13:58:07 jperkin Exp $ DISTNAME= smartmontools-6.3 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/} diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index 99af3d50072..b8b67757b85 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.23 2015/04/08 01:43:32 rodent Exp $ +$NetBSD: distinfo,v 1.24 2015/06/12 13:58:07 jperkin Exp $ SHA1 (smartmontools-6.3.tar.gz) = 716c5dc339d408d628c55dbe69028b1561df4c7e RMD160 (smartmontools-6.3.tar.gz) = b51fa0dfd15820d33fb00506853b34bbebadd096 Size (smartmontools-6.3.tar.gz) = 809790 bytes SHA1 (patch-aa) = 93a7725aa9e240d950d76f0da2d6b96f8d24f112 -SHA1 (patch-ag) = f30c7e98d87b1fd253589f107ac60f1b8709e8dd +SHA1 (patch-ag) = bbf85278f08390d51ac9bb428ac7026763e5ffcf SHA1 (patch-os__netbsd.cpp) = 9c197ae492ef377d72df009be40d0abc1a827a31 diff --git a/sysutils/smartmontools/patches/patch-ag b/sysutils/smartmontools/patches/patch-ag index c7f3ab3426b..d89cd5fbf41 100644 --- a/sysutils/smartmontools/patches/patch-ag +++ b/sysutils/smartmontools/patches/patch-ag @@ -1,18 +1,22 @@ -$NetBSD: patch-ag,v 1.4 2015/04/08 01:43:33 rodent Exp $ +$NetBSD: patch-ag,v 1.5 2015/06/12 13:58:07 jperkin Exp $ + +Match x86 SunOS platforms correctly. +Remove os_solaris=yes to avoid special man page section handling (PR 38199). --- configure.orig 2014-07-26 09:50:18.000000000 +0000 +++ configure -@@ -6670,13 +6670,8 @@ else - OS_DARWIN_FALSE= - fi - -- if test "$os_solaris" = "yes"; then -- OS_SOLARIS_TRUE= -- OS_SOLARIS_FALSE='#' --else - OS_SOLARIS_TRUE='#' - OS_SOLARIS_FALSE= --fi - - if test "$os_win32" = "yes"; then - OS_WIN32_TRUE= +@@ -6569,13 +6569,11 @@ fi + sparc-*-solaris*) + os_deps='os_solaris.o os_solaris_ata.o' + os_mailer='mailx' +- os_solaris=yes + os_man_filter=Solaris + ;; +- *-pc-solaris*) ++ *-solaris*) + os_deps='os_solaris.o' + os_mailer='mailx' +- os_solaris=yes + os_man_filter=Solaris + ;; + *-*-netbsd*) |