From 11346e3bf699db4aded97cc085ded599e47d5783 Mon Sep 17 00:00:00 2001 From: rh Date: Sat, 25 Jan 2003 12:09:11 +0000 Subject: Dynamically add -lpth only if PTHREAD_TYPE is "pth". Bump PKGREVISION. --- games/lbreakout/Makefile | 11 ++++++++++- games/lbreakout/PLIST | 4 ++-- games/lbreakout/distinfo | 4 ++-- games/lbreakout/patches/patch-aa | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) (limited to 'games') diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index f4b3bb55b1c..1247747bf33 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2002/08/27 18:56:45 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2003/01/25 12:09:11 rh Exp $ # DISTNAME= lbreakout-010315 +PKGREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/} @@ -12,7 +13,15 @@ COMMENT= breakout-style arcade game USE_BUILDLINK2= YES USE_X11= YES GNU_CONFIGURE= YES +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS+= --disable-sound .include "../../devel/SDL/buildlink2.mk" + +PTHREAD_LIBS= -lpthread + +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") +PTHREAD_LIBS+= -lpth +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/games/lbreakout/PLIST b/games/lbreakout/PLIST index a400fafb03b..cbaca2b7dc8 100644 --- a/games/lbreakout/PLIST +++ b/games/lbreakout/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:53:54 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/01/25 12:09:11 rh Exp $ bin/lbreakout share/games/lbreakout/ball.bmp share/games/lbreakout/bkgnd0.bmp @@ -48,4 +48,4 @@ share/games/lbreakout/wontgiveup.wav @exec install -c -m 666 -o games -g games %D/share/games/lbreakout/lbreakout.hscr /var/games @unexec echo "===> High scores have been preserved in '/var/games/lbreakout.hscr'" ; echo " If you no longer need this file, you can delete it manually." @dirrm share/games/lbreakout -@dirrm share/games +@unexec ${RMDIR} %D/share/games 2>/dev/null || ${TRUE} diff --git a/games/lbreakout/distinfo b/games/lbreakout/distinfo index 75e80279e3e..b725420e8ac 100644 --- a/games/lbreakout/distinfo +++ b/games/lbreakout/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/08/15 19:41:44 rh Exp $ +$NetBSD: distinfo,v 1.4 2003/01/25 12:09:11 rh Exp $ SHA1 (lbreakout-010315.tar.gz) = 9385f4690aee645955acb23d8481957aaaf0e2fb Size (lbreakout-010315.tar.gz) = 655418 bytes -SHA1 (patch-aa) = 1498c536e96227e8c008670eeb4c023cabc6edc9 +SHA1 (patch-aa) = b17cf4a529748481e8a63df7ec9907caef6156f5 SHA1 (patch-ab) = 27dd2449c2f9a9e3e08410531ecaf2365b194a71 SHA1 (patch-ac) = 6e0c3b9cdbbdec8a2bf47c46a52590c57b4fe706 diff --git a/games/lbreakout/patches/patch-aa b/games/lbreakout/patches/patch-aa index d5db40e50f1..cf2272c0e29 100644 --- a/games/lbreakout/patches/patch-aa +++ b/games/lbreakout/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2001/08/15 19:41:45 rh Exp $ +$NetBSD: patch-aa,v 1.3 2003/01/25 12:09:12 rh Exp $ --- configure.orig Thu Mar 15 10:05:08 2001 +++ configure Tue Aug 14 20:05:05 2001 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2001/08/15 19:41:45 rh Exp $ else SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ SDL_LIBS="`$SDL_CONFIG $sdlconf_args --libs` -lpthread -lpth -lcompat" ++ SDL_LIBS="`$SDL_CONFIG $sdlconf_args --libs` ${PTHREAD_LIBS} -lcompat" sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -- cgit v1.2.3