We reached NetBSD "6".diff -r1.15 -r1.16 pkgsrc/sysutils/system-tools-backends/Makefile
(prlw1)
@@ -1,58 +1,58 @@ | @@ -1,58 +1,58 @@ | |||
1 | # $NetBSD: Makefile,v 1.15 2013/05/31 12:42:05 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.16 2013/08/24 15:34:39 prlw1 Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= system-tools-backends-2.6.1 | 4 | DISTNAME= system-tools-backends-2.6.1 | |
5 | PKGREVISION= 9 | 5 | PKGREVISION= 10 | |
6 | CATEGORIES= sysutils | 6 | CATEGORIES= sysutils | |
7 | MASTER_SITES= http://system-tools-backends.freedesktop.org/downloads/2.6/ | 7 | MASTER_SITES= http://system-tools-backends.freedesktop.org/downloads/2.6/ | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://system-tools-backends.freedesktop.org/ | 10 | HOMEPAGE= http://system-tools-backends.freedesktop.org/ | |
11 | COMMENT= DBus interface for system configuration | 11 | COMMENT= DBus interface for system configuration | |
12 | 12 | |||
13 | PKG_OPTIONS_VAR= PKG_OPTIONS.system-tools-backends | 13 | PKG_OPTIONS_VAR= PKG_OPTIONS.system-tools-backends | |
14 | PKG_SUPPORTED_OPTIONS+= hal | 14 | PKG_SUPPORTED_OPTIONS+= hal | |
15 | PKG_SUGGESTED_OPTIONS+= hal | 15 | PKG_SUGGESTED_OPTIONS+= hal | |
16 | PLIST_VARS+= hal | 16 | PLIST_VARS+= hal | |
17 | 17 | |||
18 | .include "../../mk/bsd.options.mk" | 18 | .include "../../mk/bsd.options.mk" | |
19 | .if !empty(PKG_OPTIONS:Mhal) | 19 | .if !empty(PKG_OPTIONS:Mhal) | |
20 | .include "../../security/policykit/buildlink3.mk" | 20 | .include "../../security/policykit/buildlink3.mk" | |
21 | .include "../../sysutils/hal/buildlink3.mk" | 21 | .include "../../sysutils/hal/buildlink3.mk" | |
22 | PLIST.hal= yes | 22 | PLIST.hal= yes | |
23 | .endif | 23 | .endif | |
24 | 24 | |||
25 | EGDIR= ${PREFIX}/share/examples/system-tools-backends | 25 | EGDIR= ${PREFIX}/share/examples/system-tools-backends | |
26 | CONF_FILES+= ${EGDIR}/system-tools-backends.conf ${PKG_SYSCONFDIR}/dbus-1/system.d/system-tools-backends.conf | 26 | CONF_FILES+= ${EGDIR}/system-tools-backends.conf ${PKG_SYSCONFDIR}/dbus-1/system.d/system-tools-backends.conf | |
27 | 27 | |||
28 | GNU_CONFIGURE= YES | 28 | GNU_CONFIGURE= YES | |
29 | USE_PKGLOCALEDIR= YES | 29 | USE_PKGLOCALEDIR= YES | |
30 | USE_TOOLS+= gmake intltool msgfmt perl pkg-config | 30 | USE_TOOLS+= gmake intltool msgfmt perl pkg-config | |
31 | USE_LIBTOOL= YES | 31 | USE_LIBTOOL= YES | |
32 | 32 | |||
33 | STB_GROUP?= stb-admin | 33 | STB_GROUP?= stb-admin | |
34 | PKG_GROUPS= ${STB_GROUP} | 34 | PKG_GROUPS= ${STB_GROUP} | |
35 | PKG_GROUPS_VARS+= STB_GROUP | 35 | PKG_GROUPS_VARS+= STB_GROUP | |
36 | 36 | |||
37 | CONFIGURE_ARGS+= --with-stb-group=${STB_GROUP} | 37 | CONFIGURE_ARGS+= --with-stb-group=${STB_GROUP} | |
38 | CONFIGURE_ARGS+= --localstatedir=/var | 38 | CONFIGURE_ARGS+= --localstatedir=/var | |
39 | CONFIGURE_ARGS+= --with-dbus-sys=${EGDIR} | 39 | CONFIGURE_ARGS+= --with-dbus-sys=${EGDIR} | |
40 | 40 | |||
41 | DEPENDS+= p5-XML-Twig>=3.32:../../textproc/p5-XML-Twig | 41 | DEPENDS+= p5-XML-Twig>=3.32:../../textproc/p5-XML-Twig | |
42 | DEPENDS+= p5-Net-DBus>=0.33.6:../../net/p5-Net-DBus | 42 | DEPENDS+= p5-Net-DBus>=0.33.6:../../net/p5-Net-DBus | |
43 | DEPENDS+= p5-libwww>=5.820:../../www/p5-libwww | 43 | DEPENDS+= p5-libwww>=5.820:../../www/p5-libwww | |
44 | DEPENDS+= p5-URI>=1.37:../../www/p5-URI | 44 | DEPENDS+= p5-URI>=1.37:../../www/p5-URI | |
45 | 45 | |||
46 | REPLACE_PERL+= SystemToolsBackends.pl.in | 46 | REPLACE_PERL+= SystemToolsBackends.pl.in | |
47 | REPLACE_PERL+= Utils/*.pm | 47 | REPLACE_PERL+= Utils/*.pm | |
48 | 48 | |||
49 | SUBST_CLASSES+= gettext-package | 49 | SUBST_CLASSES+= gettext-package | |
50 | SUBST_STAGE.gettext-package= post-configure | 50 | SUBST_STAGE.gettext-package= post-configure | |
51 | SUBST_FILES.gettext-package= po/Makefile | 51 | SUBST_FILES.gettext-package= po/Makefile | |
52 | SUBST_SED.gettext-package= -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' | 52 | SUBST_SED.gettext-package= -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' | |
53 | 53 | |||
54 | .include "../../devel/glib2/buildlink3.mk" | 54 | .include "../../devel/glib2/buildlink3.mk" | |
55 | .include "../../lang/perl5/buildlink3.mk" | 55 | .include "../../lang/perl5/buildlink3.mk" | |
56 | .include "../../sysutils/dbus/buildlink3.mk" | 56 | .include "../../sysutils/dbus/buildlink3.mk" | |
57 | .include "../../sysutils/dbus-glib/buildlink3.mk" | 57 | .include "../../sysutils/dbus-glib/buildlink3.mk" | |
58 | .include "../../mk/bsd.pkg.mk" | 58 | .include "../../mk/bsd.pkg.mk" |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2009/12/14 01:39:57 obache Exp $ | 1 | $NetBSD: distinfo,v 1.3 2013/08/24 15:34:39 prlw1 Exp $ | |
2 | 2 | |||
3 | SHA1 (system-tools-backends-2.6.1.tar.gz) = 1e332ab27c752d8ea3b212f1bcdf18f09295976a | 3 | SHA1 (system-tools-backends-2.6.1.tar.gz) = 1e332ab27c752d8ea3b212f1bcdf18f09295976a | |
4 | RMD160 (system-tools-backends-2.6.1.tar.gz) = 266cbd4ae04ee97f5a55cb2d987691ebe41e94ac | 4 | RMD160 (system-tools-backends-2.6.1.tar.gz) = 266cbd4ae04ee97f5a55cb2d987691ebe41e94ac | |
5 | Size (system-tools-backends-2.6.1.tar.gz) = 551450 bytes | 5 | Size (system-tools-backends-2.6.1.tar.gz) = 551450 bytes | |
6 | SHA1 (patch-aa) = f523c20200fcce9655056bb0a2a9ccbef3497dff | 6 | SHA1 (patch-aa) = f523c20200fcce9655056bb0a2a9ccbef3497dff | |
7 | SHA1 (patch-ab) = 610dbd0608d93b74d02442b2ad081e5c78c326c1 | 7 | SHA1 (patch-ab) = 610dbd0608d93b74d02442b2ad081e5c78c326c1 | |
8 | SHA1 (patch-ac) = 8cef6e86faf53b0269fb744adc3fa09c7034fd23 | 8 | SHA1 (patch-ac) = 8cef6e86faf53b0269fb744adc3fa09c7034fd23 | |
9 | SHA1 (patch-ad) = fb12dcc969123ff0fe2f102bc923192c1b7c6a2f | 9 | SHA1 (patch-ad) = fb12dcc969123ff0fe2f102bc923192c1b7c6a2f | |
10 | SHA1 (patch-ae) = 4946b7a89fb4a1b54e889c1eb5354b2ef5d11727 | 10 | SHA1 (patch-ae) = 4946b7a89fb4a1b54e889c1eb5354b2ef5d11727 | |
11 | SHA1 (patch-af) = 31a00a1287ff84ade4244c728945cce00a3fcf7f | 11 | SHA1 (patch-af) = 31a00a1287ff84ade4244c728945cce00a3fcf7f | |
12 | SHA1 (patch-ag) = 236c5286ebde33e739f19e2f54d8800f679b1178 | 12 | SHA1 (patch-ag) = a39544f9675d20259cdcf525c47e54f47944047a |
@@ -1,57 +1,65 @@ | @@ -1,57 +1,65 @@ | |||
1 | $NetBSD: patch-ag,v 1.1.1.1 2008/11/15 18:28:56 jmcneill Exp $ | 1 | $NetBSD: patch-ag,v 1.2 2013/08/24 15:34:39 prlw1 Exp $ | |
2 | 2 | |||
3 | --- Utils/Platform.pm.orig 2008-03-09 09:21:45.000000000 -0400 | 3 | --- Utils/Platform.pm.orig 2008-03-09 13:21:45.000000000 +0000 | |
4 | +++ Utils/Platform.pm | 4 | +++ Utils/Platform.pm | |
5 | @@ -76,6 +76,10 @@ my $PLATFORM_INFO = { | 5 | @@ -1,4 +1,4 @@ | |
6 | -#!/usr/bin/env perl | |||
7 | +#!/usr/pkg/bin/perl | |||
8 | #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- | |||
9 | ||||
10 | # Determine the platform we're running on. | |||
11 | @@ -76,6 +76,11 @@ my $PLATFORM_INFO = { | |||
6 | "slackware-11.0.0" => [ "Slackware", "11.0.0", "" ], | 12 | "slackware-11.0.0" => [ "Slackware", "11.0.0", "" ], | |
7 | "slackware-12.0.0" => [ "Slackware", "12.0.0", "" ], | 13 | "slackware-12.0.0" => [ "Slackware", "12.0.0", "" ], | |
8 | "bluewhite64-12.0.0" => [ "Bluewhite64", "12.0.0", "" ], | 14 | "bluewhite64-12.0.0" => [ "Bluewhite64", "12.0.0", "" ], | |
9 | + "netbsd-2" => [ "NetBSD", "2", "" ], | 15 | + "netbsd-2" => [ "NetBSD", "2", "" ], | |
10 | + "netbsd-3" => [ "NetBSD", "3", "" ], | 16 | + "netbsd-3" => [ "NetBSD", "3", "" ], | |
11 | + "netbsd-4" => [ "NetBSD", "4", "" ], | 17 | + "netbsd-4" => [ "NetBSD", "4", "" ], | |
12 | + "netbsd-5" => [ "NetBSD", "5", "" ], | 18 | + "netbsd-5" => [ "NetBSD", "5", "" ], | |
19 | + "netbsd-6" => [ "NetBSD", "6", "" ], | |||
13 | "freebsd-4" => [ "FreeBSD", "4", "" ], | 20 | "freebsd-4" => [ "FreeBSD", "4", "" ], | |
14 | "freebsd-5" => [ "FreeBSD", "5", "" ], | 21 | "freebsd-5" => [ "FreeBSD", "5", "" ], | |
15 | "freebsd-6" => [ "FreeBSD", "6", "" ], | 22 | "freebsd-6" => [ "FreeBSD", "6", "" ], | |
16 | @@ -131,6 +135,9 @@ sub ensure_distro_map | 23 | @@ -131,6 +136,10 @@ sub ensure_distro_map | |
17 | "fedora-3" => "redhat-7.2", | 24 | "fedora-3" => "redhat-7.2", | |
18 | "fedora-4" => "redhat-7.2", | 25 | "fedora-4" => "redhat-7.2", | |
19 | "fedora-5" => "redhat-7.2", | 26 | "fedora-5" => "redhat-7.2", | |
20 | + "netbsd-3" => "netbsd-2", | 27 | + "netbsd-3" => "netbsd-2", | |
21 | + "netbsd-4" => "netbsd-2", | 28 | + "netbsd-4" => "netbsd-2", | |
22 | + "netbsd-5" => "netbsd-2", | 29 | + "netbsd-5" => "netbsd-2", | |
30 | + "netbsd-6" => "netbsd-2", | |||
23 | "freebsd-6" => "freebsd-5", | 31 | "freebsd-6" => "freebsd-5", | |
24 | "freebsd-7" => "freebsd-5", | 32 | "freebsd-7" => "freebsd-5", | |
25 | "openna-1.0" => "redhat-6.2", | 33 | "openna-1.0" => "redhat-6.2", | |
26 | @@ -251,6 +258,23 @@ sub check_ark | 34 | @@ -251,6 +260,23 @@ sub check_ark | |
27 | return -1; | 35 | return -1; | |
28 | } | 36 | } | |
29 | 37 | |||
30 | +sub check_netbsd | 38 | +sub check_netbsd | |
31 | +{ | 39 | +{ | |
32 | + my ($sysctl_cmd, @output); | 40 | + my ($sysctl_cmd, @output); | |
33 | + | 41 | + | |
34 | + $sysctl_cmd = &Utils::File::locate_tool ("sysctl"); | 42 | + $sysctl_cmd = &Utils::File::locate_tool ("sysctl"); | |
35 | + @output = (readpipe("$sysctl_cmd -n kern.version")); | 43 | + @output = (readpipe("$sysctl_cmd -n kern.version")); | |
36 | + foreach (@output) | 44 | + foreach (@output) | |
37 | + { | 45 | + { | |
38 | + chomp; | 46 | + chomp; | |
39 | + if (/^NetBSD\s([0-9]+)\.\S+.*/) | 47 | + if (/^NetBSD\s([0-9]+)\.\S+.*/) | |
40 | + { | 48 | + { | |
41 | + return "netbsd-$1"; | 49 | + return "netbsd-$1"; | |
42 | + } | 50 | + } | |
43 | + } | 51 | + } | |
44 | + return -1; | 52 | + return -1; | |
45 | +} | 53 | +} | |
46 | + | 54 | + | |
47 | sub check_freebsd | 55 | sub check_freebsd | |
48 | { | 56 | { | |
49 | my ($sysctl_cmd, @output); | 57 | my ($sysctl_cmd, @output); | |
50 | @@ -391,6 +415,7 @@ sub guess | 58 | @@ -391,6 +417,7 @@ sub guess | |
51 | [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], | 59 | [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], | |
52 | ], | 60 | ], | |
53 | "FreeBSD" => [[ \&check_freebsd ]], | 61 | "FreeBSD" => [[ \&check_freebsd ]], | |
54 | + "NetBSD" => [[ \&check_netbsd ]], | 62 | + "NetBSD" => [[ \&check_netbsd ]], | |
55 | "SunOS" => [[ \&check_solaris ]] | 63 | "SunOS" => [[ \&check_solaris ]] | |
56 | ); | 64 | ); | |
57 | 65 |