sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Add FreeBSD 6.X support

Browse source 
* Try a slightly different patch to preserve the locale when authenticating
This commit is contained in:
Joe Marcus Clarke 2004-08-23 17:05:12 +00:00
parent c0c896fe26
commit 59d674b24d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=117142
18 changed files with 412 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/gnome-system-tools/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= gnomesystemtools
PORTVERSION= 0.91.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-tools/0.91

11
sysutils/gnome-system-tools/files/patch-backends_network-conf.in Normal file
View file

@ -0,0 +1,11 @@
--- backends/network-conf.in.orig Mon Aug 23 12:31:32 2004
+++ backends/network-conf.in Mon Aug 23 12:31:50 2004
@@ -79,7 +79,7 @@
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
"slackware-9.1.0", "slackware-10.0.0",
- "gentoo", "freebsd-5");
+ "gentoo", "freebsd-5", "freebsd-6");
$description =<<"end_of_description;";
Configures all network parameters and interfaces.

64
sysutils/gnome-system-tools/files/patch-backends_network.pl.in Normal file
View file

@ -0,0 +1,64 @@
--- backends/network.pl.in.orig Fri Aug 20 05:25:46 2004
+++ backends/network.pl.in Mon Aug 23 12:50:25 2004
@@ -285,7 +285,8 @@
"slackware-9.1.0" => "redhat-6.2",
"slackware-10.0.0" => "redhat-6.2",
"gentoo" => "debian-2.2",
- "freebsd-5" => "debian-2.2"
+ "freebsd-5" => "debian-2.2",
+ "freebsd-6" => "debian-2.2"
);
return $cmd_map{$dist_map{$gst_dist}};
@@ -1450,6 +1451,7 @@
"slackware-10.0.0" => \&gst_network_deb22_get_file,
"gentoo" => \&gst_network_deb22_get_file,
"freebsd-5" => \&gst_network_deb22_get_file,
+ "freebsd-6" => \&gst_network_deb22_get_file,
);
$proc = $dist_map{$gst_dist};
@@ -3426,6 +3428,7 @@
"slackware-10.0.0" => "",
"gentoo" => "",
"freebsd-5" => "",
+ "freebsd-6" => "",
);
$dev = $dist_map {$gst_dist};
@@ -3548,7 +3551,8 @@
"slackware-9.1.0" => "slackware-9.1.0",
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =
@@ -3960,6 +3964,7 @@
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
"freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
);
my %dist_tables =
@@ -4691,6 +4696,7 @@
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
"freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
);
my %dist_tables =
@@ -5088,7 +5094,8 @@
"slackware-9.1.0" => "slackware-9.1.0",
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =

10
sysutils/gnome-system-tools/files/patch-backends_platform.pl.in Normal file
View file

@ -0,0 +1,10 @@
--- backends/platform.pl.in.orig Mon Aug 23 12:33:17 2004
+++ backends/platform.pl.in Mon Aug 23 12:33:28 2004
@@ -72,6 +72,7 @@
"slackware-10.0.0" => "Slackware 10.0.0",
"freebsd-4" => "FreeBSD 4",
"freebsd-5" => "FreeBSD 5",
+ "freebsd-6" => "FreeBSD 6",
"gentoo" => "Gentoo Linux",
"pld-1.0" => "PLD 1.0 Ra",
"pld-1.1" => "PLD 1.1 Ra",

41
sysutils/gnome-system-tools/files/patch-backends_service.pl.in Normal file
View file

@ -0,0 +1,41 @@
--- backends/service.pl.in.orig Fri Aug 20 05:31:12 2004
+++ backends/service.pl.in Mon Aug 23 12:51:28 2004
@@ -215,7 +215,8 @@
"gentoo" => "gentoo",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
%runlevels=
@@ -235,6 +236,7 @@
"nonetwork" => _("Networkless runlevel")
},
"freebsd-5" => {"rc" => "dude, FreeBSD has no runlevels" },
+ "freebsd-6" => {"rc" => "dude, FreeBSD has no runlevels" },
"slackware-9.1.0" => {"4" => _("Graphical mode") }
);
@@ -1095,6 +1097,10 @@
{
return "rcng";
}
+ elsif ($gst_dist =~ /freebsd-6/)
+ {
+ return "rcng";
+ }
elsif ($gst_dist =~ /gentoo/)
{
return "gentoo";
@@ -1591,7 +1597,8 @@
"gentoo" => \&gst_service_gentoo_get_status,
- "freebsd-5" => \&gst_service_rcng_get_status
+ "freebsd-5" => \&gst_service_rcng_get_status,
+ "freebsd-6" => \&gst_service_rcng_get_status
);
my $proc;

10
sysutils/gnome-system-tools/files/patch-backends_shares-conf.in Normal file
View file

@ -0,0 +1,10 @@
--- backends/shares-conf.in.orig Mon Aug 23 12:34:42 2004
+++ backends/shares-conf.in Mon Aug 23 12:34:54 2004
@@ -92,6 +92,7 @@
"suse-7.0" => "redhat-6.2",
"freebsd-4" => "freebsd-4",
"freebsd-5" => "freebsd-4",
+ "freebsd-6" => "freebsd-4",
"turbolinux-7.0" => "redhat-7.0"
};

31
sysutils/gnome-system-tools/files/patch-backends_time-conf.in Normal file
View file

@ -0,0 +1,31 @@
--- backends/time-conf.in.orig Fri Aug 20 05:32:03 2004
+++ backends/time-conf.in Mon Aug 23 12:53:52 2004
@@ -71,7 +71,7 @@
"slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
"gentoo", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix",
"vine-3.0", "vine-3.1",
- "freebsd-5" );
+ "freebsd-5", "freebsd-6" );
$description =<<"end_of_description;";
Configures your system clock, timezone and time server list.
@@ -478,7 +478,8 @@
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =
@@ -704,7 +705,8 @@
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =

19
sysutils/gnome-system-tools/files/patch-backends_users-conf.in Normal file
View file

@ -0,0 +1,19 @@
--- backends/users-conf.in.orig Mon Aug 23 12:35:34 2004
+++ backends/users-conf.in Mon Aug 23 12:35:53 2004
@@ -76,7 +76,7 @@
"debian-2.2", "debian-3.0", "debian-sarge",
"suse-7.0", "suse-9.0", "turbolinux-7.0",
"slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
- "freebsd-4", "freebsd-5",
+ "freebsd-4", "freebsd-5", "freebsd-6",
"gentoo",
"pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix", "vine-3.0", "vine-3.1");
@@ -350,6 +350,7 @@
'slackware-10.0.0' => $gentoo_logindefs_defaults,
'freebsd-4' => $freebsd_logindefs_defaults,
'freebsd-5' => $freebsd_logindefs_defaults,
+ 'freebsd-6' => $freebsd_logindefs_defaults,
'suse-7.0' => $gentoo_logindefs_defaults,
'suse-9.0' => $gentoo_logindefs_defaults,

39
sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
View file

@ -1,27 +1,26 @@
--- src/common/gst-auth.c.orig Sat Aug 21 01:01:33 2004
+++ src/common/gst-auth.c Sat Aug 21 01:06:24 2004
@@ -300,6 +300,7 @@
--- src/common/gst-auth.c.orig Sun Aug 1 20:04:13 2004
+++ src/common/gst-auth.c Mon Aug 23 13:00:40 2004
@@ -300,14 +300,16 @@
lc_all = getenv ("LC_ALL");
lang = getenv ("LANG");
+#ifndef __FreeBSD__
+ g_string_append (command, "env ");
+
if (lc_all)
g_string_append_printf (command, "export LC_ALL=\"%s\" && ", lc_all);
else if (lc_messages)
@@ -308,6 +309,16 @@
g_string_append_printf (command, "export LANG=\"%s\" && ", lang);
else if (language)
g_string_append_printf (command, "export LANGUAGE=\"%s\" && ", language);
+#else
+ if (lc_all)
+ g_string_append_printf (command, "env LC_ALL=\"%s\" ", lc_all);
+ else if (lc_messages)
+ g_string_append_printf (command, "env LC_MESSAGES=\"%s\" ", lc_messages);
+ else if (lang)
+ g_string_append_printf (command, "env LANG=\"%s\" ", lang);
+ else if (language)
+ g_string_append_printf (command, "env LANGUAGE=\"%s\" ", language);
+#endif
- g_string_append_printf (command, "export LC_ALL=\"%s\" && ", lc_all);
- else if (lc_messages)
- g_string_append_printf (command, "export LC_MESSAGES=\"%s\" && ", lc_messages);
- else if (lang)
- g_string_append_printf (command, "export LANG=\"%s\" && ", lang);
- else if (language)
- g_string_append_printf (command, "export LANGUAGE=\"%s\" && ", language);
+ g_string_append_printf (command, "LC_ALL=\"%s\" ", lc_all);
+ if (lc_messages)
+ g_string_append_printf (command, "LC_MESSAGES=\"%s\" ", lc_messages);
+ if (lang)
+ g_string_append_printf (command, "LANG=\"%s\" ", lang);
+ if (language)
+ g_string_append_printf (command, "LANGUAGE=\"%s\" ", language);
}
void

2
sysutils/gnomesystemtools/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= gnomesystemtools
PORTVERSION= 0.91.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-tools/0.91

11
sysutils/gnomesystemtools/files/patch-backends_network-conf.in Normal file
View file

@ -0,0 +1,11 @@
--- backends/network-conf.in.orig Mon Aug 23 12:31:32 2004
+++ backends/network-conf.in Mon Aug 23 12:31:50 2004
@@ -79,7 +79,7 @@
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
"slackware-9.1.0", "slackware-10.0.0",
- "gentoo", "freebsd-5");
+ "gentoo", "freebsd-5", "freebsd-6");
$description =<<"end_of_description;";
Configures all network parameters and interfaces.

64
sysutils/gnomesystemtools/files/patch-backends_network.pl.in Normal file
View file

@ -0,0 +1,64 @@
--- backends/network.pl.in.orig Fri Aug 20 05:25:46 2004
+++ backends/network.pl.in Mon Aug 23 12:50:25 2004
@@ -285,7 +285,8 @@
"slackware-9.1.0" => "redhat-6.2",
"slackware-10.0.0" => "redhat-6.2",
"gentoo" => "debian-2.2",
- "freebsd-5" => "debian-2.2"
+ "freebsd-5" => "debian-2.2",
+ "freebsd-6" => "debian-2.2"
);
return $cmd_map{$dist_map{$gst_dist}};
@@ -1450,6 +1451,7 @@
"slackware-10.0.0" => \&gst_network_deb22_get_file,
"gentoo" => \&gst_network_deb22_get_file,
"freebsd-5" => \&gst_network_deb22_get_file,
+ "freebsd-6" => \&gst_network_deb22_get_file,
);
$proc = $dist_map{$gst_dist};
@@ -3426,6 +3428,7 @@
"slackware-10.0.0" => "",
"gentoo" => "",
"freebsd-5" => "",
+ "freebsd-6" => "",
);
$dev = $dist_map {$gst_dist};
@@ -3548,7 +3551,8 @@
"slackware-9.1.0" => "slackware-9.1.0",
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =
@@ -3960,6 +3964,7 @@
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
"freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
);
my %dist_tables =
@@ -4691,6 +4696,7 @@
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
"freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
);
my %dist_tables =
@@ -5088,7 +5094,8 @@
"slackware-9.1.0" => "slackware-9.1.0",
"slackware-10.0.0" => "slackware-9.1.0",
"gentoo" => "gentoo",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =

10
sysutils/gnomesystemtools/files/patch-backends_platform.pl.in Normal file
View file

@ -0,0 +1,10 @@
--- backends/platform.pl.in.orig Mon Aug 23 12:33:17 2004
+++ backends/platform.pl.in Mon Aug 23 12:33:28 2004
@@ -72,6 +72,7 @@
"slackware-10.0.0" => "Slackware 10.0.0",
"freebsd-4" => "FreeBSD 4",
"freebsd-5" => "FreeBSD 5",
+ "freebsd-6" => "FreeBSD 6",
"gentoo" => "Gentoo Linux",
"pld-1.0" => "PLD 1.0 Ra",
"pld-1.1" => "PLD 1.1 Ra",

41
sysutils/gnomesystemtools/files/patch-backends_service.pl.in Normal file
View file

@ -0,0 +1,41 @@
--- backends/service.pl.in.orig Fri Aug 20 05:31:12 2004
+++ backends/service.pl.in Mon Aug 23 12:51:28 2004
@@ -215,7 +215,8 @@
"gentoo" => "gentoo",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
%runlevels=
@@ -235,6 +236,7 @@
"nonetwork" => _("Networkless runlevel")
},
"freebsd-5" => {"rc" => "dude, FreeBSD has no runlevels" },
+ "freebsd-6" => {"rc" => "dude, FreeBSD has no runlevels" },
"slackware-9.1.0" => {"4" => _("Graphical mode") }
);
@@ -1095,6 +1097,10 @@
{
return "rcng";
}
+ elsif ($gst_dist =~ /freebsd-6/)
+ {
+ return "rcng";
+ }
elsif ($gst_dist =~ /gentoo/)
{
return "gentoo";
@@ -1591,7 +1597,8 @@
"gentoo" => \&gst_service_gentoo_get_status,
- "freebsd-5" => \&gst_service_rcng_get_status
+ "freebsd-5" => \&gst_service_rcng_get_status,
+ "freebsd-6" => \&gst_service_rcng_get_status
);
my $proc;

10
sysutils/gnomesystemtools/files/patch-backends_shares-conf.in Normal file
View file

@ -0,0 +1,10 @@
--- backends/shares-conf.in.orig Mon Aug 23 12:34:42 2004
+++ backends/shares-conf.in Mon Aug 23 12:34:54 2004
@@ -92,6 +92,7 @@
"suse-7.0" => "redhat-6.2",
"freebsd-4" => "freebsd-4",
"freebsd-5" => "freebsd-4",
+ "freebsd-6" => "freebsd-4",
"turbolinux-7.0" => "redhat-7.0"
};

31
sysutils/gnomesystemtools/files/patch-backends_time-conf.in Normal file
View file

@ -0,0 +1,31 @@
--- backends/time-conf.in.orig Fri Aug 20 05:32:03 2004
+++ backends/time-conf.in Mon Aug 23 12:53:52 2004
@@ -71,7 +71,7 @@
"slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
"gentoo", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix",
"vine-3.0", "vine-3.1",
- "freebsd-5" );
+ "freebsd-5", "freebsd-6" );
$description =<<"end_of_description;";
Configures your system clock, timezone and time server list.
@@ -478,7 +478,8 @@
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =
@@ -704,7 +705,8 @@
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
- "freebsd-5" => "freebsd-5"
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5"
);
my %dist_tables =

19
sysutils/gnomesystemtools/files/patch-backends_users-conf.in Normal file
View file

@ -0,0 +1,19 @@
--- backends/users-conf.in.orig Mon Aug 23 12:35:34 2004
+++ backends/users-conf.in Mon Aug 23 12:35:53 2004
@@ -76,7 +76,7 @@
"debian-2.2", "debian-3.0", "debian-sarge",
"suse-7.0", "suse-9.0", "turbolinux-7.0",
"slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
- "freebsd-4", "freebsd-5",
+ "freebsd-4", "freebsd-5", "freebsd-6",
"gentoo",
"pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix", "vine-3.0", "vine-3.1");
@@ -350,6 +350,7 @@
'slackware-10.0.0' => $gentoo_logindefs_defaults,
'freebsd-4' => $freebsd_logindefs_defaults,
'freebsd-5' => $freebsd_logindefs_defaults,
+ 'freebsd-6' => $freebsd_logindefs_defaults,
'suse-7.0' => $gentoo_logindefs_defaults,
'suse-9.0' => $gentoo_logindefs_defaults,

39
sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c
View file

@ -1,27 +1,26 @@
--- src/common/gst-auth.c.orig Sat Aug 21 01:01:33 2004
+++ src/common/gst-auth.c Sat Aug 21 01:06:24 2004
@@ -300,6 +300,7 @@
--- src/common/gst-auth.c.orig Sun Aug 1 20:04:13 2004
+++ src/common/gst-auth.c Mon Aug 23 13:00:40 2004
@@ -300,14 +300,16 @@
lc_all = getenv ("LC_ALL");
lang = getenv ("LANG");
+#ifndef __FreeBSD__
+ g_string_append (command, "env ");
+
if (lc_all)
g_string_append_printf (command, "export LC_ALL=\"%s\" && ", lc_all);
else if (lc_messages)
@@ -308,6 +309,16 @@
g_string_append_printf (command, "export LANG=\"%s\" && ", lang);
else if (language)
g_string_append_printf (command, "export LANGUAGE=\"%s\" && ", language);
+#else
+ if (lc_all)
+ g_string_append_printf (command, "env LC_ALL=\"%s\" ", lc_all);
+ else if (lc_messages)
+ g_string_append_printf (command, "env LC_MESSAGES=\"%s\" ", lc_messages);
+ else if (lang)
+ g_string_append_printf (command, "env LANG=\"%s\" ", lang);
+ else if (language)
+ g_string_append_printf (command, "env LANGUAGE=\"%s\" ", language);
+#endif
- g_string_append_printf (command, "export LC_ALL=\"%s\" && ", lc_all);
- else if (lc_messages)
- g_string_append_printf (command, "export LC_MESSAGES=\"%s\" && ", lc_messages);
- else if (lang)
- g_string_append_printf (command, "export LANG=\"%s\" && ", lang);
- else if (language)
- g_string_append_printf (command, "export LANGUAGE=\"%s\" && ", language);
+ g_string_append_printf (command, "LC_ALL=\"%s\" ", lc_all);
+ if (lc_messages)
+ g_string_append_printf (command, "LC_MESSAGES=\"%s\" ", lc_messages);
+ if (lang)
+ g_string_append_printf (command, "LANG=\"%s\" ", lang);
+ if (language)
+ g_string_append_printf (command, "LANGUAGE=\"%s\" ", language);
}
void