7 files changed, 234 insertions, 46 deletions

diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index a1dae3699baa..1a98fabc145d 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	graveman
-PORTVERSION=	0.3.7
-PORTREVISION=	2
+PORTVERSION=	0.3.12
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.nongnu.org/${PORTNAME}/
+MASTER_SITES=	http://graveman.tuxfamily.org/sources/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-4
 
 MAINTAINER=	toxa@toxahost.ru
 COMMENT=	Another GTK2 frontend for cdrecord, mkisofs, readcd and sox
 
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -24,8 +25,11 @@ USE_GNOME=	libglade2 intlhack gnomehack gnomeprefix
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
+MAN1=		graveman.1
+
 OPTIONS=	MP3 "MP3 Support" off \
-		OGG "OGG Support" off
+		OGG "OGG Support" off \
+		DVD "DVD+RW Support" off
 
 .include <bsd.port.pre.mk>
 
@@ -44,4 +48,8 @@ LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg \
 CONFIGURE_ARGS+=--disable-ogg
 .endif
 
+.if defined(WITH_DVD)
+RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/graveman/distinfo b/sysutils/graveman/distinfo
index 091ffeb7f8d3..f4c3039e5937 100644
--- a/sysutils/graveman/distinfo
+++ b/sysutils/graveman/distinfo
@@ -1,2 +1,3 @@
-MD5 (graveman-0.3.7.tar.bz2) = 1b673421e1f9ab25b7c2091defc686cf
-SIZE (graveman-0.3.7.tar.bz2) = 388396
+MD5 (graveman-0.3.12-4.tar.bz2) = 2b1b807fc60f27ea58d83a5d28a9c6bf
+SHA256 (graveman-0.3.12-4.tar.bz2) = bcd6ea50caed63c481d7c6f602966624b4d0290946d9fe15bb7a387bfae5149b
+SIZE (graveman-0.3.12-4.tar.bz2) = 775383
diff --git a/sysutils/graveman/files/patch-man_Makefile.in b/sysutils/graveman/files/patch-man_Makefile.in
new file mode 100644
index 000000000000..f81baa9fb13b
--- /dev/null
+++ b/sysutils/graveman/files/patch-man_Makefile.in
@@ -0,0 +1,16 @@
+--- man/Makefile.in.bak	Tue May 31 02:08:30 2005
++++ man/Makefile.in	Sat Nov 12 01:53:11 2005
+@@ -329,12 +329,7 @@
+ 	@true
+ 
+ install:
+-	${INSTALL_DATA} -D graveman.man ${DESTDIR}${mandir}/${mansubdir}/graveman.1 ; \
+-        if test "A${USE_NLS}" = "Ayes"; then \
+-		for lang in ${LOCALES}; do \
+-			${INSTALL_DATA} -D "${srcdir}/graveman.$$lang.man" "${DESTDIR}${mandir}/$$lang/${mansubdir}/graveman.1"; \
+-		done \
+-	fi
++	${INSTALL_DATA} graveman.man ${DESTDIR}${mandir}/${mansubdir}/graveman.1 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/sysutils/graveman/files/patch-src_callbacks.c b/sysutils/graveman/files/patch-src_callbacks.c
index b526ed40b1de..a7dbef582958 100644
--- a/sysutils/graveman/files/patch-src_callbacks.c
+++ b/sysutils/graveman/files/patch-src_callbacks.c
@@ -1,23 +1,24 @@
---- src/callbacks.c.orig	Sat Feb 12 17:41:07 2005
-+++ src/callbacks.c	Mon Apr 18 11:13:00 2005
-@@ -392,6 +392,14 @@
+--- src/callbacks.c.orig	Mon May 30 23:53:06 2005
++++ src/callbacks.c	Sat Nov 12 18:15:45 2005
+@@ -416,6 +416,15 @@
  /* enlever des fichiers a graver */
  void gtk_data_removefiles(GtkWidget *Abtn, gpointer Adata)
  {
 +  GtkTreeModel *Ltreedata;
 +  GtkTreeSelection *Lselection;
-+  GList *Lfiles, *Lrefs, *Lnode;
++  GList *Lfiles;
++  GList *Lrefs;
++  GList *Lnode;
 +  gint Ltype;
 +  guint32 Lsizenbr = 0;
 +  GtkTreeIter Liter;
 +  gpointer Lproxy;
-+
-   GHashTable *Lhash = (GHashTable *)Adata;
-   GtkTreeView *Lliste = GTK_TREE_VIEW(g_hash_table_lookup(Lhash, "_current_list"));
- //  gchar *Lprefix = (!strcmp(glade_get_widget_name(Lliste), "LISTEDATA") ? "data" : "dvddata");
-@@ -405,15 +413,12 @@
+   Tgrave *Lg = (Tgrave *)Adata;
+   GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_data(Lg, "_current_list"));
+   GtkProgressBar *Lcontenance;
+@@ -428,15 +437,12 @@
  #if 0  
-   GtkTreeIter *Literboot = g_hash_table_lookup(Lhash, "file_imageboot");
+   GtkTreeIter *Literboot = sc_grave_get_data(Lg, "file_imageboot");
  #endif
 -  GtkTreeModel *Ltreedata = gtk_tree_view_get_model(GTK_TREE_VIEW(Lliste));
 -  GtkTreeSelection *Lselection = gtk_tree_view_get_selection(GTK_TREE_VIEW(Lliste));
@@ -37,12 +38,11 @@
  
    for (Lnode = Lfiles; Lnode; Lnode = Lnode->next) {
      Lrefs = g_list_append(Lrefs, gtk_tree_row_reference_new_proxy(Lproxy, Ltreedata, Lnode->data));
-@@ -860,11 +865,12 @@
-   GHashTable *Lhash = (GHashTable *) Adata;
-   gboolean *Labort = (gboolean *)g_hash_table_lookup(Lhash, "gabort");
-   GtkWidget *Lwindow = GTK_WIDGET(g_hash_table_lookup(Lhash, "window_burn"));
-+  GtkWidget *Lconfirm;
+@@ -883,10 +889,11 @@
+   gboolean *Labort = (gboolean *)sc_grave_get_data(Lg, "gabort");
+   GtkWidget *Lwindow = GTK_WIDGET(sc_grave_get_widget(Lg, "window_burn"));
    gint Lret;
++  GtkWidget *Lconfirm;
  
    g_assert(Labort);
  
diff --git a/sysutils/graveman/files/patch-src_mkisofs.c b/sysutils/graveman/files/patch-src_mkisofs.c
new file mode 100644
index 000000000000..2370ffb10179
--- /dev/null
+++ b/sysutils/graveman/files/patch-src_mkisofs.c
@@ -0,0 +1,18 @@
+--- src/mkisofs.c.orig	Sat May 28 02:37:14 2005
++++ src/mkisofs.c	Sat Nov 12 18:19:14 2005
+@@ -64,6 +64,7 @@
+   const gchar *Ldataabst = gtk_entry_get_text(GTK_ENTRY(sc_grave_get_widgetv(Ag, "%sabst", Aop)));
+   gchar *Lreturn, *Linputcharset = NULL;
+   gchar *Lextra = NULL;
++  gchar *Ldevchar = NULL;
+   GtkTextIter Lstart, Lend;
+   GtkTextBuffer *Lbufappi = gtk_text_view_get_buffer (GTK_TEXT_VIEW (sc_grave_get_widgetv(Ag, "%sappi", Aop)));
+   char *Ldataappi, *Ltmpappi;
+@@ -71,7 +72,6 @@
+   Ltmpappi = gtk_text_iter_get_text (&Lstart, &Lend);
+   Ldataappi = g_strescape(Ltmpappi, "");
+   g_free(Ltmpappi);
+-  gchar *Ldevchar = NULL;
+ 
+   if (!strcmp(Aop, "data")) { /* data cd */
+     gboolean Lrockridge = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, "datarockridge")));
diff --git a/sysutils/graveman/files/patch-src_properties.c b/sysutils/graveman/files/patch-src_properties.c
new file mode 100644
index 000000000000..c453ac243783
--- /dev/null
+++ b/sysutils/graveman/files/patch-src_properties.c
@@ -0,0 +1,22 @@
+--- src/properties.c.orig	Sat May 28 02:37:14 2005
++++ src/properties.c	Sat Nov 12 18:25:19 2005
+@@ -30,8 +30,8 @@
+   GtkListStore *Lmodel;
+ 
+   if (Ainit == TRUE) {
+-    Lmodel = gtk_list_store_new(4, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+     GtkCellRenderer *Lcellrender;
++    Lmodel = gtk_list_store_new(4, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+ 
+     gtk_combo_box_set_model(Acombo, GTK_TREE_MODEL(Lmodel));
+     gtk_cell_layout_clear(GTK_CELL_LAYOUT(Acombo));
+@@ -58,8 +58,8 @@
+   GtkListStore *Lmodel;
+ 
+   if (Ainit == TRUE) {
+-    Lmodel = gtk_list_store_new(4, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+     GtkCellRenderer *Lcellrender;
++    Lmodel = gtk_list_store_new(4, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+ 
+     gtk_combo_box_set_model(Acombo, GTK_TREE_MODEL(Lmodel));
+     gtk_cell_layout_clear(GTK_CELL_LAYOUT(Acombo));
diff --git a/sysutils/graveman/pkg-plist b/sysutils/graveman/pkg-plist
index 3ca5e4538ab0..08840d338f7a 100644
--- a/sysutils/graveman/pkg-plist
+++ b/sysutils/graveman/pkg-plist
@@ -1,20 +1,21 @@
 bin/graveman
 share/gnome/applications/graveman.desktop
+share/gnome/pixmaps/graveman48.png
+share/gnome/graveman/dialog-question3.png
 share/gnome/graveman/dialog_about.glade
+share/gnome/graveman/dialog_add_charset.glade
 share/gnome/graveman/dialog_add_device.glade
+share/gnome/graveman/dialog_charset.glade
 share/gnome/graveman/dialog_confirm_operation.glade
 share/gnome/graveman/dialog_device.glade
 share/gnome/graveman/dialog_media.glade
 share/gnome/graveman/dialog_properties.glade
-share/gnome/graveman/dialog-question3.png
 share/gnome/graveman/dialog_select_operation.glade
 share/gnome/graveman/dialog_welcome.glade
 share/gnome/graveman/erase-cdrw.png
 share/gnome/graveman/file_image.png
 share/gnome/graveman/folder5-petit.png
 share/gnome/graveman/gnome-dev-cdrom-audio-24.png
-share/gnome/graveman/gnome-dev-cdrom-audio.png
-share/gnome/graveman/gnome-dev-cdrom.png
 share/gnome/graveman/gnome-dev-dvdrw-24.png
 share/gnome/graveman/gnome-dev-dvdrw-plus-24.png
 share/gnome/graveman/graveman-main.png
@@ -23,49 +24,171 @@ share/gnome/graveman/graveman32.png
 share/gnome/graveman/graveman48.png
 share/gnome/graveman/graver-petite.png
 share/gnome/graveman/graver.png
-share/gnome/graveman/i-cdrom.png
+share/gnome/graveman/hint.png
 share/gnome/graveman/main-settings.png
-share/gnome/graveman/menu-audio-16.png
-share/gnome/graveman/menu-audio-24.png
-share/gnome/graveman/menu-audio-32.png
-share/gnome/graveman/menu-audio-48.png
-share/gnome/graveman/menu-audio.png
-share/gnome/graveman/menu-copy-16.png
-share/gnome/graveman/menu-copy-24.png
-share/gnome/graveman/menu-copy-32.png
-share/gnome/graveman/menu-copy-48.png
-share/gnome/graveman/menu-copy.png
-share/gnome/graveman/menu-data-16.png
-share/gnome/graveman/menu-data-24.png
-share/gnome/graveman/menu-data-32.png
-share/gnome/graveman/menu-data-48.png
 share/gnome/graveman/menu-data.png
-share/gnome/graveman/menu-other-16.png
-share/gnome/graveman/menu-other-24.png
-share/gnome/graveman/menu-other-32.png
-share/gnome/graveman/menu-other-48.png
-share/gnome/graveman/menu-other.png
 share/gnome/graveman/petit-parametre.png
 share/gnome/graveman/petitcd.png
 share/gnome/graveman/petitcdrw.png
+share/gnome/graveman/petitcharset.png
 share/gnome/graveman/petitdvd.png
 share/gnome/graveman/petitdvdrw.png
 share/gnome/graveman/petitiso.png
 share/gnome/graveman/properties.png
-share/gnome/graveman/stock_id-48.png
+share/gnome/graveman/sort.png
+share/gnome/graveman/sound.png
 share/gnome/graveman/stock_new.png
 share/gnome/graveman/window_burn.glade
 share/gnome/graveman/window_inprogress.glade
 share/gnome/graveman/window_main.glade
+share/gnome/graveman/window_waiting_cd.glade
 share/gnome/graveman/window_welcome.glade
-share/gnome/pixmaps/graveman48.png
+share/gnome/graveman/themes/default/AudioIcon.png
+share/gnome/graveman/themes/default/BADIcon.png
+share/gnome/graveman/themes/default/BurnIcon.png
+share/gnome/graveman/themes/default/BurnsmallIcon.png
+share/gnome/graveman/themes/default/CDIcon.png
+share/gnome/graveman/themes/default/CDRWIcon.png
+share/gnome/graveman/themes/default/CDRWsmallIcon.png
+share/gnome/graveman/themes/default/CDsmallIcon.png
+share/gnome/graveman/themes/default/CharsetSmallIcon.png
+share/gnome/graveman/themes/default/DVDRWsmallIcon.png
+share/gnome/graveman/themes/default/DVDsmallIcon.png
+share/gnome/graveman/themes/default/DirIcon.png
+share/gnome/graveman/themes/default/EraseCDRWIcon.png
+share/gnome/graveman/themes/default/FileIcon.png
+share/gnome/graveman/themes/default/FileImage.png
+share/gnome/graveman/themes/default/ISOsmallIcon.png
+share/gnome/graveman/themes/default/Menu-Audio-16.png
+share/gnome/graveman/themes/default/Menu-Audio-24.png
+share/gnome/graveman/themes/default/Menu-Audio-32.png
+share/gnome/graveman/themes/default/Menu-Audio-48.png
+share/gnome/graveman/themes/default/Menu-Copy-16.png
+share/gnome/graveman/themes/default/Menu-Copy-24.png
+share/gnome/graveman/themes/default/Menu-Copy-32.png
+share/gnome/graveman/themes/default/Menu-Copy-48.png
+share/gnome/graveman/themes/default/Menu-Data-16.png
+share/gnome/graveman/themes/default/Menu-Data-24.png
+share/gnome/graveman/themes/default/Menu-Data-32.png
+share/gnome/graveman/themes/default/Menu-Data-48.png
+share/gnome/graveman/themes/default/Menu-Dvd-16.png
+share/gnome/graveman/themes/default/Menu-Dvd-24.png
+share/gnome/graveman/themes/default/Menu-Dvd-32.png
+share/gnome/graveman/themes/default/Menu-Dvd-48.png
+share/gnome/graveman/themes/default/Menu-Other-16.png
+share/gnome/graveman/themes/default/Menu-Other-24.png
+share/gnome/graveman/themes/default/Menu-Other-32.png
+share/gnome/graveman/themes/default/Menu-Other-48.png
+share/gnome/graveman/themes/default/OKIcon.png
+share/gnome/graveman/themes/default/Themes.png
+share/gnome/graveman/themes/default/WARNIcon.png
+share/gnome/graveman/themes/default/Working.mng
+share/gnome/graveman/themes/default/graveman
+share/gnome/graveman/themes/plainset/AudioIcon.png
+share/gnome/graveman/themes/plainset/BADIcon.png
+share/gnome/graveman/themes/plainset/BurnIcon.png
+share/gnome/graveman/themes/plainset/BurnsmallIcon.png
+share/gnome/graveman/themes/plainset/CDIcon.png
+share/gnome/graveman/themes/plainset/CDRWIcon.png
+share/gnome/graveman/themes/plainset/CDRWsmallIcon.png
+share/gnome/graveman/themes/plainset/CDsmallIcon.png
+share/gnome/graveman/themes/plainset/CharsetSmallIcon.png
+share/gnome/graveman/themes/plainset/DVDRWsmallIcon.png
+share/gnome/graveman/themes/plainset/DVDsmallIcon.png
+share/gnome/graveman/themes/plainset/DirIcon.png
+share/gnome/graveman/themes/plainset/EraseCDRWIcon.png
+share/gnome/graveman/themes/plainset/FileIcon.png
+share/gnome/graveman/themes/plainset/FileImage.png
+share/gnome/graveman/themes/plainset/ISOsmallIcon.png
+share/gnome/graveman/themes/plainset/Menu-Audio-16.png
+share/gnome/graveman/themes/plainset/Menu-Audio-24.png
+share/gnome/graveman/themes/plainset/Menu-Audio-32.png
+share/gnome/graveman/themes/plainset/Menu-Audio-48.png
+share/gnome/graveman/themes/plainset/Menu-Copy-16.png
+share/gnome/graveman/themes/plainset/Menu-Copy-24.png
+share/gnome/graveman/themes/plainset/Menu-Copy-32.png
+share/gnome/graveman/themes/plainset/Menu-Copy-48.png
+share/gnome/graveman/themes/plainset/Menu-Data-16.png
+share/gnome/graveman/themes/plainset/Menu-Data-24.png
+share/gnome/graveman/themes/plainset/Menu-Data-32.png
+share/gnome/graveman/themes/plainset/Menu-Data-48.png
+share/gnome/graveman/themes/plainset/Menu-Dvd-16.png
+share/gnome/graveman/themes/plainset/Menu-Dvd-24.png
+share/gnome/graveman/themes/plainset/Menu-Dvd-32.png
+share/gnome/graveman/themes/plainset/Menu-Dvd-48.png
+share/gnome/graveman/themes/plainset/Menu-Other-16.png
+share/gnome/graveman/themes/plainset/Menu-Other-24.png
+share/gnome/graveman/themes/plainset/Menu-Other-32.png
+share/gnome/graveman/themes/plainset/Menu-Other-48.png
+share/gnome/graveman/themes/plainset/OKIcon.png
+share/gnome/graveman/themes/plainset/Themes.png
+share/gnome/graveman/themes/plainset/WARNIcon.png
+share/gnome/graveman/themes/plainset/Working.mng
+share/gnome/graveman/themes/plainset/graveman
+share/gnome/graveman/themes/isoset/BADIcon.png
+share/gnome/graveman/themes/isoset/DVDRWsmallIcon.png
+share/gnome/graveman/themes/isoset/DVDsmallIcon.png
+share/gnome/graveman/themes/isoset/Menu-Audio-16.png
+share/gnome/graveman/themes/isoset/Menu-Audio-24.png
+share/gnome/graveman/themes/isoset/Menu-Audio-32.png
+share/gnome/graveman/themes/isoset/Menu-Audio-48.png
+share/gnome/graveman/themes/isoset/Menu-Copy-16.png
+share/gnome/graveman/themes/isoset/Menu-Copy-24.png
+share/gnome/graveman/themes/isoset/Menu-Copy-32.png
+share/gnome/graveman/themes/isoset/Menu-Copy-48.png
+share/gnome/graveman/themes/isoset/Menu-Data-16.png
+share/gnome/graveman/themes/isoset/Menu-Data-24.png
+share/gnome/graveman/themes/isoset/Menu-Data-32.png
+share/gnome/graveman/themes/isoset/Menu-Data-48.png
+share/gnome/graveman/themes/isoset/Menu-Dvd-16.png
+share/gnome/graveman/themes/isoset/Menu-Dvd-24.png
+share/gnome/graveman/themes/isoset/Menu-Dvd-32.png
+share/gnome/graveman/themes/isoset/Menu-Dvd-48.png
+share/gnome/graveman/themes/isoset/Menu-Other-16.png
+share/gnome/graveman/themes/isoset/Menu-Other-24.png
+share/gnome/graveman/themes/isoset/Menu-Other-32.png
+share/gnome/graveman/themes/isoset/Menu-Other-48.png
+share/gnome/graveman/themes/isoset/OKIcon.png
+share/gnome/graveman/themes/isoset/WARNIcon.png
+share/gnome/graveman/themes/isoset/graveman
+share/gnome/graveman/themes/essai/Menu-Audio-16.png
+share/gnome/graveman/themes/essai/Menu-Audio-24.png
+share/gnome/graveman/themes/essai/Menu-Audio-32.png
+share/gnome/graveman/themes/essai/Menu-Audio-48.png
+share/gnome/graveman/themes/essai/Menu-Copy-16.png
+share/gnome/graveman/themes/essai/Menu-Copy-24.png
+share/gnome/graveman/themes/essai/Menu-Copy-32.png
+share/gnome/graveman/themes/essai/Menu-Copy-48.png
+share/gnome/graveman/themes/essai/Menu-Data-16.png
+share/gnome/graveman/themes/essai/Menu-Data-24.png
+share/gnome/graveman/themes/essai/Menu-Data-32.png
+share/gnome/graveman/themes/essai/Menu-Data-48.png
+share/gnome/graveman/themes/essai/Menu-Dvd-16.png
+share/gnome/graveman/themes/essai/Menu-Dvd-24.png
+share/gnome/graveman/themes/essai/Menu-Dvd-32.png
+share/gnome/graveman/themes/essai/Menu-Dvd-48.png
+share/gnome/graveman/themes/essai/Menu-Other-16.png
+share/gnome/graveman/themes/essai/Menu-Other-24.png
+share/gnome/graveman/themes/essai/Menu-Other-32.png
+share/gnome/graveman/themes/essai/Menu-Other-48.png
+share/gnome/graveman/themes/essai/graveman
 share/locale/cs/LC_MESSAGES/graveman.mo
 share/locale/de/LC_MESSAGES/graveman.mo
 share/locale/es/LC_MESSAGES/graveman.mo
 share/locale/fr/LC_MESSAGES/graveman.mo
+share/locale/hu/LC_MESSAGES/graveman.mo
 share/locale/it/LC_MESSAGES/graveman.mo
+share/locale/ja/LC_MESSAGES/graveman.mo
+share/locale/lt/LC_MESSAGES/graveman.mo
 share/locale/nl/LC_MESSAGES/graveman.mo
+share/locale/no/LC_MESSAGES/graveman.mo
 share/locale/pl/LC_MESSAGES/graveman.mo
 share/locale/pt_BR/LC_MESSAGES/graveman.mo
 share/locale/ru/LC_MESSAGES/graveman.mo
+share/locale/sv/LC_MESSAGES/graveman.mo
+@dirrm share/gnome/graveman/themes/default
+@dirrm share/gnome/graveman/themes/essai
+@dirrm share/gnome/graveman/themes/isoset
+@dirrm share/gnome/graveman/themes/plainset
+@dirrm share/gnome/graveman/themes
 @dirrm share/gnome/graveman