diff options
| author | peter <peter@pkgsrc.org> | 2005-02-15 23:28:58 +0000 |
|---|---|---|
| committer | peter <peter@pkgsrc.org> | 2005-02-15 23:28:58 +0000 |
| commit | 55f4bb57e023ff4f72d69b40250e1152fa0557a0 (patch) | |
| tree | f5be51fe624c725dc36386ae2aade707d527b4cf | |
| parent | 012f8f9565ccefeac4e039dfab07be10ea0908cc (diff) | |
| download | pkgsrc-55f4bb57e023ff4f72d69b40250e1152fa0557a0.tar.gz | |
Remove the need of patch-ad by adding -DHAS_SOCKLEN_T to CXXFLAGS in patch-aa.
| -rw-r--r-- | games/cube/distinfo | 5 | ||||
| -rw-r--r-- | games/cube/patches/patch-aa | 4 | ||||
| -rw-r--r-- | games/cube/patches/patch-ad | 16 |
3 files changed, 4 insertions, 21 deletions
diff --git a/games/cube/distinfo b/games/cube/distinfo index e1b9706efab..32349a5c8ee 100644 --- a/games/cube/distinfo +++ b/games/cube/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/01/18 17:48:52 peter Exp $ +$NetBSD: distinfo,v 1.2 2005/02/15 23:28:58 peter Exp $ SHA1 (cube_2004_05_22.tar.gz) = 029d574149a781e0c39742c12a67fd0f118540e1 Size (cube_2004_05_22.tar.gz) = 22566432 bytes -SHA1 (patch-aa) = 562ca8051d7b7eb0fe90e67f4fb8f4773032f119 +SHA1 (patch-aa) = 9d578618c7846aa30a4923724f80ee32efbbc9aa SHA1 (patch-ab) = d69e2fdae3ea28971720a0a3b3c0059ff35c51ec SHA1 (patch-ac) = 44bad545c1fdaf03198cc11cf3b2a3d0fe4b619d -SHA1 (patch-ad) = 69f351a5bbce6f4050137d733d31c270df4ecdf7 diff --git a/games/cube/patches/patch-aa b/games/cube/patches/patch-aa index 5f14273bf72..a4073a26aab 100644 --- a/games/cube/patches/patch-aa +++ b/games/cube/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/01/18 17:48:53 peter Exp $ +$NetBSD: patch-aa,v 1.2 2005/02/15 23:28:58 peter Exp $ --- source/src/Makefile.orig 2003-12-20 16:47:58.000000000 +0100 +++ source/src/Makefile 2004-06-10 01:27:22.000000000 +0200 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/18 17:48:53 peter Exp $ -CXXOPTFLAGS=-Wall -O3 -fsigned-char -fomit-frame-pointer -CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags` +CXXOPTFLAGS=-Wall -O3 -fsigned-char -fomit-frame-pointer -Wno-deprecated -+CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags` -I/usr/X11R6/include ++CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags` -DHAS_SOCKLEN_T CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU CLIENT_OBJS= \ diff --git a/games/cube/patches/patch-ad b/games/cube/patches/patch-ad deleted file mode 100644 index 6ffb5ed91ab..00000000000 --- a/games/cube/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2005/01/18 17:48:53 peter Exp $ - ---- source/enet/include/enet/unix.h.orig 2004-01-29 19:57:02.000000000 +0100 -+++ source/enet/include/enet/unix.h 2004-06-10 01:31:41.000000000 +0200 -@@ -28,9 +28,11 @@ - size_t dataLength; - } ENetBuffer; - -+#if 0 - #ifndef HAS_SOCKLEN_T - typedef int socklen_t; - #endif -+#endif - - #endif /* __ENET_UNIX_H__ */ - |