summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sysutils/gnome-system-tools/Makefile4
-rw-r--r--sysutils/gnome-system-tools/distinfo4
-rw-r--r--sysutils/gnome-system-tools/files/patch-backends_replace.pl.in33
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_network_location.c11
-rw-r--r--sysutils/gnome-system-tools/pkg-plist8
-rw-r--r--sysutils/gnomesystemtools/Makefile4
-rw-r--r--sysutils/gnomesystemtools/distinfo4
-rw-r--r--sysutils/gnomesystemtools/files/patch-backends_replace.pl.in33
-rw-r--r--sysutils/gnomesystemtools/files/patch-src_network_location.c11
-rw-r--r--sysutils/gnomesystemtools/pkg-plist8
10 files changed, 62 insertions, 58 deletions
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index c590a9f4f..99fb047e9 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomesystemtools
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.1
@@ -31,7 +31,7 @@ GCONF_SCHEMAS= gnome-system-tools.schemas
.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 500000
+.if ${OSVERSION} >= 500000
CONFIGURE_ARGS+= --enable-services
PLIST_SUB+= SERVICES=""
.else
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index cb4564fa2..70a8aad42 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-1.1.0.tar.bz2) = a42bf8d4fa2d49fe2408ea756406b48b
-SIZE (gnome2/gnome-system-tools-1.1.0.tar.bz2) = 2817929
+MD5 (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 5d0188cb28e60c3f53922d16b0ccb6d5
+SIZE (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 2728912
diff --git a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in
index 7f7cce28e..812682458 100644
--- a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in
+++ b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in
@@ -1,29 +1,24 @@
---- backends/replace.pl.in.orig Fri Oct 22 02:41:56 2004
-+++ backends/replace.pl.in Fri Oct 22 02:42:48 2004
-@@ -1113,19 +1113,19 @@
+--- backends/replace.pl.in.orig Tue Dec 21 11:17:14 2004
++++ backends/replace.pl.in Thu Dec 23 13:14:41 2004
+@@ -1128,7 +1128,7 @@
- return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface));
-
-- delete $$buff[$line_no];
-+ splice @{$buff},$line_no,1;
- $line_no ++;
-
- while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1)
+ while ($line_no < $line_end)
{
- delete $$buff[$line_no];
+ splice @{$buff},$line_no,1;
- $line_no ++;
+ $line_no++;
}
+
+@@ -1140,7 +1140,7 @@
- $line_no = 0;
- if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface))
- {
-- delete $$buff[$line_no];
-+ splice @{$buff},$line_no,1;
+ while ($line_no < $line_end)
+ {
+- delete $$buff[$line_no];
++ splice @{$buff},$line_no,1;
+ $line_no++;
+ }
}
-
- &gst_file_buffer_clean ($buff);
-@@ -1663,7 +1663,7 @@
+@@ -1680,7 +1680,7 @@
}
else
{
diff --git a/sysutils/gnome-system-tools/files/patch-src_network_location.c b/sysutils/gnome-system-tools/files/patch-src_network_location.c
new file mode 100644
index 000000000..e2577a6a4
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_network_location.c
@@ -0,0 +1,11 @@
+--- src/network/location.c.orig Thu Dec 23 13:16:33 2004
++++ src/network/location.c Thu Dec 23 13:16:40 2004
+@@ -687,7 +687,7 @@
+ static void
+ copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[])
+ {
+- gchar **string = (gchar **) list;;
++ gchar **string = (gchar **) list;
+ gchar *value;
+
+ while (*string)
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index a29c31d7e..9c7ac9494 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -4,12 +4,6 @@ bin/network-admin
bin/shares-admin
bin/time-admin
bin/users-admin
-etc/X11/sysconfig/disks.desktop
-etc/X11/sysconfig/network.desktop
-%%SERVICES%%etc/X11/sysconfig/services.desktop
-etc/X11/sysconfig/shares.desktop
-etc/X11/sysconfig/time.desktop
-etc/X11/sysconfig/users.desktop
lib/bonobo/libgst-shares-component.so
libdata/bonobo/servers/GST_Shares_Component.server
libdata/pkgconfig/gnome-system-tools.pc
@@ -26,6 +20,7 @@ share/gnome-system-tools/pixmaps/16_ethernet.xpm
share/gnome-system-tools/pixmaps/16_loopback.xpm
share/gnome-system-tools/pixmaps/16_plip.xpm
share/gnome-system-tools/pixmaps/16_ppp.xpm
+share/gnome-system-tools/pixmaps/archlinux.png
share/gnome-system-tools/pixmaps/black_panther.png
share/gnome-system-tools/pixmaps/boot.png
share/gnome-system-tools/pixmaps/computer.png
@@ -131,6 +126,7 @@ share/locale/eu/LC_MESSAGES/setup-tools-backends.mo
share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
share/locale/fi/LC_MESSAGES/setup-tools-backends.mo
share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
+share/locale/fr/LC_MESSAGES/setup-tools-backends.mo
share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
share/locale/gu/LC_MESSAGES/setup-tools-backends.mo
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index c590a9f4f..99fb047e9 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomesystemtools
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.1
@@ -31,7 +31,7 @@ GCONF_SCHEMAS= gnome-system-tools.schemas
.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 500000
+.if ${OSVERSION} >= 500000
CONFIGURE_ARGS+= --enable-services
PLIST_SUB+= SERVICES=""
.else
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index cb4564fa2..70a8aad42 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-1.1.0.tar.bz2) = a42bf8d4fa2d49fe2408ea756406b48b
-SIZE (gnome2/gnome-system-tools-1.1.0.tar.bz2) = 2817929
+MD5 (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 5d0188cb28e60c3f53922d16b0ccb6d5
+SIZE (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 2728912
diff --git a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in
index 7f7cce28e..812682458 100644
--- a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in
+++ b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in
@@ -1,29 +1,24 @@
---- backends/replace.pl.in.orig Fri Oct 22 02:41:56 2004
-+++ backends/replace.pl.in Fri Oct 22 02:42:48 2004
-@@ -1113,19 +1113,19 @@
+--- backends/replace.pl.in.orig Tue Dec 21 11:17:14 2004
++++ backends/replace.pl.in Thu Dec 23 13:14:41 2004
+@@ -1128,7 +1128,7 @@
- return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface));
-
-- delete $$buff[$line_no];
-+ splice @{$buff},$line_no,1;
- $line_no ++;
-
- while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1)
+ while ($line_no < $line_end)
{
- delete $$buff[$line_no];
+ splice @{$buff},$line_no,1;
- $line_no ++;
+ $line_no++;
}
+
+@@ -1140,7 +1140,7 @@
- $line_no = 0;
- if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface))
- {
-- delete $$buff[$line_no];
-+ splice @{$buff},$line_no,1;
+ while ($line_no < $line_end)
+ {
+- delete $$buff[$line_no];
++ splice @{$buff},$line_no,1;
+ $line_no++;
+ }
}
-
- &gst_file_buffer_clean ($buff);
-@@ -1663,7 +1663,7 @@
+@@ -1680,7 +1680,7 @@
}
else
{
diff --git a/sysutils/gnomesystemtools/files/patch-src_network_location.c b/sysutils/gnomesystemtools/files/patch-src_network_location.c
new file mode 100644
index 000000000..e2577a6a4
--- /dev/null
+++ b/sysutils/gnomesystemtools/files/patch-src_network_location.c
@@ -0,0 +1,11 @@
+--- src/network/location.c.orig Thu Dec 23 13:16:33 2004
++++ src/network/location.c Thu Dec 23 13:16:40 2004
+@@ -687,7 +687,7 @@
+ static void
+ copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[])
+ {
+- gchar **string = (gchar **) list;;
++ gchar **string = (gchar **) list;
+ gchar *value;
+
+ while (*string)
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index a29c31d7e..9c7ac9494 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -4,12 +4,6 @@ bin/network-admin
bin/shares-admin
bin/time-admin
bin/users-admin
-etc/X11/sysconfig/disks.desktop
-etc/X11/sysconfig/network.desktop
-%%SERVICES%%etc/X11/sysconfig/services.desktop
-etc/X11/sysconfig/shares.desktop
-etc/X11/sysconfig/time.desktop
-etc/X11/sysconfig/users.desktop
lib/bonobo/libgst-shares-component.so
libdata/bonobo/servers/GST_Shares_Component.server
libdata/pkgconfig/gnome-system-tools.pc
@@ -26,6 +20,7 @@ share/gnome-system-tools/pixmaps/16_ethernet.xpm
share/gnome-system-tools/pixmaps/16_loopback.xpm
share/gnome-system-tools/pixmaps/16_plip.xpm
share/gnome-system-tools/pixmaps/16_ppp.xpm
+share/gnome-system-tools/pixmaps/archlinux.png
share/gnome-system-tools/pixmaps/black_panther.png
share/gnome-system-tools/pixmaps/boot.png
share/gnome-system-tools/pixmaps/computer.png
@@ -131,6 +126,7 @@ share/locale/eu/LC_MESSAGES/setup-tools-backends.mo
share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
share/locale/fi/LC_MESSAGES/setup-tools-backends.mo
share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
+share/locale/fr/LC_MESSAGES/setup-tools-backends.mo
share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
share/locale/gu/LC_MESSAGES/setup-tools-backends.mo