diff options
author | Roger Hardiman <roger@FreeBSD.org> | 2003-09-02 14:12:46 +0000 |
---|---|---|
committer | Roger Hardiman <roger@FreeBSD.org> | 2003-09-02 14:12:46 +0000 |
commit | e460b7b38d7dfccaa30b32a2668c61e4b638213f (patch) | |
tree | 83657447ea96056fee25b270a93e70b0573a9286 | |
parent | Fixup mdoc (thanks to ru!) (diff) |
Upgrade to 0.98.4
Notes
Notes:
svn path=/head/; revision=88357
-rw-r--r-- | net/ekiga/Makefile | 2 | ||||
-rw-r--r-- | net/ekiga/distinfo | 2 | ||||
-rw-r--r-- | net/ekiga/files/patch-config | 21 | ||||
-rw-r--r-- | net/ekiga/files/patch-gnomemeeting | 14 | ||||
-rw-r--r-- | net/ekiga/files/patch-soundhandling | 41 | ||||
-rw-r--r-- | net/gnomemeeting/Makefile | 2 | ||||
-rw-r--r-- | net/gnomemeeting/distinfo | 2 | ||||
-rw-r--r-- | net/gnomemeeting/files/patch-config | 21 | ||||
-rw-r--r-- | net/gnomemeeting/files/patch-gnomemeeting | 14 | ||||
-rw-r--r-- | net/gnomemeeting/files/patch-soundhandling | 41 | ||||
-rw-r--r-- | net/gnomemeeting2/Makefile | 2 | ||||
-rw-r--r-- | net/gnomemeeting2/distinfo | 2 | ||||
-rw-r--r-- | net/gnomemeeting2/files/patch-config | 21 | ||||
-rw-r--r-- | net/gnomemeeting2/files/patch-gnomemeeting | 14 | ||||
-rw-r--r-- | net/gnomemeeting2/files/patch-soundhandling | 41 |
15 files changed, 6 insertions, 234 deletions
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index 3ea35fa2abe1..d0a9c427f092 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemeeting -PORTVERSION= 0.98.2 +PORTVERSION= 0.98.4 CATEGORIES= net gnome MASTER_SITES= http://www.gnomemeeting.org/downloads/0.98.0/sources/ \ ftp://ftp.gnome.org/pub/GNOME/sources/gnomemeeting/0.98/ diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo index e4c76aada6e4..b892fa04f1ea 100644 --- a/net/ekiga/distinfo +++ b/net/ekiga/distinfo @@ -1 +1 @@ -MD5 (gnomemeeting-0.98.2.tar.gz) = d40cd325a4da3010337d8b7a32db5d0a +MD5 (gnomemeeting-0.98.4.tar.gz) = 6fbec09b5ae956a46a5cf64f1131ca00 diff --git a/net/ekiga/files/patch-config b/net/ekiga/files/patch-config deleted file mode 100644 index 069327203c66..000000000000 --- a/net/ekiga/files/patch-config +++ /dev/null @@ -1,21 +0,0 @@ -*** src/config.cpp.orig Sun Aug 31 13:00:00 2003 ---- src/config.cpp Sun Aug 31 13:00:31 2003 -*************** audio_mixer_changed_nt (GConfClient *cli -*** 928,935 **** - int vol = 0; - char *mixer = NULL; - GmWindow *gw = NULL; -- #ifdef HAS_IXJ - GMH323EndPoint *endpoint = MyApp->Endpoint (); - GMLid *lid = NULL; - #endif - ---- 928,935 ---- - int vol = 0; - char *mixer = NULL; - GmWindow *gw = NULL; - GMH323EndPoint *endpoint = MyApp->Endpoint (); -+ #ifdef HAS_IXJ - GMLid *lid = NULL; - #endif - diff --git a/net/ekiga/files/patch-gnomemeeting b/net/ekiga/files/patch-gnomemeeting deleted file mode 100644 index 0643a245f6b5..000000000000 --- a/net/ekiga/files/patch-gnomemeeting +++ /dev/null @@ -1,14 +0,0 @@ -*** src/gnomemeeting.cpp.orig Sun Aug 31 12:42:17 2003 ---- src/gnomemeeting.cpp Sun Aug 31 12:42:30 2003 -*************** GnomeMeeting::~GnomeMeeting() -*** 125,131 **** ---- 125,133 ---- - - endpoint->ClearAllCalls (H323Connection::EndedByLocalUser, TRUE); - endpoint->RemoveVideoGrabber (true); -+ #ifdef HAX_IXJ - endpoint->RemoveLid (); -+ #endif - } - RemoveEndpoint (); - diff --git a/net/ekiga/files/patch-soundhandling b/net/ekiga/files/patch-soundhandling deleted file mode 100644 index ca30a8b9d74d..000000000000 --- a/net/ekiga/files/patch-soundhandling +++ /dev/null @@ -1,41 +0,0 @@ -*** src/sound_handling.cpp.orig Thu Aug 28 07:18:16 2003 ---- src/sound_handling.cpp Thu Aug 28 07:20:23 2003 -*************** -*** 46,55 **** - #include "dialog.h" - - -! #ifdef __FreeBSD__ -! #include <sys/types.h> -! #include <signal.h> -! #endif - - #ifdef HAS_IXJ - #include <ixjlid.h> ---- 46,55 ---- - #include "dialog.h" - - -! //#ifdef __FreeBSD__ -! //#include <sys/types.h> -! //#include <signal.h> -! //#endif - - #ifdef HAS_IXJ - #include <ixjlid.h> -*************** -*** 59,64 **** ---- 59,71 ---- - #include <linux/soundcard.h> - #endif - -+ #ifdef __FreeBSD__ -+ #if (__FreeBSD__ >= 5) -+ #include <sys/soundcard.h> -+ #else -+ #include <machine/soundcard.h> -+ #endif -+ #endif - - - static void dialog_response_cb (GtkWidget *, gint, gpointer); diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile index 3ea35fa2abe1..d0a9c427f092 100644 --- a/net/gnomemeeting/Makefile +++ b/net/gnomemeeting/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemeeting -PORTVERSION= 0.98.2 +PORTVERSION= 0.98.4 CATEGORIES= net gnome MASTER_SITES= http://www.gnomemeeting.org/downloads/0.98.0/sources/ \ ftp://ftp.gnome.org/pub/GNOME/sources/gnomemeeting/0.98/ diff --git a/net/gnomemeeting/distinfo b/net/gnomemeeting/distinfo index e4c76aada6e4..b892fa04f1ea 100644 --- a/net/gnomemeeting/distinfo +++ b/net/gnomemeeting/distinfo @@ -1 +1 @@ -MD5 (gnomemeeting-0.98.2.tar.gz) = d40cd325a4da3010337d8b7a32db5d0a +MD5 (gnomemeeting-0.98.4.tar.gz) = 6fbec09b5ae956a46a5cf64f1131ca00 diff --git a/net/gnomemeeting/files/patch-config b/net/gnomemeeting/files/patch-config deleted file mode 100644 index 069327203c66..000000000000 --- a/net/gnomemeeting/files/patch-config +++ /dev/null @@ -1,21 +0,0 @@ -*** src/config.cpp.orig Sun Aug 31 13:00:00 2003 ---- src/config.cpp Sun Aug 31 13:00:31 2003 -*************** audio_mixer_changed_nt (GConfClient *cli -*** 928,935 **** - int vol = 0; - char *mixer = NULL; - GmWindow *gw = NULL; -- #ifdef HAS_IXJ - GMH323EndPoint *endpoint = MyApp->Endpoint (); - GMLid *lid = NULL; - #endif - ---- 928,935 ---- - int vol = 0; - char *mixer = NULL; - GmWindow *gw = NULL; - GMH323EndPoint *endpoint = MyApp->Endpoint (); -+ #ifdef HAS_IXJ - GMLid *lid = NULL; - #endif - diff --git a/net/gnomemeeting/files/patch-gnomemeeting b/net/gnomemeeting/files/patch-gnomemeeting deleted file mode 100644 index 0643a245f6b5..000000000000 --- a/net/gnomemeeting/files/patch-gnomemeeting +++ /dev/null @@ -1,14 +0,0 @@ -*** src/gnomemeeting.cpp.orig Sun Aug 31 12:42:17 2003 ---- src/gnomemeeting.cpp Sun Aug 31 12:42:30 2003 -*************** GnomeMeeting::~GnomeMeeting() -*** 125,131 **** ---- 125,133 ---- - - endpoint->ClearAllCalls (H323Connection::EndedByLocalUser, TRUE); - endpoint->RemoveVideoGrabber (true); -+ #ifdef HAX_IXJ - endpoint->RemoveLid (); -+ #endif - } - RemoveEndpoint (); - diff --git a/net/gnomemeeting/files/patch-soundhandling b/net/gnomemeeting/files/patch-soundhandling deleted file mode 100644 index ca30a8b9d74d..000000000000 --- a/net/gnomemeeting/files/patch-soundhandling +++ /dev/null @@ -1,41 +0,0 @@ -*** src/sound_handling.cpp.orig Thu Aug 28 07:18:16 2003 ---- src/sound_handling.cpp Thu Aug 28 07:20:23 2003 -*************** -*** 46,55 **** - #include "dialog.h" - - -! #ifdef __FreeBSD__ -! #include <sys/types.h> -! #include <signal.h> -! #endif - - #ifdef HAS_IXJ - #include <ixjlid.h> ---- 46,55 ---- - #include "dialog.h" - - -! //#ifdef __FreeBSD__ -! //#include <sys/types.h> -! //#include <signal.h> -! //#endif - - #ifdef HAS_IXJ - #include <ixjlid.h> -*************** -*** 59,64 **** ---- 59,71 ---- - #include <linux/soundcard.h> - #endif - -+ #ifdef __FreeBSD__ -+ #if (__FreeBSD__ >= 5) -+ #include <sys/soundcard.h> -+ #else -+ #include <machine/soundcard.h> -+ #endif -+ #endif - - - static void dialog_response_cb (GtkWidget *, gint, gpointer); diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile index 3ea35fa2abe1..d0a9c427f092 100644 --- a/net/gnomemeeting2/Makefile +++ b/net/gnomemeeting2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemeeting -PORTVERSION= 0.98.2 +PORTVERSION= 0.98.4 CATEGORIES= net gnome MASTER_SITES= http://www.gnomemeeting.org/downloads/0.98.0/sources/ \ ftp://ftp.gnome.org/pub/GNOME/sources/gnomemeeting/0.98/ diff --git a/net/gnomemeeting2/distinfo b/net/gnomemeeting2/distinfo index e4c76aada6e4..b892fa04f1ea 100644 --- a/net/gnomemeeting2/distinfo +++ b/net/gnomemeeting2/distinfo @@ -1 +1 @@ -MD5 (gnomemeeting-0.98.2.tar.gz) = d40cd325a4da3010337d8b7a32db5d0a +MD5 (gnomemeeting-0.98.4.tar.gz) = 6fbec09b5ae956a46a5cf64f1131ca00 diff --git a/net/gnomemeeting2/files/patch-config b/net/gnomemeeting2/files/patch-config deleted file mode 100644 index 069327203c66..000000000000 --- a/net/gnomemeeting2/files/patch-config +++ /dev/null @@ -1,21 +0,0 @@ -*** src/config.cpp.orig Sun Aug 31 13:00:00 2003 ---- src/config.cpp Sun Aug 31 13:00:31 2003 -*************** audio_mixer_changed_nt (GConfClient *cli -*** 928,935 **** - int vol = 0; - char *mixer = NULL; - GmWindow *gw = NULL; -- #ifdef HAS_IXJ - GMH323EndPoint *endpoint = MyApp->Endpoint (); - GMLid *lid = NULL; - #endif - ---- 928,935 ---- - int vol = 0; - char *mixer = NULL; - GmWindow *gw = NULL; - GMH323EndPoint *endpoint = MyApp->Endpoint (); -+ #ifdef HAS_IXJ - GMLid *lid = NULL; - #endif - diff --git a/net/gnomemeeting2/files/patch-gnomemeeting b/net/gnomemeeting2/files/patch-gnomemeeting deleted file mode 100644 index 0643a245f6b5..000000000000 --- a/net/gnomemeeting2/files/patch-gnomemeeting +++ /dev/null @@ -1,14 +0,0 @@ -*** src/gnomemeeting.cpp.orig Sun Aug 31 12:42:17 2003 ---- src/gnomemeeting.cpp Sun Aug 31 12:42:30 2003 -*************** GnomeMeeting::~GnomeMeeting() -*** 125,131 **** ---- 125,133 ---- - - endpoint->ClearAllCalls (H323Connection::EndedByLocalUser, TRUE); - endpoint->RemoveVideoGrabber (true); -+ #ifdef HAX_IXJ - endpoint->RemoveLid (); -+ #endif - } - RemoveEndpoint (); - diff --git a/net/gnomemeeting2/files/patch-soundhandling b/net/gnomemeeting2/files/patch-soundhandling deleted file mode 100644 index ca30a8b9d74d..000000000000 --- a/net/gnomemeeting2/files/patch-soundhandling +++ /dev/null @@ -1,41 +0,0 @@ -*** src/sound_handling.cpp.orig Thu Aug 28 07:18:16 2003 ---- src/sound_handling.cpp Thu Aug 28 07:20:23 2003 -*************** -*** 46,55 **** - #include "dialog.h" - - -! #ifdef __FreeBSD__ -! #include <sys/types.h> -! #include <signal.h> -! #endif - - #ifdef HAS_IXJ - #include <ixjlid.h> ---- 46,55 ---- - #include "dialog.h" - - -! //#ifdef __FreeBSD__ -! //#include <sys/types.h> -! //#include <signal.h> -! //#endif - - #ifdef HAS_IXJ - #include <ixjlid.h> -*************** -*** 59,64 **** ---- 59,71 ---- - #include <linux/soundcard.h> - #endif - -+ #ifdef __FreeBSD__ -+ #if (__FreeBSD__ >= 5) -+ #include <sys/soundcard.h> -+ #else -+ #include <machine/soundcard.h> -+ #endif -+ #endif - - - static void dialog_response_cb (GtkWidget *, gint, gpointer); |