- Update to version 0.7.5 [1].

- Remove file "files/patch-src__help.cpp" [1].
- Add WITHOUT_NLS support [2].
- Don't remove "share/pixmaps" [2].
- Respect CFLAGS [2].
- Fix building on 5.X and 6.X [2].

PR:		ports/95812 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]
Reworked by:	alepulver [2]
Approved by:	garga (mentor)

2 files changed, 11 insertions, 28 deletions

diff --git a/audio/denemo/files/patch-configure b/audio/denemo/files/patch-configure
new file mode 100644
index 000000000000..b25ce26b806c
--- /dev/null
+++ b/audio/denemo/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	Thu Mar 16 17:32:54 2006
++++ ./configure	Thu May  4 14:45:01 2006
+@@ -1708,7 +1708,7 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++if mkdir -p -- --version >/dev/null 2>&1 && test -d ./--version; then
+   # We used to keeping the `.' as first argument, in order to
+   # allow $(mkdir_p) to be used without argument.  As in
+   #   $(mkdir_p) $(somedir)
diff --git a/audio/denemo/files/patch-src__help.cpp b/audio/denemo/files/patch-src__help.cpp
deleted file mode 100644
index 9417b8c45116..000000000000
--- a/audio/denemo/files/patch-src__help.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/help.cpp.orig	Fri Oct 28 06:18:00 2005
-+++ src/help.cpp	Tue Feb 21 23:23:26 2006
-@@ -46,20 +46,21 @@
- void
- browse_manual (GtkAction * action, gpointer data)
- {
--  gchar *browser = "sensible-browser"; 
-+  struct scoreinfo *si= (struct scoreinfo *)data;
-+
-   gint retval;
-  // struct scoreinfo *si; 
-   GError *error = NULL;
-   gchar **argv;
-   gchar *cmd;
-   gchar *data_dir = gbr_find_data_dir (PKGDATADIR);	
--  gchar *path = g_strdup_printf("%s/denemo/manual/manualout.html", data_dir);
-+  gchar *path = g_strdup_printf("file://%s/manual/manualout.html", data_dir);
-   gchar *argument = g_shell_quote(path); 
-  
-   
--  g_print("PKGDATADIR %s\n", PKGDATADIR);
-+  //g_print("PKGDATADIR %s\n", PKGDATADIR);
-  
--  cmd = g_strconcat (browser, " ", argument, NULL);
-+  cmd = g_strconcat (si->prefs->browser->str, " ", argument, NULL);
-   g_free(argument);
-   if (! g_shell_parse_argv(cmd, NULL, &argv, &error)) 
-     {