diff options
author | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
commit | 92e0cb52cb783546e352182244f761180817e141 (patch) | |
tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /games/criticalmass | |
parent | 01bd00f60b043c603cfe4fa796bf28af3a849cca (diff) | |
download | pkgsrc-92e0cb52cb783546e352182244f761180817e141.tar.gz |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'games/criticalmass')
-rw-r--r-- | games/criticalmass/Makefile | 4 | ||||
-rw-r--r-- | games/criticalmass/distinfo | 3 | ||||
-rw-r--r-- | games/criticalmass/patches/patch-aa | 54 |
3 files changed, 58 insertions, 3 deletions
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index b3dcbb98878..d807ec4e034 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2010/01/18 09:58:50 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:18 wiz Exp $ # DISTNAME= CriticalMass-1.0.2 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=criticalmass/} EXTRACT_SUFX= .tar.bz2 diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo index 78464fc6380..29e49d8d09d 100644 --- a/games/criticalmass/distinfo +++ b/games/criticalmass/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2006/08/15 08:42:36 xtraeme Exp $ +$NetBSD: distinfo,v 1.8 2010/06/13 22:44:18 wiz Exp $ SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes +SHA1 (patch-aa) = c8f329fdf20df88a961e95b2a1fb8dbca85871f0 diff --git a/games/criticalmass/patches/patch-aa b/games/criticalmass/patches/patch-aa new file mode 100644 index 00000000000..696c9dd3c75 --- /dev/null +++ b/games/criticalmass/patches/patch-aa @@ -0,0 +1,54 @@ +$NetBSD: patch-aa,v 1.3 2010/06/13 22:44:18 wiz Exp $ + +--- configure.orig 2006-07-16 01:48:28.000000000 +0000 ++++ configure +@@ -3864,13 +3864,13 @@ else + 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 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + 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 + _ACEOF + +- LIBS="-lpng12 $LIBS" ++ LIBS="-lpng $LIBS" + + else + { { echo "$as_me:$LINENO: error: libpng is needed" >&5 |