[pkgsrc/trunk]: pkgsrc/games/cube Fix linkage (libX11 gets linked implicitly)...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/244f9c09fee9
branches:  trunk
changeset: 518906:244f9c09fee9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Sep 22 21:48:43 2006 +0000

description:
Fix linkage (libX11 gets linked implicitly). Bump revision.

diffstat:

 games/cube/Makefile         |  13 ++++++-------
 games/cube/distinfo         |   4 ++--
 games/cube/patches/patch-aa |   9 ++++++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diffs (81 lines):

diff -r 733f48045fb2 -r 244f9c09fee9 games/cube/Makefile
--- a/games/cube/Makefile       Fri Sep 22 21:26:13 2006 +0000
+++ b/games/cube/Makefile       Fri Sep 22 21:48:43 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/06/12 16:28:08 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/09/22 21:48:43 joerg Exp $
 
 DISTNAME=      cube_2004_05_22
 PKGNAME=       cube-20040522
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    games x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cube/}
 
@@ -13,10 +13,13 @@
 BUILD_DEPENDS+=        unzip-[0-9]*:../../archivers/unzip
 
 WRKSRC=                ${WRKDIR}/cube
+GNU_CONFIGURE= yes
+CONFIGURE_DIRS=        ${WRKSRC}/source/enet
 CUBE_SRC_DIR=  ${WRKSRC}/source/src
 CUBE_DATA_DIR= ${PREFIX}/share/cube
+BUILD_DIRS=    ${CUBE_SRC_DIR}
+MAKE_ENV+=     X11_LDFLAGS=${X11_LDFLAGS:Q}
 
-NO_CONFIGURE=  yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake unzip
 
@@ -28,10 +31,6 @@
 post-patch:
        @${ECHO} '#define DATADIR "${CUBE_DATA_DIR}"' >> ${CUBE_SRC_DIR}/cube.h
 
-do-build:
-       cd ${WRKSRC}/source/enet && ${SH} configure
-       cd ${CUBE_SRC_DIR} && ${GMAKE} all
-
 pre-install:
        ${INSTALL_DATA_DIR} ${CUBE_DATA_DIR}/savegames
 
diff -r 733f48045fb2 -r 244f9c09fee9 games/cube/distinfo
--- a/games/cube/distinfo       Fri Sep 22 21:26:13 2006 +0000
+++ b/games/cube/distinfo       Fri Sep 22 21:48:43 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:11:56 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/09/22 21:48:43 joerg Exp $
 
 SHA1 (cube_2004_05_22.tar.gz) = 029d574149a781e0c39742c12a67fd0f118540e1
 RMD160 (cube_2004_05_22.tar.gz) = 4117c551c66c75bf5fa154a113b2fc9a50b424b4
 Size (cube_2004_05_22.tar.gz) = 22566432 bytes
-SHA1 (patch-aa) = 9d578618c7846aa30a4923724f80ee32efbbc9aa
+SHA1 (patch-aa) = 341e405bb4afacdd081eee51a6d2f5f1d8e3aa7e
 SHA1 (patch-ab) = d69e2fdae3ea28971720a0a3b3c0059ff35c51ec
 SHA1 (patch-ac) = 44bad545c1fdaf03198cc11cf3b2a3d0fe4b619d
 SHA1 (patch-ad) = 1674b0973edb76d891285b09b94843aa2888d882
diff -r 733f48045fb2 -r 244f9c09fee9 games/cube/patches/patch-aa
--- a/games/cube/patches/patch-aa       Fri Sep 22 21:26:13 2006 +0000
+++ b/games/cube/patches/patch-aa       Fri Sep 22 21:48:43 2006 +0000
@@ -1,16 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2005/02/15 23:28:58 peter Exp $
+$NetBSD: patch-aa,v 1.3 2006/09/22 21:48:43 joerg Exp $
 
 --- source/src/Makefile.orig   2003-12-20 16:47:58.000000000 +0100
 +++ source/src/Makefile        2004-06-10 01:27:22.000000000 +0200
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
  CXX=g++
 -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` -DHAS_SOCKLEN_T
  
- CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU 
+-CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU 
++CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU ${X11_LDFLAGS} -lX11
  CLIENT_OBJS= \
+       client.o \
+       clientextras.o \
 @@ -49,11 +49,11 @@
  all: enet client server