diff options
| author | eadler <eadler@FreeBSD.org> | 2012-01-07 13:33:05 +0800 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-01-07 13:33:05 +0800 |
| commit | 767fa4cba47d86ba153de435a8b72d72798dc038 (patch) | |
| tree | c43a1f17fd96a1914a3973fb9bde4c641a611f1b | |
| parent | 12501ed4e2081051bab603d17e8c339fd9085f46 (diff) | |
| download | freebsd-ports-gnome-767fa4cba47d86ba153de435a8b72d72798dc038.tar.gz freebsd-ports-gnome-767fa4cba47d86ba153de435a8b72d72798dc038.tar.zst freebsd-ports-gnome-767fa4cba47d86ba153de435a8b72d72798dc038.zip | |
- Fix build with clang (void main - really?)
- Fix functioning on 64 bit systems
PR: ports/160667
Submitted by: Martin Etteldorf <etteldor@gmail.com>
| -rw-r--r-- | audio/xmmix/files/patch-Imakefile (renamed from audio/xmmix/files/patch-ac) | 4 | ||||
| -rw-r--r-- | audio/xmmix/files/patch-XMmix.ad (renamed from audio/xmmix/files/patch-ab) | 4 | ||||
| -rw-r--r-- | audio/xmmix/files/patch-main.c (renamed from audio/xmmix/files/patch-ae) | 13 | ||||
| -rw-r--r-- | audio/xmmix/files/patch-mixer.c | 11 |
4 files changed, 26 insertions, 6 deletions
diff --git a/audio/xmmix/files/patch-ac b/audio/xmmix/files/patch-Imakefile index 550b49a8a76d..79f540669263 100644 --- a/audio/xmmix/files/patch-ac +++ b/audio/xmmix/files/patch-Imakefile @@ -1,5 +1,5 @@ ---- Imakefile.orig Mon Jul 15 02:48:56 1996 -+++ Imakefile Sat Nov 11 10:15:06 2000 +--- ./Imakefile.orig 1996-07-14 13:48:56.000000000 -0400 ++++ ./Imakefile 2012-01-07 00:24:32.000000000 -0500 @@ -43,7 +43,7 @@ * #include "Motif.tmpl" * #include "Motif.rules" diff --git a/audio/xmmix/files/patch-ab b/audio/xmmix/files/patch-XMmix.ad index 5eb85f52c5f5..91df07b95d9b 100644 --- a/audio/xmmix/files/patch-ab +++ b/audio/xmmix/files/patch-XMmix.ad @@ -1,5 +1,5 @@ ---- XMmix.ad.orig Mon Jul 15 02:48:58 1996 -+++ XMmix.ad Sat Nov 11 10:15:08 2000 +--- ./XMmix.ad.orig 1996-07-14 13:48:58.000000000 -0400 ++++ ./XMmix.ad 2012-01-07 00:24:32.000000000 -0500 @@ -26,7 +26,7 @@ !* diff --git a/audio/xmmix/files/patch-ae b/audio/xmmix/files/patch-main.c index 315dc20facb3..fc68a0e4b8ec 100644 --- a/audio/xmmix/files/patch-ae +++ b/audio/xmmix/files/patch-main.c @@ -1,5 +1,5 @@ ---- main.c.orig Sat Mar 23 15:01:57 2002 -+++ main.c Sat Mar 23 15:02:28 2002 +--- ./main.c.orig 1996-11-07 11:01:43.000000000 -0500 ++++ ./main.c 2012-01-07 00:26:29.000000000 -0500 @@ -33,7 +33,7 @@ bool_t exit_flag; /* Flag indicating end of application */ appdata_t app_data; /* Options data */ @@ -9,6 +9,15 @@ /*********************** +@@ -95,7 +95,7 @@ + * main + * The main function + */ +-void ++int + main(int argc, char **argv) + { + XtAppContext app; @@ -103,6 +103,7 @@ /* Initialize variables */ diff --git a/audio/xmmix/files/patch-mixer.c b/audio/xmmix/files/patch-mixer.c new file mode 100644 index 000000000000..b25b96f1038f --- /dev/null +++ b/audio/xmmix/files/patch-mixer.c @@ -0,0 +1,11 @@ +--- ./mixer.c.orig 1996-11-07 11:00:26.000000000 -0500 ++++ ./mixer.c 2012-01-07 00:24:32.000000000 -0500 +@@ -124,7 +124,7 @@ + * Nothing + */ + STATIC void +-do_ioctl(int cmd, int *arg, char *name, int dir) ++do_ioctl(long cmd, int *arg, char *name, int dir) + { + int ret; + char errmsg[STR_BUF_SZ]; |