Date: Sun, 30 Apr 2006 15:15:45 +0200 (CEST) From: Dominique Goncalves <dominique.goncalves@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96547: [maintainer-update] update sysutils/gnomebaker to 0.5.1 Message-ID: <200604301315.k3UDFjIX030307@djdomics.sceen.net> Resent-Message-ID: <200604301320.k3UDKHI2028620@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96547 >Category: ports >Synopsis: [maintainer-update] update sysutils/gnomebaker to 0.5.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 30 13:20:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dominique Goncalves >Release: FreeBSD 6.1-RC i386 >Organization: djdomics.sceen.net >Environment: System: FreeBSD djdomics.sceen.net 6.1-RC FreeBSD 6.1-RC #50: Sun Apr 16 14:07:26 CEST 2006 root@djdomics.sceen.net:/usr/obj/usr/src/sys/DJDOMICS i386 >Description: Update GnomeBaker to 0.5.1. Note the removal of some patches under files/. Change g_critical to g_warning in devices.c (Obtained from gnomebaker CVS) There is still problem with ioctl used not available on FreeBSD see this post http://gnomebaker.sourceforge.net/forum/viewtopic.php?t=186&highlight=freebsd , patches are welcome :-) >How-To-Repeat: >Fix: --- gnomebaker-0.5.1-4.diff begins here --- diff -ruN gnomebaker.orig/Makefile gnomebaker/Makefile --- gnomebaker.orig/Makefile Sat Feb 25 01:19:55 2006 +++ gnomebaker/Makefile Fri Mar 24 20:04:42 2006 @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= gnomebaker -PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTVERSION= 0.5.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomebaker @@ -19,12 +18,14 @@ CJK "Use cdrtools-cjk instead of cdrtools" off USE_X_PREFIX= yes +USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack libgnomeui desktopfileutils GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes USE_GCC= 3.4+ -USE_GSTREAMER80= vorbis mad flac +USE_GETTEXT= yes +USE_GSTREAMER80= vorbis mad flac CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -41,6 +42,12 @@ .if defined(WITH_DVD) RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif + +post-patch: + @${REINPLACE_CMD} -e 's|docdir = $(datadir)/gnome/help/$(docname)/$(lang)|docdir = $(datadir)/help/$(docname)/$(lang)|' \ + ${WRKSRC}/help/C/Makefile.in + @${REINPLACE_CMD} -e 's|Icon=@prefix@/share/gnomebaker/gnomebaker-48.png|Icon=@prefix@/share/gnome/gnomebaker/gnomebaker-48.png|' \ + ${WRKSRC}/gnomebaker.desktop.in post-install: @-update-desktop-database diff -ruN gnomebaker.orig/distinfo gnomebaker/distinfo --- gnomebaker.orig/distinfo Fri Jan 20 03:56:12 2006 +++ gnomebaker/distinfo Fri Mar 24 20:05:04 2006 @@ -1,3 +1,3 @@ -MD5 (gnome2/gnomebaker-0.5.0.tar.gz) = 728c471403ac35a156eac6680d507388 -SHA256 (gnome2/gnomebaker-0.5.0.tar.gz) = 276aa23419257ea8a41ddaf3d35346cccbf9b17afee23497aaa18e5251729df8 -SIZE (gnome2/gnomebaker-0.5.0.tar.gz) = 1184251 +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 diff -ruN gnomebaker.orig/files/patch-Makefile.in gnomebaker/files/patch-Makefile.in --- gnomebaker.orig/files/patch-Makefile.in Fri Jan 20 03:56:13 2006 +++ gnomebaker/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri Oct 7 20:08:19 2005 -+++ Makefile.in Fri Oct 7 20:08:47 2005 -@@ -217,7 +217,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - SUBDIRS = intl po macros src pixmaps media help --gnomebakerdocdir = ${prefix}/doc/gnomebaker -+gnomebakerdocdir = ${prefix}/share/doc/gnomebaker - gnomebakerdoc_DATA = \ - README\ - COPYING\ diff -ruN gnomebaker.orig/files/patch-help-C-Makefile.in gnomebaker/files/patch-help-C-Makefile.in --- gnomebaker.orig/files/patch-help-C-Makefile.in Fri Jan 20 03:56:13 2006 +++ gnomebaker/files/patch-help-C-Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- help/C/Makefile.in.orig Mon Oct 24 18:31:17 2005 -+++ help/C/Makefile.in Mon Oct 24 18:31:44 2005 -@@ -214,8 +214,7 @@ - # ************* Begin of section some packagers may need to modify ************** - # This variable (docdir) specifies where the documents should be installed. - # This default value should work for most packages. --docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang) --#docdir = $(datadir)/help/$(docname)/$(lang) -+docdir = $(datadir)/help/$(docname)/$(lang) - - # ************** You should not have to edit below this line ******************* - # ** GSt did ... diff -ruN gnomebaker.orig/files/patch-src-burn.c gnomebaker/files/patch-src-burn.c --- gnomebaker.orig/files/patch-src-burn.c Thu Jan 1 01:00:00 1970 +++ gnomebaker/files/patch-src-burn.c Fri Mar 24 20:01:23 2006 @@ -0,0 +1,10 @@ +--- 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 -ruN gnomebaker.orig/files/patch-src-devices.c gnomebaker/files/patch-src-devices.c --- gnomebaker.orig/files/patch-src-devices.c Fri Jan 20 03:56:13 2006 +++ gnomebaker/files/patch-src-devices.c Fri Mar 24 20:13:03 2006 @@ -1,12 +1,98 @@ ---- src/devices.c.orig Wed Oct 26 22:12:18 2005 -+++ src/devices.c Wed Oct 26 22:12:41 2005 -@@ -779,7 +779,8 @@ - gchar* devicename = devices_get_device_config(devicekey, GB_DEVICE_NAME_LABEL); - gchar* message = g_strdup_printf(_("Please insert a disk into the %s"), devicename); - gint ret = GTK_RESPONSE_OK; -- while(!devices_is_disk_inserted(devicekey) && (ret == GTK_RESPONSE_OK)) -+ /* while(!devices_is_disk_inserted(devicekey) && (ret == GTK_RESPONSE_OK)) */ -+ if(!devices_is_disk_inserted(devicekey)) +--- 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 { - devices_eject_disk(devicekey); - ret = gnomebaker_show_msg_dlg(parent, GTK_MESSAGE_INFO, diff -ruN gnomebaker.orig/files/patch-src-exec.c gnomebaker/files/patch-src-exec.c --- gnomebaker.orig/files/patch-src-exec.c Thu Jan 1 01:00:00 1970 +++ gnomebaker/files/patch-src-exec.c Fri Mar 24 20:01:23 2006 @@ -0,0 +1,12 @@ +--- 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 -ruN gnomebaker.orig/files/patch-src-main.c gnomebaker/files/patch-src-main.c --- gnomebaker.orig/files/patch-src-main.c Fri Jan 20 03:56:13 2006 +++ gnomebaker/files/patch-src-main.c Thu Jan 1 01:00:00 1970 @@ -1,16 +0,0 @@ ---- src/main.c.orig Fri Oct 7 19:53:32 2005 -+++ src/main.c Fri Oct 7 19:54:29 2005 -@@ -23,12 +23,12 @@ - # include <config.h> - #endif - -+#include <libintl.h> - #include "gnomebaker.h" - #include <gnome.h> - #include <glade/glade.h> - #include "splashdlg.h" - #include "gbcommon.h" --#include <libintl.h> - #include <locale.h> - #include <gst/gst.h> - diff -ruN gnomebaker.orig/pkg-plist gnomebaker/pkg-plist --- gnomebaker.orig/pkg-plist Fri Jan 20 03:56:12 2006 +++ gnomebaker/pkg-plist Fri Mar 24 20:01:23 2006 @@ -1,14 +1,37 @@ bin/gnomebaker -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README -%%DOCSDIR%%/TODO -%%DOCSDIR%%/omf.make -%%DOCSDIR%%/xmldocs.make -share/applications/gnomebaker.desktop +share/gnome/applications/gnomebaker.desktop +share/gnome/gnomebaker/BurnFailed.wav +share/gnome/gnomebaker/BurnOk.wav +share/gnome/gnomebaker/baker-add-dir.png +share/gnome/gnomebaker/baker-add-files.png +share/gnome/gnomebaker/baker-audio-copy.png +share/gnome/gnomebaker/baker-blank-cdrw.png +share/gnome/gnomebaker/baker-blank-dvdrw.png +share/gnome/gnomebaker/baker-burn-cd.png +share/gnome/gnomebaker/baker-cd-iso.png +share/gnome/gnomebaker/baker-cd.png +share/gnome/gnomebaker/baker-cue-image.png +share/gnome/gnomebaker/baker-data-copy.png +share/gnome/gnomebaker/baker-dvd-iso.png +share/gnome/gnomebaker/baker-import-session.png +share/gnome/gnomebaker/baker-remove-files.png +share/gnome/gnomebaker/gnomebaker-48.png +share/gnome/gnomebaker/gnomebaker.glade +share/gnome/gnomebaker/splash_2.png +share/gnome/gnomebaker/state00.png +share/gnome/gnomebaker/state01.png +share/gnome/gnomebaker/state02.png +share/gnome/gnomebaker/state03.png +share/gnome/gnomebaker/state04.png +share/gnome/gnomebaker/state05.png +share/gnome/gnomebaker/state06.png +share/gnome/gnomebaker/state07.png +share/gnome/gnomebaker/state08.png +share/gnome/gnomebaker/state09.png +share/gnome/gnomebaker/state10.png +share/gnome/gnomebaker/state11.png +share/gnome/gnomebaker/state12.png +share/gnome/gnomebaker/state13.png share/gnome/help/gnomebaker/C/figures/gnomebaker-blank-cdrw.png share/gnome/help/gnomebaker/C/figures/gnomebaker-burn-iso.png share/gnome/help/gnomebaker/C/figures/gnomebaker-copy-audio-cd.png @@ -21,64 +44,89 @@ share/gnome/help/gnomebaker/C/gnomebaker.xml share/gnome/help/gnomebaker/C/legal.xml share/gnome/omf/gnomebaker/gnomebaker-C.omf -%%DATADIR%%/baker-add-dir.png -%%DATADIR%%/baker-add-files.png -%%DATADIR%%/baker-audio-copy.png -%%DATADIR%%/baker-blank-cdrw.png -%%DATADIR%%/baker-blank-dvdrw.png -%%DATADIR%%/baker-burn-cd.png -%%DATADIR%%/baker-cd-iso.png -%%DATADIR%%/baker-cd.png -%%DATADIR%%/baker-cue-image.png -%%DATADIR%%/baker-data-copy.png -%%DATADIR%%/baker-dvd-iso.png -%%DATADIR%%/baker-import-session.png -%%DATADIR%%/baker-remove-files.png -%%DATADIR%%/gnomebaker-48.png -%%DATADIR%%/gnomebaker.glade -%%DATADIR%%/media/BurnFailed.wav -%%DATADIR%%/media/BurnOk.wav -%%DATADIR%%/splash_2.png share/locale/af/LC_MESSAGES/gnomebaker.mo +share/locale/az/LC_MESSAGES/gnomebaker.mo share/locale/bg/LC_MESSAGES/gnomebaker.mo +share/locale/bo/LC_MESSAGES/gnomebaker.mo +share/locale/ca/LC_MESSAGES/gnomebaker.mo share/locale/cs/LC_MESSAGES/gnomebaker.mo share/locale/da/LC_MESSAGES/gnomebaker.mo share/locale/de/LC_MESSAGES/gnomebaker.mo +share/locale/de_AT/LC_MESSAGES/gnomebaker.mo +share/locale/de_CH/LC_MESSAGES/gnomebaker.mo +share/locale/de_DE/LC_MESSAGES/gnomebaker.mo +share/locale/el/LC_MESSAGES/gnomebaker.mo +share/locale/en/LC_MESSAGES/gnomebaker.mo +share/locale/en_AU/LC_MESSAGES/gnomebaker.mo +share/locale/en_CA/LC_MESSAGES/gnomebaker.mo share/locale/en_US/LC_MESSAGES/gnomebaker.mo +share/locale/eo/LC_MESSAGES/gnomebaker.mo share/locale/es/LC_MESSAGES/gnomebaker.mo +share/locale/es_AR/LC_MESSAGES/gnomebaker.mo +share/locale/es_CO/LC_MESSAGES/gnomebaker.mo +share/locale/es_CR/LC_MESSAGES/gnomebaker.mo share/locale/es_ES/LC_MESSAGES/gnomebaker.mo +share/locale/es_MX/LC_MESSAGES/gnomebaker.mo +share/locale/et/LC_MESSAGES/gnomebaker.mo share/locale/eu/LC_MESSAGES/gnomebaker.mo +share/locale/eu_ES/LC_MESSAGES/gnomebaker.mo +share/locale/fa/LC_MESSAGES/gnomebaker.mo +share/locale/fi/LC_MESSAGES/gnomebaker.mo share/locale/fr/LC_MESSAGES/gnomebaker.mo +share/locale/fr_CH/LC_MESSAGES/gnomebaker.mo +share/locale/fr_FR/LC_MESSAGES/gnomebaker.mo +share/locale/gl/LC_MESSAGES/gnomebaker.mo share/locale/he/LC_MESSAGES/gnomebaker.mo share/locale/hr/LC_MESSAGES/gnomebaker.mo +share/locale/hu/LC_MESSAGES/gnomebaker.mo +share/locale/is/LC_MESSAGES/gnomebaker.mo +share/locale/it/LC_MESSAGES/gnomebaker.mo +share/locale/it_IT/LC_MESSAGES/gnomebaker.mo share/locale/ja/LC_MESSAGES/gnomebaker.mo +share/locale/ka/LC_MESSAGES/gnomebaker.mo share/locale/ko/LC_MESSAGES/gnomebaker.mo +share/locale/lt/LC_MESSAGES/gnomebaker.mo share/locale/lv/LC_MESSAGES/gnomebaker.mo +share/locale/mk/LC_MESSAGES/gnomebaker.mo +share/locale/ml/LC_MESSAGES/gnomebaker.mo share/locale/ms/LC_MESSAGES/gnomebaker.mo +share/locale/nb/LC_MESSAGES/gnomebaker.mo +share/locale/nl/LC_MESSAGES/gnomebaker.mo +share/locale/nl_BE/LC_MESSAGES/gnomebaker.mo share/locale/nl_NL/LC_MESSAGES/gnomebaker.mo share/locale/no/LC_MESSAGES/gnomebaker.mo +share/locale/pa/LC_MESSAGES/gnomebaker.mo share/locale/pl/LC_MESSAGES/gnomebaker.mo share/locale/pt/LC_MESSAGES/gnomebaker.mo share/locale/pt_BR/LC_MESSAGES/gnomebaker.mo +share/locale/pt_PT/LC_MESSAGES/gnomebaker.mo share/locale/ro/LC_MESSAGES/gnomebaker.mo share/locale/ru/LC_MESSAGES/gnomebaker.mo share/locale/sk/LC_MESSAGES/gnomebaker.mo +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/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 @unexec /bin/rmdir %D/share/locale/nl_NL/LC_MESSAGES 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/locale/nl_NL 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/locale/en_US 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/locale/sv_SE/LC_MESSAGES 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/locale/sv_SE 2>/dev/null || /usr/bin/true -@dirrm %%DATADIR%%/media -@dirrm %%DATADIR%% -@dirrm share/gnome/omf/gnomebaker @dirrm share/gnome/help/gnomebaker/C/figures @dirrm share/gnome/help/gnomebaker/C @dirrm share/gnome/help/gnomebaker -@dirrm %%DOCSDIR%% +@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 --- gnomebaker-0.5.1-4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604301315.k3UDFjIX030307>