cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use MAKE_ENV rather than patching Makefile to let this build without

Browse Source 
perl being linked with -lpthread
This commit is contained in:
sthen 2012-09-07 08:12:50 +00:00
parent ec2304b599
commit 18aaeff9cc
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
games/frozen-bubble/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2012/09/02 20:52:35 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2012/09/07 08:12:50 sthen Exp $
SHARED_ONLY = Yes
@ -26,7 +26,8 @@ MASTER_SITES = ${HOMEPAGE}/data/
EXTRACT_SUFX = .tar.bz2
USE_GMAKE = Yes
USE_GROFF = Yes
MAKE_ENV = LD_PRELOAD=libpthread.so # XXX remove when perl is -lpthread
# No regress tests here
NO_REGRESS = Yes

15
games/frozen-bubble/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.2 2012/09/02 20:52:35 sthen Exp $
--- Makefile.orig Sat Nov 8 07:47:24 2008
+++ Makefile Fri Aug 31 14:58:18 2012
@@ -10,12 +10,10 @@ prepare:
$OpenBSD: patch-Makefile,v 1.3 2012/09/07 08:12:50 sthen Exp $
--- Makefile.orig Sat Nov 8 14:47:24 2008
+++ Makefile Mon Sep 3 12:40:28 2012
@@ -10,7 +10,7 @@ prepare:
echo '@ISA = qw(Exporter);' >> c_stuff/lib/fb_config.pm
echo '@EXPORT = qw($$FPATH $$FLPATH);' >> c_stuff/lib/fb_config.pm
echo '$$FPATH = "$(DATADIR)/frozen-bubble";' >> c_stuff/lib/fb_config.pm
@ -10,12 +10,7 @@ $OpenBSD: patch-Makefile,v 1.2 2012/09/02 20:52:35 sthen Exp $
perl -ne "print \$$1 if m|\\\$$version = '(.*)';|" c_stuff/lib/fb_stuff.pm > VERSION
dirs:
- @if ! perl -e 'use SDL'; then echo -e "\n *** I need perl-SDL installed"; false; fi
- @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 0 if $$mj > 1 || $$mn >= 19; exit 1'; then echo -e "\n *** I need perl-SDL version 1.19.0 or upper"; false; fi
@for n in . $(DIRS); do \
[ "$$n" = "." ] || $(MAKE) -C $$n || exit $$? ;\
done
@@ -25,12 +23,21 @@ install: $(ALL)
@@ -25,12 +25,21 @@ install: $(ALL)
@for n in $(DIRS); do \
(cd $$n; $(MAKE) install) \
done