diff options
| -rw-r--r-- | games/lbreakout/Makefile | 10 | ||||
| -rw-r--r-- | games/lbreakout/distinfo | 6 | ||||
| -rw-r--r-- | games/lbreakout/patches/patch-aa | 4 | ||||
| -rw-r--r-- | games/lbreakout/patches/patch-ab | 17 |
4 files changed, 20 insertions, 17 deletions
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index b1d6802e616..a68c3f5a6a4 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:19 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2006/03/28 22:03:42 joerg Exp $ DISTNAME= lbreakout-010315 PKGREVISION= 7 @@ -10,15 +10,9 @@ HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Breakout-style arcade game GNU_CONFIGURE= YES -CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS:Q} CONFIGURE_ARGS+= --disable-sound .include "../../devel/SDL/buildlink3.mk" - -PTHREAD_LIBS= -lpthread - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") -PTHREAD_LIBS+= -lpth -.endif +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lbreakout/distinfo b/games/lbreakout/distinfo index b6ea5c524f0..67104fecda0 100644 --- a/games/lbreakout/distinfo +++ b/games/lbreakout/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 23:12:00 agc Exp $ +$NetBSD: distinfo,v 1.7 2006/03/28 22:03:42 joerg Exp $ SHA1 (lbreakout-010315.tar.gz) = 9385f4690aee645955acb23d8481957aaaf0e2fb RMD160 (lbreakout-010315.tar.gz) = ecb5784ec9475766035fabd84609c8a71581219d Size (lbreakout-010315.tar.gz) = 655418 bytes -SHA1 (patch-aa) = 06b9b215f277f61a52272afa1d82e6df157bd104 -SHA1 (patch-ab) = 27dd2449c2f9a9e3e08410531ecaf2365b194a71 +SHA1 (patch-aa) = 9b359426c12be3b8314d78de7ac091f9a4f7c1ac +SHA1 (patch-ab) = dd10c1b22d71ab3d491458fc24f58971ce1f3f74 SHA1 (patch-ac) = 0dd6692789e41eb0f32d34dc2f4efd9efc1fec8a diff --git a/games/lbreakout/patches/patch-aa b/games/lbreakout/patches/patch-aa index bce3d387e89..c314e4d7a17 100644 --- a/games/lbreakout/patches/patch-aa +++ b/games/lbreakout/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2005/02/20 01:09:28 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2006/03/28 22:03:42 joerg 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.4 2005/02/20 01:09:28 wiz Exp $ else SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ SDL_LIBS="`$SDL_CONFIG $sdlconf_args --libs` ${PTHREAD_LIBS}" ++ SDL_LIBS="`$SDL_CONFIG $sdlconf_args --libs` ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` diff --git a/games/lbreakout/patches/patch-ab b/games/lbreakout/patches/patch-ab index 8b618d89d79..02cd63d7d46 100644 --- a/games/lbreakout/patches/patch-ab +++ b/games/lbreakout/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2001/08/15 19:41:45 rh Exp $ +$NetBSD: patch-ab,v 1.3 2006/03/28 22:03:42 joerg Exp $ ---- lbreakout/Makefile.in.orig Tue Aug 14 20:05:31 2001 -+++ lbreakout/Makefile.in Tue Aug 14 20:06:06 2001 -@@ -353,7 +353,8 @@ +--- lbreakout/Makefile.in.orig 2001-03-15 15:28:10.000000000 +0000 ++++ lbreakout/Makefile.in +@@ -80,7 +80,7 @@ DEFS = @sound_flag@ @inst_flag@ @hi_inst + + bin_PROGRAMS = lbreakout + lbreakout_SOURCES = hiscore.cpp dynlist.c level.cpp breakout.cpp sndsrv.c sdl.c menumanager.cpp menuitem.cpp menu.cpp game.cpp main.cpp +-lbreakout_LDADD = -lpthread -lm @thread_flag@ ++lbreakout_LDADD = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lm @thread_flag@ + + EXTRA_SUBDIRS = manual + +@@ -353,7 +353,8 @@ install-data-local: $(INSTALL_DATA) wontgiveup.wav $(DESTDIR)$(sdir)/wontgiveup.wav $(INSTALL_DATA) speedup.wav $(DESTDIR)$(sdir)/speedup.wav $(INSTALL_DATA) speeddown.wav $(DESTDIR)$(sdir)/speeddown.wav |