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

bodge frozen-bubble into working following changes to pthreads;

Browse Source 
- patch the Makefile to avoid p5-SDL version checks which require
pthread functions

- install a wrapper script to preload pthread/so before running
frozen-bubble{,-editor}

ok aja
This commit is contained in:
sthen 2012-09-02 20:52:35 +00:00
parent 20f1820e90
commit 21206b5a47
5 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
games/frozen-bubble/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2012/09/01 14:36:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2012/09/02 20:52:35 sthen Exp $
SHARED_ONLY = Yes
@ -59,4 +59,12 @@ WANTLIB-server = ${MODGETTEXT_WANTLIB} c glib-2.0
MULTI_PACKAGES = -main -server
post-configure:
${SUBST_CMD} -c ${FILESDIR}/wrapper.sh ${WRKDIR}/wrapper.sh
post-install:
mv ${PREFIX}/bin/frozen-bubble* ${PREFIX}/libexec/frozen-bubble/
${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/frozen-bubble
${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/frozen-bubble-editor
.include <bsd.port.mk>

2
games/frozen-bubble/files/wrapper.sh Normal file
View File

@ -0,0 +1,2 @@
#!/bin/sh
LD_PRELOAD=libpthread.so exec ${PREFIX}/libexec/frozen-bubble/`basename $0` $*

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2009/06/02 22:07:25 sthen Exp $
--- Makefile.orig Sat Nov 8 06:47:24 2008
+++ Makefile Tue May 26 00:08:19 2009
@@ -10,7 +10,7 @@ prepare:
$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:
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,7 +10,12 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2009/06/02 22:07:25 sthen Exp $
perl -ne "print \$$1 if m|\\\$$version = '(.*)';|" c_stuff/lib/fb_stuff.pm > VERSION
dirs:
@@ -25,12 +25,21 @@ install: $(ALL)
- @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)
@for n in $(DIRS); do \
(cd $$n; $(MAKE) install) \
done

7
games/frozen-bubble/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2009/06/02 22:07:25 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2012/09/02 20:52:35 sthen Exp $
bin/frozen-bubble
bin/frozen-bubble-editor
${P5ARCH}/FBLE.pm
@ -10,7 +10,10 @@ ${P5ARCH}/fb_config.pm
${P5ARCH}/fb_net.pm
${P5ARCH}/fb_net_discover.pm
${P5ARCH}/fb_stuff.pm
@comment ${P5ARCH}/fb_stuff.pm.orig
${P5ARCH}/fbsyms.pm
libexec/frozen-bubble/frozen-bubble
libexec/frozen-bubble/frozen-bubble-editor
@man man/man6/frozen-bubble-editor.6
@man man/man6/frozen-bubble.6
share/frozen-bubble/
@ -3239,8 +3242,6 @@ share/frozen-bubble/snd/rebound.ogg
share/frozen-bubble/snd/snore.ogg
share/frozen-bubble/snd/stick.ogg
share/frozen-bubble/snd/typewriter.ogg
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/frozen-bubble.mo
share/locale/bg/LC_MESSAGES/frozen-bubble.mo
share/locale/br/

6
games/frozen-bubble/pkg/PLIST-server
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-server,v 1.1.1.1 2009/06/02 22:07:25 sthen Exp $
@comment @dirrm ${P5ARCH}/
@comment @dirrm ${P5ARCH}/auto/
@comment $OpenBSD: PLIST-server,v 1.2 2012/09/02 20:52:35 sthen Exp $
@comment ${P5ARCH}/
@comment ${P5ARCH}/auto/
libexec/frozen-bubble/
@bin libexec/frozen-bubble/fb-server