[82765] trunk/dports/games/criticalmass
jmr at macports.org
jmr at macports.org
Fri Aug 19 16:31:35 PDT 2011
Revision: 82765
http://trac.macports.org/changeset/82765
Author: jmr at macports.org
Date: 2011-08-19 16:31:34 -0700 (Fri, 19 Aug 2011)
Log Message:
-----------
criticalmass: use -lpng not -lpng12, and don't link the Packer tool against SDLmain
Modified Paths:
--------------
trunk/dports/games/criticalmass/Portfile
trunk/dports/games/criticalmass/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/games/criticalmass/files/patch-defines.h.in.diff
trunk/dports/games/criticalmass/files/patch-tools_Makefile.in.diff
trunk/dports/games/criticalmass/files/patch-tools_Packer.cpp.diff
Modified: trunk/dports/games/criticalmass/Portfile
===================================================================
--- trunk/dports/games/criticalmass/Portfile 2011-08-19 23:06:23 UTC (rev 82764)
+++ trunk/dports/games/criticalmass/Portfile 2011-08-19 23:31:34 UTC (rev 82765)
@@ -26,7 +26,9 @@
port:libpng \
port:zlib
-patchfiles patch-configure.diff patch-utils_GetDataPath.hpp.diff
+patchfiles patch-configure.diff patch-utils_GetDataPath.hpp.diff \
+ patch-defines.h.in.diff patch-tools_Packer.cpp.diff \
+ patch-tools_Makefile.in.diff
configure.args --mandir=${prefix}/share/man
Modified: trunk/dports/games/criticalmass/files/patch-configure.diff
===================================================================
--- trunk/dports/games/criticalmass/files/patch-configure.diff 2011-08-19 23:06:23 UTC (rev 82764)
+++ trunk/dports/games/criticalmass/files/patch-configure.diff 2011-08-19 23:31:34 UTC (rev 82765)
@@ -1,5 +1,5 @@
---- configure.orig 2008-05-28 22:12:35.000000000 +1000
-+++ configure 2008-05-28 22:13:46.000000000 +1000
+--- configure.orig 2006-07-16 11:48:28.000000000 +1000
++++ configure 2011-08-20 09:11:58.000000000 +1000
@@ -1664,7 +1664,7 @@
@@ -9,3 +9,54 @@
VERSION=1.0.2
+@@ -3864,13 +3864,13 @@
+ LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
+ CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+
+-echo "$as_me:$LINENO: checking for main in -lpng12" >&5
+-echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
+-if test "${ac_cv_lib_png12_main+set}" = set; then
++echo "$as_me:$LINENO: checking for main in -lpng" >&5
++echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng12 $LIBS"
++LIBS="-lpng $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -3908,25 +3908,25 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_png12_main=yes
++ ac_cv_lib_png_main=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_png12_main=no
++ac_cv_lib_png_main=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
+-if test $ac_cv_lib_png12_main = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
++echo "${ECHO_T}$ac_cv_lib_png_main" >&6
++if test $ac_cv_lib_png_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBPNG12 1
++#define HAVE_LIBPNG 1
+ _ACEOF
+
+- LIBS="-lpng12 $LIBS"
++ LIBS="-lpng $LIBS"
+
+ else
+ { { echo "$as_me:$LINENO: error: libpng is needed" >&5
Added: trunk/dports/games/criticalmass/files/patch-defines.h.in.diff
===================================================================
--- trunk/dports/games/criticalmass/files/patch-defines.h.in.diff (rev 0)
+++ trunk/dports/games/criticalmass/files/patch-defines.h.in.diff 2011-08-19 23:31:34 UTC (rev 82765)
@@ -0,0 +1,13 @@
+--- defines.h.in.orig 2006-07-16 11:48:28.000000000 +1000
++++ defines.h.in 2011-08-20 09:14:34.000000000 +1000
+@@ -6,8 +6,8 @@
+ /* Define to 1 if you have the `m' library (-lm). */
+ #undef HAVE_LIBM
+
+-/* Define to 1 if you have the `png12' library (-lpng12). */
+-#undef HAVE_LIBPNG12
++/* Define to 1 if you have the `png' library (-lpng). */
++#undef HAVE_LIBPNG
+
+ /* Define to 1 if you have the `z' library (-lz). */
+ #undef HAVE_LIBZ
Added: trunk/dports/games/criticalmass/files/patch-tools_Makefile.in.diff
===================================================================
--- trunk/dports/games/criticalmass/files/patch-tools_Makefile.in.diff (rev 0)
+++ trunk/dports/games/criticalmass/files/patch-tools_Makefile.in.diff 2011-08-19 23:31:34 UTC (rev 82765)
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig 2006-07-16 11:48:27.000000000 +1000
++++ tools/Makefile.in 2011-08-20 09:25:42.000000000 +1000
+@@ -226,7 +226,7 @@
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ Packer$(EXEEXT): $(Packer_OBJECTS) $(Packer_DEPENDENCIES)
+ @rm -f Packer$(EXEEXT)
+- $(CXXLINK) $(Packer_LDFLAGS) $(Packer_OBJECTS) $(Packer_LDADD) $(LIBS)
++ $(CXXLINK) $(Packer_LDFLAGS) $(Packer_OBJECTS) $(Packer_LDADD) `echo $(LIBS) | sed 's/-lSDLmain//'`
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
Added: trunk/dports/games/criticalmass/files/patch-tools_Packer.cpp.diff
===================================================================
--- trunk/dports/games/criticalmass/files/patch-tools_Packer.cpp.diff (rev 0)
+++ trunk/dports/games/criticalmass/files/patch-tools_Packer.cpp.diff 2011-08-19 23:31:34 UTC (rev 82765)
@@ -0,0 +1,8 @@
+--- tools/Packer.cpp.orig 2005-08-01 06:09:16.000000000 +1000
++++ tools/Packer.cpp 2011-08-20 09:24:02.000000000 +1000
+@@ -1,5 +1,3 @@
+-#include "SDL.h" //needed for SDL_main
+-
+ #include <limits.h>
+ #include <stdlib.h>
+ #include <unistd.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110819/0a0b0b34/attachment.html>
More information about the macports-changes
mailing list