From 99a46c1cedfe66e3a851e5c9e64ba2dde1dd6548 Mon Sep 17 00:00:00 2001 From: ijliao Date: Sun, 22 Dec 2002 18:05:35 +0000 Subject: - Fix build on 5-current PR: 46436 Submitted by: Ports Fury --- x11-toolkits/gtkglarea--/Makefile | 9 +++++++-- x11-toolkits/gtkglarea--/files/patch-events.cc | 10 ---------- .../files/patch-examples::extra::events.cc | 19 +++++++++++++++++++ .../files/patch-examples::extra::glpixmap.cc | 10 ++++++++++ .../files/patch-examples::pickmm::pick.cc | 20 ++++++++++++++++++++ .../files/patch-examples::planetmm::planet.cc | 20 ++++++++++++++++++++ x11-toolkits/gtkglarea--/files/patch-gdkgl.cc | 20 -------------------- x11-toolkits/gtkglarea--/files/patch-glpixmap.cc | 10 ---------- .../gtkglarea--/files/patch-gtkgl--::gdkgl.cc | 20 ++++++++++++++++++++ 9 files changed, 96 insertions(+), 42 deletions(-) delete mode 100644 x11-toolkits/gtkglarea--/files/patch-events.cc create mode 100644 x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc create mode 100644 x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc create mode 100644 x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc create mode 100644 x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc delete mode 100644 x11-toolkits/gtkglarea--/files/patch-gdkgl.cc delete mode 100644 x11-toolkits/gtkglarea--/files/patch-glpixmap.cc create mode 100644 x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc (limited to 'x11-toolkits') diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile index f1cdc96389f6..e5f84039c5f4 100644 --- a/x11-toolkits/gtkglarea--/Makefile +++ b/x11-toolkits/gtkglarea--/Makefile @@ -13,15 +13,20 @@ MASTER_SITES= http://www.ece.ucdavis.edu/~kenelson/gtk-glarea/dist/ MAINTAINER= ports@FreeBSD.org +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea +USE_MESA= yes USE_GNOMENG= yes USE_GNOME= gtk12 -USE_MESA= yes USE_LIBTOOL= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-lib-GL INSTALLS_SHLIB= yes +CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \ + ${PTHREAD_LIBS} + .include diff --git a/x11-toolkits/gtkglarea--/files/patch-events.cc b/x11-toolkits/gtkglarea--/files/patch-events.cc deleted file mode 100644 index c39ff0f997e4..000000000000 --- a/x11-toolkits/gtkglarea--/files/patch-events.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- examples/extra/events.cc.orig Wed Aug 28 14:04:59 2002 -+++ examples/extra/events.cc Wed Aug 28 14:05:23 2002 -@@ -28,6 +28,7 @@ - #include - #include - -+using namespace std; - - void gl() { - static int displaylist=-1; diff --git a/x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc b/x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc new file mode 100644 index 000000000000..fd820bc89e9c --- /dev/null +++ b/x11-toolkits/gtkglarea--/files/patch-examples::extra::events.cc @@ -0,0 +1,19 @@ +--- examples/extra/events.cc.orig Thu Jan 27 09:15:24 2000 ++++ examples/extra/events.cc Fri Dec 20 09:45:21 2002 +@@ -18,7 +18,7 @@ + *********************************************************************/ + + #include +-#include ++#include + #include + #include + #include +@@ -28,6 +28,7 @@ + #include + #include + ++using namespace std; + + void gl() { + static int displaylist=-1; diff --git a/x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc b/x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc new file mode 100644 index 000000000000..bbbfe8ef7d25 --- /dev/null +++ b/x11-toolkits/gtkglarea--/files/patch-examples::extra::glpixmap.cc @@ -0,0 +1,10 @@ +--- examples/extra/glpixmap.cc.orig Wed Aug 28 14:02:08 2002 ++++ examples/extra/glpixmap.cc Wed Aug 28 14:02:29 2002 +@@ -27,6 +27,7 @@ + #include + #include + ++using namespace std; + + int visual_attributes[] = { GDK_GL_RGBA, + GDK_GL_NONE }; diff --git a/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc b/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc new file mode 100644 index 000000000000..12e95e02124c --- /dev/null +++ b/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc @@ -0,0 +1,20 @@ +--- examples/pickmm/pick.cc.orig Thu Jan 27 09:15:24 2000 ++++ examples/pickmm/pick.cc Fri Dec 20 09:42:57 2002 +@@ -16,7 +16,7 @@ + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + *********************************************************************/ +-#include ++#include + + #include + #include +@@ -28,6 +28,8 @@ + #include + + #include ++ ++using namespace std; + + // WARNING: Verbosity level set to maximum, prepare to get an ear full + diff --git a/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc b/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc new file mode 100644 index 000000000000..6e0e422f8635 --- /dev/null +++ b/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc @@ -0,0 +1,20 @@ +--- examples/planetmm/planet.cc.orig Thu Jan 27 09:15:25 2000 ++++ examples/planetmm/planet.cc Fri Dec 20 09:43:57 2002 +@@ -16,7 +16,7 @@ + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + *********************************************************************/ +-#include ++#include + #include + #include + #include +@@ -27,6 +27,8 @@ + #include + #include + #include "globeGL.hh" ++ ++using namespace std; + + // WARNING: Verbosity level set to maximum, prepare to get an ear full + diff --git a/x11-toolkits/gtkglarea--/files/patch-gdkgl.cc b/x11-toolkits/gtkglarea--/files/patch-gdkgl.cc deleted file mode 100644 index 1c94fa26ab04..000000000000 --- a/x11-toolkits/gtkglarea--/files/patch-gdkgl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- gtkgl--/gdkgl.cc.orig Wed Aug 28 13:56:43 2002 -+++ gtkgl--/gdkgl.cc Wed Aug 28 13:58:35 2002 -@@ -69,7 +69,7 @@ - - Gdk_GL::Context::Context(const Gdk_Visual &visual, - Context &share, -- bool direct=FALSE) -+ bool direct) - :Gdk_Handle(0) - {create(visual,share,direct);} - -@@ -98,7 +98,7 @@ - ref(); - } - --void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct=FALSE) -+void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct) - { - unref(); - obj_ = gdk_gl_context_share_new(gdk_const_cast(visual),share,direct); diff --git a/x11-toolkits/gtkglarea--/files/patch-glpixmap.cc b/x11-toolkits/gtkglarea--/files/patch-glpixmap.cc deleted file mode 100644 index bbbfe8ef7d25..000000000000 --- a/x11-toolkits/gtkglarea--/files/patch-glpixmap.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- examples/extra/glpixmap.cc.orig Wed Aug 28 14:02:08 2002 -+++ examples/extra/glpixmap.cc Wed Aug 28 14:02:29 2002 -@@ -27,6 +27,7 @@ - #include - #include - -+using namespace std; - - int visual_attributes[] = { GDK_GL_RGBA, - GDK_GL_NONE }; diff --git a/x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc b/x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc new file mode 100644 index 000000000000..1c94fa26ab04 --- /dev/null +++ b/x11-toolkits/gtkglarea--/files/patch-gtkgl--::gdkgl.cc @@ -0,0 +1,20 @@ +--- gtkgl--/gdkgl.cc.orig Wed Aug 28 13:56:43 2002 ++++ gtkgl--/gdkgl.cc Wed Aug 28 13:58:35 2002 +@@ -69,7 +69,7 @@ + + Gdk_GL::Context::Context(const Gdk_Visual &visual, + Context &share, +- bool direct=FALSE) ++ bool direct) + :Gdk_Handle(0) + {create(visual,share,direct);} + +@@ -98,7 +98,7 @@ + ref(); + } + +-void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct=FALSE) ++void Gdk_GL::Context::create(const Gdk_Visual &visual,Context &share,bool direct) + { + unref(); + obj_ = gdk_gl_context_share_new(gdk_const_cast(visual),share,direct); -- cgit