[98202] trunk/dports/games/frozenbubble2

[jmr at macports.org]

Revision: 98202
          http://trac.macports.org//changeset/98202
Author:   jmr at macports.org
Date:     2012-09-28 15:33:44 -0700 (Fri, 28 Sep 2012)
Log Message:
-----------
frozenbubble2: build with correct perl and CC

Modified Paths:
--------------
    trunk/dports/games/frozenbubble2/Portfile
    trunk/dports/games/frozenbubble2/files/patch-Makefile.diff

Added Paths:
-----------
    trunk/dports/games/frozenbubble2/files/patch-c_stuff-Makefile.diff

Modified: trunk/dports/games/frozenbubble2/Portfile
===================================================================
--- trunk/dports/games/frozenbubble2/Portfile	2012-09-28 22:06:50 UTC (rev 98201)
+++ trunk/dports/games/frozenbubble2/Portfile	2012-09-28 22:33:44 UTC (rev 98202)
@@ -34,13 +34,15 @@
 
 # uses nested functions
 compiler.blacklist  clang
-patchfiles	      patch-c_stuff-Makefile.PL.diff patch-Makefile.diff
+patchfiles	      patch-c_stuff-Makefile.PL.diff patch-Makefile.diff patch-c_stuff-Makefile.diff
 
 configure {
     foreach file [glob ${worksrcpath}/frozen-bubble*] {
         reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" ${file}
     }
+    reinplace "s|__PERL__|${prefix}/bin/perl5.12|" ${worksrcpath}/Makefile \
+        ${worksrcpath}/c_stuff/Makefile
 }
 
-build.args	      PREFIX=${prefix}
-destroot.args-append  PREFIX=${prefix}
+build.args	      PREFIX="${prefix}" CC="${configure.cc}" LD="${configure.cc}"
+destroot.args  PREFIX="${prefix}"

Modified: trunk/dports/games/frozenbubble2/files/patch-Makefile.diff
===================================================================
--- trunk/dports/games/frozenbubble2/files/patch-Makefile.diff	2012-09-28 22:06:50 UTC (rev 98201)
+++ trunk/dports/games/frozenbubble2/files/patch-Makefile.diff	2012-09-28 22:33:44 UTC (rev 98202)
@@ -1,6 +1,21 @@
---- Makefile.orig	2006-12-24 16:08:12.000000000 +0100
-+++ Makefile	2006-12-24 16:09:23.000000000 +0100
-@@ -26,7 +26,7 @@
+--- Makefile.orig	2008-11-09 01:47:24.000000000 +1100
++++ Makefile	2012-09-29 08:16:18.000000000 +1000
+@@ -11,11 +11,11 @@
+ 	echo '@EXPORT = qw($$FPATH $$FLPATH);' >> c_stuff/lib/fb_config.pm
+ 	echo '$$FPATH = "$(DATADIR)/frozen-bubble";' >> c_stuff/lib/fb_config.pm
+ 	echo '$$FLPATH = "$(LIBDIR)/frozen-bubble";' >> c_stuff/lib/fb_config.pm
+-	perl -ne "print \$$1 if m|\\\$$version = '(.*)';|" c_stuff/lib/fb_stuff.pm > VERSION
++	__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
++	@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
+@@ -28,7 +28,7 @@
  	install -d $(DESTDIR)$(BINDIR)
  	install frozen-bubble frozen-bubble-editor $(DESTDIR)$(BINDIR)
  	install -d $(DESTDIR)$(DATADIR)/frozen-bubble
@@ -9,8 +24,8 @@
  	install -d $(DESTDIR)$(MANDIR)/man6
  	install doc/*.6 $(DESTDIR)$(MANDIR)/man6
  
-@@ -36,3 +36,4 @@
+@@ -38,3 +38,4 @@
  	done
- 	@if [ -d save_virgin ]; then cp -f save_virgin/fb_stuff.pm c_stuff/lib/fb_stuff.pm; rm -rf save_virgin; fi
+ 	@rm -f c_stuff/lib/fb_config.pm
  
 +.PHONY: clean install prepare dirs

Added: trunk/dports/games/frozenbubble2/files/patch-c_stuff-Makefile.diff
===================================================================
--- trunk/dports/games/frozenbubble2/files/patch-c_stuff-Makefile.diff	                        (rev 0)
+++ trunk/dports/games/frozenbubble2/files/patch-c_stuff-Makefile.diff	2012-09-28 22:33:44 UTC (rev 98202)
@@ -0,0 +1,11 @@
+--- c_stuff/Makefile.orig	2008-11-16 01:23:58.000000000 +1100
++++ c_stuff/Makefile	2012-09-29 08:19:53.000000000 +1000
+@@ -51,7 +51,7 @@
+     $(PMO_INSTALLMAN1DIR) $(PMO_INSTALLMAN3DIR)
+ 
+ Makefile_c: Makefile.PL
+-	perl Makefile.PL $(PERL_MAKE_OPTS) INSTALLDIRS=$(INSTALLDIRS)
++	__PERL__ Makefile.PL $(PERL_MAKE_OPTS) INSTALLDIRS=$(INSTALLDIRS)
+ 
+ fb_c_stuff: %: %.xs Makefile_c
+ 	$(MAKE) -f Makefile_c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120928/c8183aef/attachment.html>