[pkgsrc/trunk]: pkgsrc/games/billardgl Added a patch for the SunPro compiler....

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ac61b518d13
branches:  trunk
changeset: 512980:1ac61b518d13
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu May 18 18:16:06 2006 +0000

description:
Added a patch for the SunPro compiler. After extracting the source
files, they are stripped from CR characters.

diffstat:

 games/billardgl/Makefile         |   9 ++++++-
 games/billardgl/distinfo         |   5 ++-
 games/billardgl/patches/patch-aa |  48 ++++++++++++++++++++--------------------
 games/billardgl/patches/patch-ab |  16 +++++++++++++
 4 files changed, 51 insertions(+), 27 deletions(-)

diffs (124 lines):

diff -r 058dbeb435e3 -r 1ac61b518d13 games/billardgl/Makefile
--- a/games/billardgl/Makefile  Thu May 18 18:04:10 2006 +0000
+++ b/games/billardgl/Makefile  Thu May 18 18:16:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/12 07:19:31 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2006/05/18 18:16:06 rillig Exp $
 #
 
 DISTNAME=      BillardGL-1.75
@@ -12,6 +12,7 @@
 COMMENT=       3D Billard using OpenGL hardware acceleration
 
 BUILD_DIRS=    src
+USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake imake
 MAKE_ENV+=     PAX=${PAX:Q}
 LDFLAGS+=      ${X11_LDFLAGS}
@@ -22,6 +23,12 @@
 SUBST_FILES.billardgl=         src/Namen.h
 SUBST_SED.billardgl=           -e 's,"/usr/share/,"${PREFIX}/share/,'
 
+SUBST_CLASSES+=                d2u
+SUBST_STAGE.d2u=       post-extract
+SUBST_MESSAGE.d2u=     Removing CR end-of-line markers.
+SUBST_FILES.d2u=       src/*.h src/*.cpp
+SUBST_FILTER_CMD.d2u=  ${TR} -d '\r'
+
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
diff -r 058dbeb435e3 -r 1ac61b518d13 games/billardgl/distinfo
--- a/games/billardgl/distinfo  Thu May 18 18:04:10 2006 +0000
+++ b/games/billardgl/distinfo  Thu May 18 18:16:06 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2006/03/03 19:21:43 kristerw Exp $
+$NetBSD: distinfo,v 1.3 2006/05/18 18:16:06 rillig Exp $
 
 SHA1 (BillardGL-1.75.tar.gz) = b1e3c044a500cf1331ae392c861f8d8402f1806e
 RMD160 (BillardGL-1.75.tar.gz) = 11586d3c887367e3137e2d498e9ff729156cf233
 Size (BillardGL-1.75.tar.gz) = 736295 bytes
-SHA1 (patch-aa) = e683d31b472bafb5599a8a8deb46f8c58b762ba0
+SHA1 (patch-aa) = ddc507fcf88772bf5ddcd00d846f455454afd393
+SHA1 (patch-ab) = eda8a1d7893a2d502f3636d3b7ba22f790ade6b5
diff -r 058dbeb435e3 -r 1ac61b518d13 games/billardgl/patches/patch-aa
--- a/games/billardgl/patches/patch-aa  Thu May 18 18:04:10 2006 +0000
+++ b/games/billardgl/patches/patch-aa  Thu May 18 18:16:06 2006 +0000
@@ -1,33 +1,33 @@
-$NetBSD: patch-aa,v 1.2 2006/03/03 19:21:43 kristerw Exp $
+$NetBSD: patch-aa,v 1.3 2006/05/18 18:16:06 rillig Exp $
 
 --- src/Makefile.orig  2002-04-29 13:26:46.000000000 +0200
 +++ src/Makefile       2006-01-31 03:25:14.000000000 +0100
 @@ -11,7 +11,7 @@ CFLAGS       =       -pipe -Wall -W -DNO_DEBUG -g
- CXXFLAGS=     -pipe -Wall -W -DNO_DEBUG -g 
- INCPATH       =       -I/usr/X11R6/include 
- LINK  =       g++
--LFLAGS        =       
-+LFLAGS        =       ${LDFLAGS}
- LIBS  =       -L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
- 
- ## -lqgl -lGLU
+ CXXFLAGS=     -pipe -Wall -W -DNO_DEBUG -g 
+ INCPATH       =       -I/usr/X11R6/include 
+ LINK  =       g++
+-LFLAGS        =       
++LFLAGS        =       ${LDFLAGS}
+ LIBS  =       -L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
+ 
+ ## -lqgl -lGLU
 @@ -151,13 +151,12 @@ clear:
-       -rm -f *~ core
- 
- install: 
--      -cp BillardGL /usr/X11R6/bin/BillardGL
--      -cp BillardGL /usr/X11R6/bin/billardGL
--      -mkdir -p /usr/share/BillardGL
--      -cp -R Texturen /usr/share/BillardGL
--      -cp -R lang /usr/share/BillardGL
--      -mkdir -p /usr/share/doc/packages/BillardGL
--      -cp README /usr/share/doc/packages/BillardGL
+       -rm -f *~ core
+ 
+ install: 
+-      -cp BillardGL /usr/X11R6/bin/BillardGL
+-      -cp BillardGL /usr/X11R6/bin/billardGL
+-      -mkdir -p /usr/share/BillardGL
+-      -cp -R Texturen /usr/share/BillardGL
+-      -cp -R lang /usr/share/BillardGL
+-      -mkdir -p /usr/share/doc/packages/BillardGL
+-      -cp README /usr/share/doc/packages/BillardGL
 +      ${BSD_INSTALL_PROGRAM} BillardGL ${PREFIX}/bin/BillardGL
 +      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/BillardGL
-+      ${PAX} -rw Texturen ${PREFIX}/share/BillardGL
-+      ${PAX} -rw lang ${PREFIX}/share/BillardGL
++      ${PAX} -rw Texturen ${PREFIX}/share/BillardGL
++      ${PAX} -rw lang ${PREFIX}/share/BillardGL
 +      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/BillardGL
 +      ${BSD_INSTALL_DATA} README ${PREFIX}/share/doc/BillardGL/README
- 
- uninstall:
-       -rm /usr/X11R6/bin/BillardGL
+ 
+ uninstall:
+       -rm /usr/X11R6/bin/BillardGL
diff -r 058dbeb435e3 -r 1ac61b518d13 games/billardgl/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/billardgl/patches/patch-ab  Thu May 18 18:16:06 2006 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2006/05/18 18:16:06 rillig Exp $
+
+SunPro cannot resolve the overloading conflict between sqrt(double) and
+sqrt(long double) when provided with an integer.
+
+--- SpielfeldAufbau.cpp.orig   2006-05-18 20:07:27.187451459 +0200
++++ SpielfeldAufbau.cpp        2006-05-18 20:06:35.247252233 +0200
+@@ -26,7 +26,7 @@
+ 
+     GLfloat r=5.715;
+     GLfloat a=r+3*Epsilon;
+-    GLfloat asw3=a*sqrt(3)/6;
++    GLfloat asw3=a*sqrt(3.0)/6;
+     
+     srand(Zeit());
+