6 files changed, 21 insertions, 140 deletions

diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index a9cd9023c3d4..d1337f7c2985 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		gnomebaker
-PORTVERSION=		0.5.1
-PORTREVISION=		1
+PORTVERSION=		0.6.1
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomebaker
@@ -19,14 +18,13 @@ OPTIONS=		DVD "Enable DVD support" off \
 			CJK "Use cdrtools-cjk instead of cdrtools" off
 
 USE_XLIB=		yes
-USE_BZIP2=		yes
 USE_GNOME=		gnomeprefix gnomehack libgnomeui desktopfileutils
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 INSTALLS_OMF=		yes
 USE_GCC=		3.4+
 USE_GETTEXT=		yes
-USE_GSTREAMER80=	vorbis mad flac
+USE_GSTREAMER=		vorbis mad flac
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/gnomebaker/distinfo b/sysutils/gnomebaker/distinfo
index a017bf744732..4f8a5a325dac 100644
--- a/sysutils/gnomebaker/distinfo
+++ b/sysutils/gnomebaker/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnomebaker-0.5.1.tar.bz2) = 45aef11c945904edc9fcf73e40eb2785
-SHA256 (gnome2/gnomebaker-0.5.1.tar.bz2) = 71a902cf66859a9eaeccedda2f400b978e5ef06911fce43da2ebb4a718e84d0c
-SIZE (gnome2/gnomebaker-0.5.1.tar.bz2) = 941026
+MD5 (gnome2/gnomebaker-0.6.1.tar.gz) = 5ddffd4ae02417a3fd91b08951e7f434
+SHA256 (gnome2/gnomebaker-0.6.1.tar.gz) = bca2306042405779881bd72fb4824c93ccd79328a811f52b3dcd037b01d3b129
+SIZE (gnome2/gnomebaker-0.6.1.tar.gz) = 1235841
diff --git a/sysutils/gnomebaker/files/patch-src-burn.c b/sysutils/gnomebaker/files/patch-src-burn.c
deleted file mode 100644
index bdced90cdde8..000000000000
--- a/sysutils/gnomebaker/files/patch-src-burn.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/burn.c.orig	Thu Feb  9 21:31:51 2006
-+++ src/burn.c	Thu Feb  9 21:32:11 2006
-@@ -378,6 +378,7 @@
- 		burn_run_process();
-         startdlg_delete(dlg);
- 	}*/
-+    void burn_test();
-     burn_test();
- }
- 
diff --git a/sysutils/gnomebaker/files/patch-src-devices.c b/sysutils/gnomebaker/files/patch-src-devices.c
deleted file mode 100644
index f20367c198a0..000000000000
--- a/sysutils/gnomebaker/files/patch-src-devices.c
+++ /dev/null
@@ -1,98 +0,0 @@
---- src/devices.c.orig	Fri Mar 24 20:07:57 2006
-+++ src/devices.c	Fri Mar 24 20:11:24 2006
-@@ -373,9 +373,9 @@
- 	gchar* buffer = NULL;
-     exec_run_cmd(command, &buffer);
- 	if(buffer == NULL)
--		g_critical("devices_probe_bus - Failed to scan the scsi bus");
-+		g_warning("devices_probe_bus - Failed to scan the scsi bus");
- 	else if(!devices_parse_cdrecord_output(buffer, bus))
--		g_critical("devices_probe_bus - failed to parse cdrecord output");
-+		g_warning("devices_probe_bus - failed to parse cdrecord output");
- 	else
- 		ok = TRUE;	
- 	g_free(buffer);
-@@ -404,7 +404,7 @@
- 	}
- 	else
- 	{
--		g_critical("Failed to open %s", file);
-+		g_warning("Failed to open %s", file);
- 	}
- 	g_free(file);
- }
-@@ -423,11 +423,11 @@
- 	gchar **device_strs = NULL, **devices = NULL;	
- 	if((devices = gbcommon_get_file_as_list("/proc/scsi/sg/devices")) == NULL)
- 	{
--		g_critical("Failed to open /proc/scsi/sg/devices");
-+		g_warning("Failed to open /proc/scsi/sg/devices");
- 	}
- 	else if((device_strs = gbcommon_get_file_as_list("/proc/scsi/sg/device_strs")) == NULL)
- 	{
--		g_critical("Failed to open /proc/scsi/sg/device_strs");
-+		g_warning("Failed to open /proc/scsi/sg/device_strs");
- 	}
- 	else
- 	{
-@@ -443,7 +443,7 @@
- 				if(sscanf(*device, "%d\t%*d\t%d\t%d\t%d", 
- 					&scsihost, &scsiid, &scsilun, &scsitype) != 4)
- 				{
--					g_critical("Error reading scsi information from /proc/scsi/sg/devices");
-+					g_warning("Error reading scsi information from /proc/scsi/sg/devices");
- 				}			
- 				/* 5 is the magic number according to lib-nautilus-burn */
- 				else if(scsitype == 5)
-@@ -560,7 +560,7 @@
- 	gchar **info = NULL;
- 	if((info = gbcommon_get_file_as_list("/proc/sys/dev/cdrom/info")) == NULL)
- 	{
--		g_critical("Failed to open /proc/sys/dev/cdrom/info");
-+		g_warning("Failed to open /proc/sys/dev/cdrom/info");
- 	}
- 	else
- 	{
-@@ -686,7 +686,7 @@
-     g_free(device);
- 	if(cdrom < 0)
- 	{
--        g_critical("Error opening device %s",device);
-+        g_warning("Error opening device %s",device);
-    	}
-     else
-     {			
-@@ -695,10 +695,10 @@
-         if(ioctl(cdrom, CDIOCEJECT, 0) < 0)
-             ret = TRUE;
-         else 
--            g_critical("devices_eject_disk - ioctl failed");
-+            g_warning("devices_eject_disk - ioctl failed");
- #else        
-         if(ioctl(cdrom, CDROMEJECT, 0) < 0)
--            g_critical("devices_eject_disk - ioctl failed");
-+            g_warning("devices_eject_disk - ioctl failed");
-         else
-             ret = TRUE;
- #endif                
-@@ -723,9 +723,9 @@
- 	
- 	GString* buffer = exec_run_cmd(command);
- 	if(buffer == NULL)
--		g_critical("devices_get_max_speed_for_drive - Failed to scan the scsi bus");
-+		g_warning("devices_get_max_speed_for_drive - Failed to scan the scsi bus");
- 	else if(!devices_parse_cdrecord_output(buffer->str, bus))	
--		g_critical("devices_get_max_speed_for_drive - failed to parse cdrecord output");
-+		g_warning("devices_get_max_speed_for_drive - failed to parse cdrecord output");
- 	else
- 		ok = TRUE;
- 	
-@@ -749,7 +749,7 @@
-     close(fd);
-     if (ret == -1)
- 	{
--		g_critical("devices_is_disk_inserted - ioctl failed");
-+		g_warning("devices_is_disk_inserted - ioctl failed");
-     }
-     else 
-     {
diff --git a/sysutils/gnomebaker/files/patch-src-exec.c b/sysutils/gnomebaker/files/patch-src-exec.c
deleted file mode 100644
index 5f2073e507fb..000000000000
--- a/sysutils/gnomebaker/files/patch-src-exec.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/exec.c.orig	Thu Feb  9 21:22:24 2006
-+++ src/exec.c	Thu Feb  9 21:22:50 2006
-@@ -23,6 +23,9 @@
- #include <sys/wait.h>
- #include "gbcommon.h"
- 
-+#if defined (__FreeBSD__)
-+#include <signal.h>
-+#endif
- 
- static gint child_child_pipe[2];
- 
diff --git a/sysutils/gnomebaker/pkg-plist b/sysutils/gnomebaker/pkg-plist
index b86fab8cde0f..41ea1cbf5aac 100644
--- a/sysutils/gnomebaker/pkg-plist
+++ b/sysutils/gnomebaker/pkg-plist
@@ -44,6 +44,8 @@ share/gnome/help/gnomebaker/C/figures/gnomebaker_window.png
 share/gnome/help/gnomebaker/C/gnomebaker.xml
 share/gnome/help/gnomebaker/C/legal.xml
 share/gnome/omf/gnomebaker/gnomebaker-C.omf
+share/icons/hicolor/48x48/apps/gnomebaker-48.png
+share/icons/hicolor/icon-theme.cache
 share/locale/af/LC_MESSAGES/gnomebaker.mo
 share/locale/az/LC_MESSAGES/gnomebaker.mo
 share/locale/bg/LC_MESSAGES/gnomebaker.mo
@@ -107,24 +109,16 @@ share/locale/sl/LC_MESSAGES/gnomebaker.mo
 share/locale/sr/LC_MESSAGES/gnomebaker.mo
 share/locale/st/LC_MESSAGES/gnomebaker.mo
 share/locale/sv/LC_MESSAGES/gnomebaker.mo
-share/locale/sv_SE/LC_MESSAGES/gnomebaker.mo
 share/locale/te/LC_MESSAGES/gnomebaker.mo
 share/locale/tl/LC_MESSAGES/gnomebaker.mo
 share/locale/tr/LC_MESSAGES/gnomebaker.mo
 share/locale/uk/LC_MESSAGES/gnomebaker.mo
-share/locale/urd/LC_MESSAGES/gnomebaker.mo
+share/locale/ur/LC_MESSAGES/gnomebaker.mo
 share/locale/yi/LC_MESSAGES/gnomebaker.mo
 share/locale/zh/LC_MESSAGES/gnomebaker.mo
 share/locale/zh_CN/LC_MESSAGES/gnomebaker.mo
 share/locale/zh_HK/LC_MESSAGES/gnomebaker.mo
 share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
-@dirrm share/gnome/omf/gnomebaker
-@dirrm share/gnome/help/gnomebaker/C/figures
-@dirrm share/gnome/help/gnomebaker/C
-@dirrm share/gnome/help/gnomebaker
-@dirrm share/gnome/gnomebaker
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -133,16 +127,14 @@ share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/yi/LC_MESSAGES
 @dirrmtry share/locale/yi
-@dirrmtry share/locale/urd/LC_MESSAGES
-@dirrmtry share/locale/urd
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/uk
 @dirrmtry share/locale/tl/LC_MESSAGES
 @dirrmtry share/locale/tl
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@dirrmtry share/locale/sv_SE/LC_MESSAGES
-@dirrmtry share/locale/sv_SE
 @dirrmtry share/locale/st/LC_MESSAGES
 @dirrmtry share/locale/st
 @dirrmtry share/locale/sr/LC_MESSAGES
@@ -201,3 +193,14 @@ share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
 @dirrmtry share/locale/ca
 @dirrmtry share/locale/bo/LC_MESSAGES
 @dirrmtry share/locale/bo
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm share/gnome/omf/gnomebaker
+@dirrm share/gnome/help/gnomebaker/C/figures
+@dirrm share/gnome/help/gnomebaker/C
+@dirrm share/gnome/help/gnomebaker
+@dirrm share/gnome/gnomebaker
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true