From 2c947299d763d63f854092737d77cb61f083cd1e Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 7 Jan 2012 05:33:05 +0000 Subject: - Fix build with clang (void main - really?) - Fix functioning on 64 bit systems PR: ports/160667 Submitted by: Martin Etteldorf --- audio/xmmix/files/patch-Imakefile | 11 +++++++++++ audio/xmmix/files/patch-XMmix.ad | 11 +++++++++++ audio/xmmix/files/patch-ab | 11 ----------- audio/xmmix/files/patch-ac | 11 ----------- audio/xmmix/files/patch-ae | 19 ------------------- audio/xmmix/files/patch-main.c | 28 ++++++++++++++++++++++++++++ audio/xmmix/files/patch-mixer.c | 11 +++++++++++ 7 files changed, 61 insertions(+), 41 deletions(-) create mode 100644 audio/xmmix/files/patch-Imakefile create mode 100644 audio/xmmix/files/patch-XMmix.ad delete mode 100644 audio/xmmix/files/patch-ab delete mode 100644 audio/xmmix/files/patch-ac delete mode 100644 audio/xmmix/files/patch-ae create mode 100644 audio/xmmix/files/patch-main.c create mode 100644 audio/xmmix/files/patch-mixer.c (limited to 'audio/xmmix') diff --git a/audio/xmmix/files/patch-Imakefile b/audio/xmmix/files/patch-Imakefile new file mode 100644 index 000000000000..79f540669263 --- /dev/null +++ b/audio/xmmix/files/patch-Imakefile @@ -0,0 +1,11 @@ +--- ./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" + */ +-LOCAL_LIBRARIES= XmClientLibs ++LOCAL_LIBRARIES= ${MOTIFLIB} ${XTOOLLIB} ${XLIB} + + + /* diff --git a/audio/xmmix/files/patch-XMmix.ad b/audio/xmmix/files/patch-XMmix.ad new file mode 100644 index 000000000000..91df07b95d9b --- /dev/null +++ b/audio/xmmix/files/patch-XMmix.ad @@ -0,0 +1,11 @@ +--- ./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 @@ + !* + + ! This points to the on-line help file +-XMmix*helpPath: /usr/lib/X11/xmmix.hlp ++XMmix*helpPath: /usr/X11R6/lib/X11/xmmix.hlp + + ! This points to a mixer settings file that is automatically loaded + ! upon startup. If set to /dev/null, then no file will be auto-loaded. diff --git a/audio/xmmix/files/patch-ab b/audio/xmmix/files/patch-ab deleted file mode 100644 index 5eb85f52c5f5..000000000000 --- a/audio/xmmix/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- XMmix.ad.orig Mon Jul 15 02:48:58 1996 -+++ XMmix.ad Sat Nov 11 10:15:08 2000 -@@ -26,7 +26,7 @@ - !* - - ! This points to the on-line help file --XMmix*helpPath: /usr/lib/X11/xmmix.hlp -+XMmix*helpPath: /usr/X11R6/lib/X11/xmmix.hlp - - ! This points to a mixer settings file that is automatically loaded - ! upon startup. If set to /dev/null, then no file will be auto-loaded. diff --git a/audio/xmmix/files/patch-ac b/audio/xmmix/files/patch-ac deleted file mode 100644 index 550b49a8a76d..000000000000 --- a/audio/xmmix/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Imakefile.orig Mon Jul 15 02:48:56 1996 -+++ Imakefile Sat Nov 11 10:15:06 2000 -@@ -43,7 +43,7 @@ - * #include "Motif.tmpl" - * #include "Motif.rules" - */ --LOCAL_LIBRARIES= XmClientLibs -+LOCAL_LIBRARIES= ${MOTIFLIB} ${XTOOLLIB} ${XLIB} - - - /* diff --git a/audio/xmmix/files/patch-ae b/audio/xmmix/files/patch-ae deleted file mode 100644 index 315dc20facb3..000000000000 --- a/audio/xmmix/files/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ ---- main.c.orig Sat Mar 23 15:01:57 2002 -+++ main.c Sat Mar 23 15:02:28 2002 -@@ -33,7 +33,7 @@ - bool_t exit_flag; /* Flag indicating end of application */ - appdata_t app_data; /* Options data */ - widgets_t widgets; /* Holder of all widgets */ --FILE *errfp = stderr;/* Error message stream */ -+FILE *errfp; /* Error message stream */ - - - /*********************** -@@ -103,6 +103,7 @@ - - /* Initialize variables */ - exit_flag = FALSE; -+ errfp = stderr; - - /* Handle some signals */ - signal(SIGINT, onsig); diff --git a/audio/xmmix/files/patch-main.c b/audio/xmmix/files/patch-main.c new file mode 100644 index 000000000000..fc68a0e4b8ec --- /dev/null +++ b/audio/xmmix/files/patch-main.c @@ -0,0 +1,28 @@ +--- ./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 */ + widgets_t widgets; /* Holder of all widgets */ +-FILE *errfp = stderr;/* Error message stream */ ++FILE *errfp; /* Error message stream */ + + + /*********************** +@@ -95,7 +95,7 @@ + * main + * The main function + */ +-void ++int + main(int argc, char **argv) + { + XtAppContext app; +@@ -103,6 +103,7 @@ + + /* Initialize variables */ + exit_flag = FALSE; ++ errfp = stderr; + + /* Handle some signals */ + signal(SIGINT, onsig); 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]; -- cgit v1.2.3