Update to 1.1.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3422 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 78 insertions, 22 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 99fb047e9..71c50a408 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.1
@@ -25,7 +25,6 @@ USE_LIBTOOL_VER=15
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-boot
 
 GCONF_SCHEMAS=	gnome-system-tools.schemas
 
@@ -35,10 +34,13 @@ GCONF_SCHEMAS=	gnome-system-tools.schemas
 CONFIGURE_ARGS+=	--enable-services
 PLIST_SUB+=		SERVICES=""
 .else
-CONFIGURE_ARGS+=	--disable-services
 PLIST_SUB+=		SERVICES="@comment "
 .endif
 
+.if ${PERL_LEVEL} <= 500800
+RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
 .if ${PERL_LEVEL} < 500600
 post-configure:
 	@${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 70a8aad42..bdf462ded 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 5d0188cb28e60c3f53922d16b0ccb6d5
-SIZE (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 2728912
+MD5 (gnome2/gnome-system-tools-1.1.4.tar.bz2) = 89dfc2ae26336b226235d0cecbe54b93
+SIZE (gnome2/gnome-system-tools-1.1.4.tar.bz2) = 2756742
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
index b854cde3a..dc900ad4e 100644
--- a/sysutils/gnome-system-tools/files/patch-configure
+++ b/sysutils/gnome-system-tools/files/patch-configure
@@ -1,6 +1,33 @@
---- configure.orig	Wed May 26 12:02:51 2004
-+++ configure	Wed May 26 12:03:23 2004
-@@ -22623,7 +22623,7 @@
+--- configure.orig	Thu Jan 13 01:56:41 2005
++++ configure	Thu Jan 13 02:14:07 2005
+@@ -21160,7 +21160,7 @@
+ 
+ 
+ 
+-if test x$enable_boot = xno; then
++if test x$enable_boot = xyes; then
+   BUILD_BOOT_TRUE=
+   BUILD_BOOT_FALSE='#'
+ else
+@@ -21178,7 +21178,7 @@
+ fi
+ 
+ 
+-if test x$enable_services = xno; then
++if test x$enable_services = xyes; then
+   BUILD_SERVICES_TRUE=
+   BUILD_SERVICES_FALSE='#'
+ else
+@@ -21205,7 +21205,7 @@
+ fi
+ 
+ 
+-if test x$enable_disks = xno; then
++if test x$enable_disks = xyes; then
+   BUILD_DISKS_TRUE=
+   BUILD_DISKS_FALSE='#'
+ else
+@@ -22990,7 +22990,7 @@
  GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
  
  GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 9c7ac9494..2e1a08a7c 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -1,4 +1,3 @@
-bin/disks-admin
 bin/network-admin
 %%SERVICES%%bin/services-admin
 bin/shares-admin
@@ -8,6 +7,7 @@ lib/bonobo/libgst-shares-component.so
 libdata/bonobo/servers/GST_Shares_Component.server
 libdata/pkgconfig/gnome-system-tools.pc
 libdata/pkgconfig/system-tools-backends.pc
+share/aclocal/system-tools-backends.m4
 share/gnome-system-tools/interfaces/boot.glade
 share/gnome-system-tools/interfaces/common.glade
 share/gnome-system-tools/interfaces/disks.glade
@@ -65,7 +65,6 @@ share/gnome-system-tools/pixmaps/vine.png
 share/gnome-system-tools/pixmaps/wavelan-16.png
 share/gnome-system-tools/pixmaps/wavelan-48.png
 share/gnome-system-tools/pixmaps/world_map-960.png
-share/gnome/applications/disks.desktop
 share/gnome/applications/network.desktop
 %%SERVICES%%share/gnome/applications/services.desktop
 share/gnome/applications/shares.desktop
@@ -189,7 +188,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo
-share/setup-tool-backends/files/debian_ipchains
+share/setup-tool-backends/files/general_isdn_ppp_options
 share/setup-tool-backends/scripts/boot-conf
 share/setup-tool-backends/scripts/boot-grub.pl
 share/setup-tool-backends/scripts/boot-lilo.pl
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 99fb047e9..71c50a408 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.1
@@ -25,7 +25,6 @@ USE_LIBTOOL_VER=15
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-boot
 
 GCONF_SCHEMAS=	gnome-system-tools.schemas
 
@@ -35,10 +34,13 @@ GCONF_SCHEMAS=	gnome-system-tools.schemas
 CONFIGURE_ARGS+=	--enable-services
 PLIST_SUB+=		SERVICES=""
 .else
-CONFIGURE_ARGS+=	--disable-services
 PLIST_SUB+=		SERVICES="@comment "
 .endif
 
+.if ${PERL_LEVEL} <= 500800
+RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
 .if ${PERL_LEVEL} < 500600
 post-configure:
 	@${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index 70a8aad42..bdf462ded 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 5d0188cb28e60c3f53922d16b0ccb6d5
-SIZE (gnome2/gnome-system-tools-1.1.3.tar.bz2) = 2728912
+MD5 (gnome2/gnome-system-tools-1.1.4.tar.bz2) = 89dfc2ae26336b226235d0cecbe54b93
+SIZE (gnome2/gnome-system-tools-1.1.4.tar.bz2) = 2756742
diff --git a/sysutils/gnomesystemtools/files/patch-configure b/sysutils/gnomesystemtools/files/patch-configure
index b854cde3a..dc900ad4e 100644
--- a/sysutils/gnomesystemtools/files/patch-configure
+++ b/sysutils/gnomesystemtools/files/patch-configure
@@ -1,6 +1,33 @@
---- configure.orig	Wed May 26 12:02:51 2004
-+++ configure	Wed May 26 12:03:23 2004
-@@ -22623,7 +22623,7 @@
+--- configure.orig	Thu Jan 13 01:56:41 2005
++++ configure	Thu Jan 13 02:14:07 2005
+@@ -21160,7 +21160,7 @@
+ 
+ 
+ 
+-if test x$enable_boot = xno; then
++if test x$enable_boot = xyes; then
+   BUILD_BOOT_TRUE=
+   BUILD_BOOT_FALSE='#'
+ else
+@@ -21178,7 +21178,7 @@
+ fi
+ 
+ 
+-if test x$enable_services = xno; then
++if test x$enable_services = xyes; then
+   BUILD_SERVICES_TRUE=
+   BUILD_SERVICES_FALSE='#'
+ else
+@@ -21205,7 +21205,7 @@
+ fi
+ 
+ 
+-if test x$enable_disks = xno; then
++if test x$enable_disks = xyes; then
+   BUILD_DISKS_TRUE=
+   BUILD_DISKS_FALSE='#'
+ else
+@@ -22990,7 +22990,7 @@
  GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
  
  GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index 9c7ac9494..2e1a08a7c 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -1,4 +1,3 @@
-bin/disks-admin
 bin/network-admin
 %%SERVICES%%bin/services-admin
 bin/shares-admin
@@ -8,6 +7,7 @@ lib/bonobo/libgst-shares-component.so
 libdata/bonobo/servers/GST_Shares_Component.server
 libdata/pkgconfig/gnome-system-tools.pc
 libdata/pkgconfig/system-tools-backends.pc
+share/aclocal/system-tools-backends.m4
 share/gnome-system-tools/interfaces/boot.glade
 share/gnome-system-tools/interfaces/common.glade
 share/gnome-system-tools/interfaces/disks.glade
@@ -65,7 +65,6 @@ share/gnome-system-tools/pixmaps/vine.png
 share/gnome-system-tools/pixmaps/wavelan-16.png
 share/gnome-system-tools/pixmaps/wavelan-48.png
 share/gnome-system-tools/pixmaps/world_map-960.png
-share/gnome/applications/disks.desktop
 share/gnome/applications/network.desktop
 %%SERVICES%%share/gnome/applications/services.desktop
 share/gnome/applications/shares.desktop
@@ -189,7 +188,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo
-share/setup-tool-backends/files/debian_ipchains
+share/setup-tool-backends/files/general_isdn_ppp_options
 share/setup-tool-backends/scripts/boot-conf
 share/setup-tool-backends/scripts/boot-grub.pl
 share/setup-tool-backends/scripts/boot-lilo.pl