Changeset 82765

Timestamp:

08/19/11 16:31:34 (4 years ago)

Author:

jmr@…

Message:

criticalmass: use -lpng not -lpng12, and don't link the Packer tool against SDLmain

Location:

trunk/dports/games/criticalmass

Files:

• Portfile (modified) (1 diff)
• files/patch-configure.diff (modified) (2 diffs)
• files/patch-defines.h.in.diff (added)
• files/patch-tools_Makefile.in.diff (added)
• files/patch-tools_Packer.cpp.diff (added)

trunk/dports/games/criticalmass/Portfile

@@ -27 +27 @@
                 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

trunk/dports/games/criticalmass/files/patch-configure.diff

@@ -1 @@
---- 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 @@
  
@@ -10 +10 @@
  
  
+@@ -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