Madman is an advanced digital music organizer. It can catalogue huge amounts

of digital music in different formats, including MP3 and Ogg Vorbis.  It has
flexible querying, tagging, intelligent scoring, and more.

Author: Andreas Kloeckner <inducer@users.sf.net>
WWW: http://madman.sourceforge.net/

PR:		ports/87301
Submitted by:	Daniel Roethlisberger <daniel@roe.ch>

6 files changed, 80 insertions, 0 deletions

diff --git a/audio/madman/files/patch-SConstruct b/audio/madman/files/patch-SConstruct
new file mode 100644
index 000000000000..742f44e73d21
--- /dev/null
+++ b/audio/madman/files/patch-SConstruct
@@ -0,0 +1,20 @@
+--- SConstruct.orig	Thu May 20 16:03:14 2004
++++ SConstruct	Wed Oct 12 01:01:10 2005
+@@ -1,6 +1,8 @@
+ import os
+ import glob
+ 
++SConsignFile()
++
+ opts = Options(	"my_options.py")
+ 
+ opts.Add("qt_directory", "Path to Qt directory", "not specified")
+@@ -112,7 +114,7 @@
+ def CheckForQtAt(context, qtdir):
+   context.Message('Checking for Qt at %s... ' % qtdir)
+   result = AttemptLinkWithVariables(context,
+-      { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include' },
++      { "LINKFLAGS": "-pthread", "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include' },
+       """
+ #include <qapplication.h>
+ int main(int argc, char **argv) { 
diff --git a/audio/madman/files/patch-expatconfig.h b/audio/madman/files/patch-expatconfig.h
new file mode 100644
index 000000000000..c02ef5b95878
--- /dev/null
+++ b/audio/madman/files/patch-expatconfig.h
@@ -0,0 +1,23 @@
+--- expatconfig.h.org	2004-07-29 17:16:48.000000000 +0200
++++ expatconfig.h	2004-07-29 17:17:36.000000000 +0200
+@@ -69,16 +69,16 @@
+ #define HAVE_STRING_H 1
+ 
+ /* Define if you have strlcat */
+-/* #undef HAVE_STRLCAT */
++#define HAVE_STRLCAT
+ 
+ /* Define if you have the strlcat prototype */
+-/* #undef HAVE_STRLCAT_PROTO */
++#define HAVE_STRLCAT_PROTO
+ 
+ /* Define if you have strlcpy */
+-/* #undef HAVE_STRLCPY */
++#define HAVE_STRLCPY
+ 
+ /* Define if you have the strlcpy prototype */
+-/* #undef HAVE_STRLCPY_PROTO */
++#define HAVE_STRLCPY_PROTO
+ 
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #define HAVE_SYS_STAT_H 1
diff --git a/audio/madman/files/patch-main_SConscript b/audio/madman/files/patch-main_SConscript
new file mode 100644
index 000000000000..c6281742469b
--- /dev/null
+++ b/audio/madman/files/patch-main_SConscript
@@ -0,0 +1,10 @@
+--- main/SConscript.orig	Thu May 20 16:03:14 2004
++++ main/SConscript	Wed Oct 12 01:30:29 2005
+@@ -18,6 +18,7 @@
+   myenv.Append(LIBS = "madman" + component)
+ 
+ myenv.Replace(QT_LIB = "qt-mt")
++myenv.Append(LINKFLAGS = "-pthread")
+ 
+ madman_prog = myenv.Program(target = "madman",
+   source = [ "main.cpp" ])
diff --git a/audio/madman/files/patch-ui_auto_tag.cpp b/audio/madman/files/patch-ui_auto_tag.cpp
new file mode 100644
index 000000000000..e66810ee6293
--- /dev/null
+++ b/audio/madman/files/patch-ui_auto_tag.cpp
@@ -0,0 +1,8 @@
+--- ui/auto_tag.cpp.orig	2004-11-08 19:22:02.000000000 +0100
++++ ui/auto_tag.cpp	2004-11-08 19:22:23.000000000 +0100
+@@ -654,4 +654,4 @@
+ 
+ 
+ 
+-#include "moc_auto_tag.cc"
++#include "auto_tag.moc"
diff --git a/audio/madman/files/patch-ui_prefs_dialog.cpp b/audio/madman/files/patch-ui_prefs_dialog.cpp
new file mode 100644
index 000000000000..acf4210e89d2
--- /dev/null
+++ b/audio/madman/files/patch-ui_prefs_dialog.cpp
@@ -0,0 +1,8 @@
+--- ui/prefs_dialog.cpp.orig	2004-11-08 19:22:13.000000000 +0100
++++ ui/prefs_dialog.cpp	2004-11-08 19:22:36.000000000 +0100
+@@ -498,4 +498,4 @@
+     return make_pair(false, false);
+ }
+ 
+-#include "moc_prefs_dialog.cc"
++#include "prefs_dialog.moc"
diff --git a/audio/madman/files/patch-utility_refcnt_ptr.h b/audio/madman/files/patch-utility_refcnt_ptr.h
new file mode 100644
index 000000000000..c8a7b54b993a
--- /dev/null
+++ b/audio/madman/files/patch-utility_refcnt_ptr.h
@@ -0,0 +1,11 @@
+--- utility/refcnt_ptr.h.orig	Wed Oct 12 01:20:34 2005
++++ utility/refcnt_ptr.h	Wed Oct 12 01:20:40 2005
+@@ -109,7 +109,7 @@
+     refcnt_ptr(const refcnt_ptr<T2>& rhs) throw()
+ 	{
+ 	object = rhs.object;
+-	refcnt = rhs.refCnt;
++	refCnt = rhs.refCnt;
+ 	increaseCount();
+ 	}
+