From ad2d8668f74abcce79eba05bb29681ee296564a8 Mon Sep 17 00:00:00 2001
From: vs <vs@FreeBSD.org>
Date: Wed, 26 Oct 2005 16:26:34 +0000
Subject: DISTNAME affects WRKSRC-generation, sigh. Fix build-issue while here

Noticed by: kris
---
 x11-toolkits/gtkglarea--/Makefile                  |  1 +
 .../files/patch-examples::pickmm::pick.cc          | 24 ++++++++++++++++------
 .../files/patch-examples::planetmm::planet.cc      | 24 ++++++++++++++++------
 3 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index b31df8935337..dedcefe7ecca 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -25,6 +25,7 @@ USE_GL=		yes
 USE_GNOME=	gtk12
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-lib-GL
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc b/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc
index 12e95e02124c..86601bc313e9 100644
--- a/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc
+++ b/x11-toolkits/gtkglarea--/files/patch-examples::pickmm::pick.cc
@@ -1,5 +1,8 @@
---- examples/pickmm/pick.cc.orig	Thu Jan 27 09:15:24 2000
-+++ examples/pickmm/pick.cc	Fri Dec 20 09:42:57 2002
+
+$FreeBSD$
+
+--- examples/pickmm/pick.cc.orig
++++ examples/pickmm/pick.cc
 @@ -16,7 +16,7 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
@@ -9,12 +12,21 @@
  
  #include <GL/gl.h>
  #include <GL/glu.h>
-@@ -28,6 +28,8 @@
- #include <gtk--.h>
+@@ -29,6 +29,8 @@
  
  #include <gtkgl--/glarea.h>
-+
-+using namespace std;
  
++using namespace std;
++
  // WARNING: Verbosity level set to maximum, prepare to get an ear full
  
+ /*********************************************************************
+@@ -596,7 +598,7 @@
+ ************************************************************
+   very simple main body
+ ***********************************************************/
+-gint main(gint argc, gchar **argv)
++int main(gint argc, gchar **argv)
+   {
+    MainWindowClass *main_window;
+   
diff --git a/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc b/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc
index 6e0e422f8635..a07557223f40 100644
--- a/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc
+++ b/x11-toolkits/gtkglarea--/files/patch-examples::planetmm::planet.cc
@@ -1,5 +1,8 @@
---- examples/planetmm/planet.cc.orig	Thu Jan 27 09:15:25 2000
-+++ examples/planetmm/planet.cc	Fri Dec 20 09:43:57 2002
+
+$FreeBSD$
+
+--- examples/planetmm/planet.cc.orig
++++ examples/planetmm/planet.cc
 @@ -16,7 +16,7 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
@@ -9,12 +12,21 @@
  #include <GL/glx.h>
  #include <glib.h>
  #include <gdk/gdk.h>
-@@ -27,6 +27,8 @@
- #include <GL/gl.h>
+@@ -28,6 +28,8 @@
  #include <math.h>
  #include "globeGL.hh"
-+
-+using namespace std;
  
++using namespace std;
++
  // WARNING: Verbosity level set to maximum, prepare to get an ear full
  
+ /*********************************************************************
+@@ -468,7 +470,7 @@
+ ************************************************************
+   very simple main body
+ ***********************************************************/
+-gint main(gint argc, gchar **argv)
++int main(gint argc, gchar **argv)
+   {
+    MainWindowClass *main_window1;
+   
-- 
cgit