Fix patches: patch-ab has wrong path and patch-aa misses the CR.

3 files changed, 31 insertions, 31 deletions

diff --git a/games/billardgl/distinfo b/games/billardgl/distinfo
index cb4b01244aa..ab42eeecf3b 100644
--- a/games/billardgl/distinfo
+++ b/games/billardgl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/05/28 14:57:06 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/06/11 12:56:19 joerg 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) = ddc507fcf88772bf5ddcd00d846f455454afd393
-SHA1 (patch-ab) = 8b5bec03c98079b8ddc60bb44d82e14e562aa197
+SHA1 (patch-aa) = 81ac4905541676489fd8c95a7639a331ae4c7287
+SHA1 (patch-ab) = 14f29c68ab5f365fa14218af41e651e19c23b273
diff --git a/games/billardgl/patches/patch-aa b/games/billardgl/patches/patch-aa
index 1916570a4a5..f4bd5054b7f 100644
--- a/games/billardgl/patches/patch-aa
+++ b/games/billardgl/patches/patch-aa
@@ -1,33 +1,33 @@
-$NetBSD: patch-aa,v 1.3 2006/05/18 18:16:06 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2006/06/11 12:56:19 joerg 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	=	
+--- src/Makefile.orig	2002-04-29 11:26:46.000000000 +0000
++++ src/Makefile
+@@ -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
-@@ -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
+ 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

 +	${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
 +	${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 --git a/games/billardgl/patches/patch-ab b/games/billardgl/patches/patch-ab
index 9f5aaddbdd6..d321dd49b8e 100644
--- a/games/billardgl/patches/patch-ab
+++ b/games/billardgl/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2006/05/18 18:16:06 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2006/06/11 12:56:19 joerg 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
+--- src/SpielfeldAufbau.cpp.orig	2006-05-18 20:07:27.187451459 +0200
++++ src/SpielfeldAufbau.cpp	2006-05-18 20:06:35.247252233 +0200
 @@ -26,7 +26,7 @@
  
      GLfloat r=5.715;