Sat Dec 10 21:46:52 2016 UTC ()
Remove use of ancient and highly insecure curl-7.14.0; use pkgsrc curl.
Also disable online update by default. (It can be re-enabled in the
config.)  PKGREVISION -> 8.


(dholland)
diff -r1.37 -r1.38 pkgsrc/games/criticalmass/Makefile
diff -r1.13 -r1.14 pkgsrc/games/criticalmass/distinfo
diff -r0 -r1.1 pkgsrc/games/criticalmass/patches/patch-Makefile.am
diff -r0 -r1.1 pkgsrc/games/criticalmass/patches/patch-Makefile.in
diff -r0 -r1.1 pkgsrc/games/criticalmass/patches/patch-game_Makefile.am
diff -r0 -r1.1 pkgsrc/games/criticalmass/patches/patch-game_Makefile.in
diff -r1.4 -r1.5 pkgsrc/games/criticalmass/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/games/criticalmass/patches/patch-game_main.cpp
cvs diff -r1.37 -r1.38 pkgsrc/games/criticalmass/Makefile (expand / switch to unified diff)

--- pkgsrc/games/criticalmass/Makefile 2015/04/25 14:22:53 1.37
+++ pkgsrc/games/criticalmass/Makefile 2016/12/10 21:46:51 1.38
@@ -1,27 +1,32 @@ @@ -1,27 +1,32 @@
1# $NetBSD: Makefile,v 1.37 2015/04/25 14:22:53 tnn Exp $ 1# $NetBSD: Makefile,v 1.38 2016/12/10 21:46:51 dholland Exp $
2# 2#
3 3
4DISTNAME= CriticalMass-1.0.2 4DISTNAME= CriticalMass-1.0.2
5PKGNAME= ${DISTNAME:tl} 5PKGNAME= ${DISTNAME:tl}
6PKGREVISION= 7 6PKGREVISION= 8
7CATEGORIES= games 7CATEGORIES= games
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=criticalmass/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=criticalmass/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://criticalmass.sourceforge.net/ 12HOMEPAGE= http://criticalmass.sourceforge.net/
13COMMENT= SDL/OpenGL space shoot'em up game 13COMMENT= SDL/OpenGL space shoot'em up game
14 14
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= gmake 18USE_TOOLS+= gmake
19 19
20LDFLAGS.SunOS+= -lsocket -lnsl 20LDFLAGS.SunOS+= -lsocket -lnsl
21 21
 22# delete builtin curl
 23post-extract:
 24 ${RM} -rf ${WRKSRC}/curl
 25
22.include "../../audio/SDL_mixer/buildlink3.mk" 26.include "../../audio/SDL_mixer/buildlink3.mk"
23.include "../../devel/SDL/buildlink3.mk" 27.include "../../devel/SDL/buildlink3.mk"
24.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
25.include "../../graphics/SDL_image/buildlink3.mk" 29.include "../../graphics/SDL_image/buildlink3.mk"
26.include "../../graphics/png/buildlink3.mk" 30.include "../../graphics/png/buildlink3.mk"
 31.include "../../www/curl/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/games/criticalmass/distinfo (expand / switch to unified diff)

--- pkgsrc/games/criticalmass/distinfo 2015/11/03 20:56:47 1.13
+++ pkgsrc/games/criticalmass/distinfo 2016/12/10 21:46:51 1.14
@@ -1,37 +1,41 @@ @@ -1,37 +1,41 @@
1$NetBSD: distinfo,v 1.13 2015/11/03 20:56:47 agc Exp $ 1$NetBSD: distinfo,v 1.14 2016/12/10 21:46:51 dholland Exp $
2 2
3SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b 3SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b
4RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d 4RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d
5SHA512 (CriticalMass-1.0.2.tar.bz2) = af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037 5SHA512 (CriticalMass-1.0.2.tar.bz2) = af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037
6Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes 6Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes
7SHA1 (patch-aa) = a5caa2facea22cd5e7d208540626ed2163d81f18 7SHA1 (patch-Makefile.am) = 32fb9a02d4bd9875317f0a53ac25c7e1f3886542
 8SHA1 (patch-Makefile.in) = c63d831b2a3760f4880a0f6480d08950398823e3
 9SHA1 (patch-aa) = 9fc730c1eb872ee30a24551be873161a79bffb66
8SHA1 (patch-game_BitmapManager.cpp) = 31265aeb2f97b642ca8d7f862de13e6442287a27 10SHA1 (patch-game_BitmapManager.cpp) = 31265aeb2f97b642ca8d7f862de13e6442287a27
9SHA1 (patch-game_CallbackManager.cpp) = 6c5a7285397e52f3792420cc3bd775b6c0bd1c67 11SHA1 (patch-game_CallbackManager.cpp) = 6c5a7285397e52f3792420cc3bd775b6c0bd1c67
10SHA1 (patch-game_CallbackManager.hpp) = 8eb7c0830fe883b75e23c163d488dd1ef5e1980b 12SHA1 (patch-game_CallbackManager.hpp) = 8eb7c0830fe883b75e23c163d488dd1ef5e1980b
11SHA1 (patch-game_FontManager.cpp) = 13e99966beba8b27e9bd1de41859fb7c6745b111 13SHA1 (patch-game_FontManager.cpp) = 13e99966beba8b27e9bd1de41859fb7c6745b111
12SHA1 (patch-game_Input.cpp) = a7b8587fc7a11879017a439e1a22b351c1819af2 14SHA1 (patch-game_Input.cpp) = a7b8587fc7a11879017a439e1a22b351c1819af2
13SHA1 (patch-game_Input.hpp) = 25cda998a93075d527f79938f27e2f7d70248125 15SHA1 (patch-game_Input.hpp) = 25cda998a93075d527f79938f27e2f7d70248125
 16SHA1 (patch-game_Makefile.am) = 9b9e63de5c937e3242968d773f3bee641768f284
 17SHA1 (patch-game_Makefile.in) = ca85a895312fe3e7f7a557bb9358bd77ef241e75
14SHA1 (patch-game_ModelManager.cpp) = 5f2bd67348673aefb8fb2b45e8e899e9afbff2d7 18SHA1 (patch-game_ModelManager.cpp) = 5f2bd67348673aefb8fb2b45e8e899e9afbff2d7
15SHA1 (patch-game_ModelManager.hpp) = f12fdc00bc675480f39671dc0019637672b09814 19SHA1 (patch-game_ModelManager.hpp) = f12fdc00bc675480f39671dc0019637672b09814
16SHA1 (patch-game_ParticleGroup.cpp) = f027845125e3ea383976a3062f704a03d74865c4 20SHA1 (patch-game_ParticleGroup.cpp) = f027845125e3ea383976a3062f704a03d74865c4
17SHA1 (patch-game_ParticleGroup.hpp) = 97b7cf075ea4ca33bc55d69ba3b21f90bb2002a9 21SHA1 (patch-game_ParticleGroup.hpp) = 97b7cf075ea4ca33bc55d69ba3b21f90bb2002a9
18SHA1 (patch-game_ParticleGroupManager.hpp) = f88c5fa653de8defa40e8de5ac4485307e317e0d 22SHA1 (patch-game_ParticleGroupManager.hpp) = f88c5fa653de8defa40e8de5ac4485307e317e0d
19SHA1 (patch-game_SampleManager.cpp) = e4b7178222d91d186b1dc104dbdb7c73082bb067 23SHA1 (patch-game_SampleManager.cpp) = e4b7178222d91d186b1dc104dbdb7c73082bb067
20SHA1 (patch-game_SelectableFactory.cpp) = 885893f1f5b7f9faddcdcb9723bea879c0241f7f 24SHA1 (patch-game_SelectableFactory.cpp) = 885893f1f5b7f9faddcdcb9723bea879c0241f7f
21SHA1 (patch-game_SelectableFactory.hpp) = 99fab8bf9857f3e5b298caf08e3752870801daf6 25SHA1 (patch-game_SelectableFactory.hpp) = 99fab8bf9857f3e5b298caf08e3752870801daf6
22SHA1 (patch-game_WeaponDepot.cpp) = bc58e929983e1db2597f58c76b8567274a864133 26SHA1 (patch-game_WeaponDepot.cpp) = bc58e929983e1db2597f58c76b8567274a864133
23SHA1 (patch-game_WeaponDepot.hpp) = 3e54c85932c9c1dec781b5a6c57f0c855b40854f 27SHA1 (patch-game_WeaponDepot.hpp) = 3e54c85932c9c1dec781b5a6c57f0c855b40854f
24SHA1 (patch-game_main.cpp) = 9dbf9b3de9de4ce97b0ed99ab4f4c983159124c0 28SHA1 (patch-game_main.cpp) = 2c8983487e6cd50bc7cea1e7b1f6e19ea8591a0e
25SHA1 (patch-tinyxml_tinyxml.cpp) = e25526fff0121795c1a54089b87ede52eb86f124 29SHA1 (patch-tinyxml_tinyxml.cpp) = e25526fff0121795c1a54089b87ede52eb86f124
26SHA1 (patch-tinyxml_tinyxmlparser.cpp) = 236ff1cbd6fe83045df28022a6b02f9f65da4ee8 30SHA1 (patch-tinyxml_tinyxmlparser.cpp) = 236ff1cbd6fe83045df28022a6b02f9f65da4ee8
27SHA1 (patch-tools_Packer.cpp) = 06f2ce956fd627ef2293c3650238996b3f800d4c 31SHA1 (patch-tools_Packer.cpp) = 06f2ce956fd627ef2293c3650238996b3f800d4c
28SHA1 (patch-utils_Config.cpp) = 9f146ad01fbea62270a20c5f9ed5a1e70a6c60ce 32SHA1 (patch-utils_Config.cpp) = 9f146ad01fbea62270a20c5f9ed5a1e70a6c60ce
29SHA1 (patch-utils_Config.hpp) = c2bdaceef30711421c0c77ad680d01cb062f16a9 33SHA1 (patch-utils_Config.hpp) = c2bdaceef30711421c0c77ad680d01cb062f16a9
30SHA1 (patch-utils_FindHash.hpp) = 0164c7b802be3fa50dcfcd0545a8d56743762d1e 34SHA1 (patch-utils_FindHash.hpp) = 0164c7b802be3fa50dcfcd0545a8d56743762d1e
31SHA1 (patch-utils_ResourceCache.hpp) = e127f87ae94e6f9260f130bb22cdb92a8650d496 35SHA1 (patch-utils_ResourceCache.hpp) = e127f87ae94e6f9260f130bb22cdb92a8650d496
32SHA1 (patch-utils_ResourceManager.cpp) = 3234b06c4b5a448aba2e3902deaba501033af88f 36SHA1 (patch-utils_ResourceManager.cpp) = 3234b06c4b5a448aba2e3902deaba501033af88f
33SHA1 (patch-utils_ResourceManager.hpp) = 8f29cfb3bf2aa1844f5987abddf854594b229f5c 37SHA1 (patch-utils_ResourceManager.hpp) = 8f29cfb3bf2aa1844f5987abddf854594b229f5c
34SHA1 (patch-utils_Value.hpp) = e5b6700167a6fc3dd1275cda4b17cab85d68d22d 38SHA1 (patch-utils_Value.hpp) = e5b6700167a6fc3dd1275cda4b17cab85d68d22d
35SHA1 (patch-utils_zStream.cpp) = b94b48862bbcfbdfbe84d7d1e6bf8133921d80aa 39SHA1 (patch-utils_zStream.cpp) = b94b48862bbcfbdfbe84d7d1e6bf8133921d80aa
36SHA1 (patch-utils_zStreamBufferImplZLib.cpp) = ad7a4bc3d6a36274d2a71e0d6201b20461274b89 40SHA1 (patch-utils_zStreamBufferImplZLib.cpp) = ad7a4bc3d6a36274d2a71e0d6201b20461274b89
37SHA1 (patch-utilsgl_GLBitmapCollection.hpp) = dd94e5bc9c71ff3d05a475f10f4f30afb3cc91f7 41SHA1 (patch-utilsgl_GLBitmapCollection.hpp) = dd94e5bc9c71ff3d05a475f10f4f30afb3cc91f7
File Added: pkgsrc/games/criticalmass/patches/patch-Makefile.am
$NetBSD: patch-Makefile.am,v 1.1 2016/12/10 21:46:52 dholland Exp $

Remove references to ancient builtin copy of curl.

--- Makefile.am~	2005-07-15 04:33:04.000000000 +0000
+++ Makefile.am
@@ -4,7 +4,7 @@
 AUTOMAKE_OPTIONS = 1.4
 
 ## Any directories that you want built and installed should go here.
-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
 
 ## Any directories you want a part of the distribution should be listed
 ## here, as well as have a Makefile generated at the end of configure.in
File Added: pkgsrc/games/criticalmass/patches/patch-Makefile.in
$NetBSD: patch-Makefile.in,v 1.1 2016/12/10 21:46:52 dholland Exp $

Remove references to ancient builtin copy of curl.

--- Makefile.in~	2006-07-16 01:48:28.000000000 +0000
+++ Makefile.in
@@ -178,7 +178,7 @@ target_vendor = @target_vendor@
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
 DIST_SUBDIRS = $(SUBDIRS)
 man_MANS = critter.6
 EXTRA_DIST = $(man_MANS)
File Added: pkgsrc/games/criticalmass/patches/patch-game_Makefile.am
$NetBSD: patch-game_Makefile.am,v 1.1 2016/12/10 21:46:52 dholland Exp $

Remove references to ancient builtin copy of curl.

--- game/Makefile.am~	2005-12-31 00:37:26.000000000 +0000
+++ game/Makefile.am
@@ -41,7 +41,7 @@ critter_SOURCES = \
         main.cpp
 
 LDADD = \
-	../curl/lib/libcurl.a \
+	-lcurl \
 	../utils/libutils.a \
 	../utilssdl/libutilssdl.a \
 	../utilsgl/libutilsgl.a \
File Added: pkgsrc/games/criticalmass/patches/patch-game_Makefile.in
$NetBSD: patch-game_Makefile.in,v 1.1 2016/12/10 21:46:52 dholland Exp $

Remove references to ancient builtin copy of curl.

--- game/Makefile.in~	2006-07-16 01:48:26.000000000 +0000
+++ game/Makefile.in
@@ -71,7 +71,7 @@ am_critter_OBJECTS = ActionCallbacks.$(O
 critter_OBJECTS = $(am_critter_OBJECTS)
 critter_LDADD = $(LDADD)
 @WIN32_TRUE@am__DEPENDENCIES_1 = critter.res
-critter_DEPENDENCIES = ../curl/lib/libcurl.a ../utils/libutils.a \
+critter_DEPENDENCIES = ../utils/libutils.a \
 	../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
 	../tinyxml/libtinyxml.a $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -231,7 +231,7 @@ critter_SOURCES = \
         XMLHelper.cpp \
         main.cpp
 
-LDADD = ../curl/lib/libcurl.a ../utils/libutils.a \
+LDADD = -lcurl ../utils/libutils.a \
 	../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
 	../tinyxml/libtinyxml.a $(am__append_1)
 @APPLE_FALSE@@WIN32_FALSE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
cvs diff -r1.4 -r1.5 pkgsrc/games/criticalmass/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/criticalmass/patches/patch-aa 2011/06/20 09:29:50 1.4
+++ pkgsrc/games/criticalmass/patches/patch-aa 2016/12/10 21:46:52 1.5
@@ -1,38 +1,47 @@ @@ -1,38 +1,47 @@
1$NetBSD: patch-aa,v 1.4 2011/06/20 09:29:50 wiz Exp $ 1$NetBSD: patch-aa,v 1.5 2016/12/10 21:46:52 dholland Exp $
2 2
3Fix configure with png>1.2. 3Fix configure with png>1.2.
 4Remove references to ancient builtin copy of curl.
4 5
5--- configure.orig 2006-07-16 01:48:28.000000000 +0000 6--- configure.orig 2006-07-16 01:48:28.000000000 +0000
6+++ configure 7+++ configure
7@@ -3864,13 +3864,13 @@ else 8@@ -272,7 +272,6 @@ PACKAGE_STRING=
 9 PACKAGE_BUGREPORT=
 10
 11 ac_unique_file="game/main.cpp"
 12-ac_subdirs_all="$ac_subdirs_all curl"
 13 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB APPLE_TRUE APPLE_FALSE WIN32_TRUE WIN32_FALSE USE_LZMA_TRUE USE_LZMA_FALSE subdirs LIBOBJS LTLIBOBJS'
 14 ac_subst_files=''
 15
 16@@ -3864,13 +3863,13 @@ else
8 LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" 17 LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
9 CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" 18 CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
10  19
11-echo "$as_me:$LINENO: checking for main in -lpng12" >&5 20-echo "$as_me:$LINENO: checking for main in -lpng12" >&5
12-echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6 21-echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
13-if test "${ac_cv_lib_png12_main+set}" = set; then 22-if test "${ac_cv_lib_png12_main+set}" = set; then
14+echo "$as_me:$LINENO: checking for main in -lpng" >&5 23+echo "$as_me:$LINENO: checking for main in -lpng" >&5
15+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6 24+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
16+if test "${ac_cv_lib_png_main+set}" = set; then 25+if test "${ac_cv_lib_png_main+set}" = set; then
17 echo $ECHO_N "(cached) $ECHO_C" >&6 26 echo $ECHO_N "(cached) $ECHO_C" >&6
18 else 27 else
19 ac_check_lib_save_LIBS=$LIBS 28 ac_check_lib_save_LIBS=$LIBS
20-LIBS="-lpng12 $LIBS" 29-LIBS="-lpng12 $LIBS"
21+LIBS="-lpng $LIBS" 30+LIBS="-lpng $LIBS"
22 cat >conftest.$ac_ext <<_ACEOF 31 cat >conftest.$ac_ext <<_ACEOF
23 /* confdefs.h. */ 32 /* confdefs.h. */
24 _ACEOF 33 _ACEOF
25@@ -3908,25 +3908,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l 34@@ -3908,25 +3907,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
26 ac_status=$? 35 ac_status=$?
27 echo "$as_me:$LINENO: \$? = $ac_status" >&5 36 echo "$as_me:$LINENO: \$? = $ac_status" >&5
28 (exit $ac_status); }; }; then 37 (exit $ac_status); }; }; then
29- ac_cv_lib_png12_main=yes 38- ac_cv_lib_png12_main=yes
30+ ac_cv_lib_png_main=yes 39+ ac_cv_lib_png_main=yes
31 else 40 else
32 echo "$as_me: failed program was:" >&5 41 echo "$as_me: failed program was:" >&5
33 sed 's/^/| /' conftest.$ac_ext >&5 42 sed 's/^/| /' conftest.$ac_ext >&5
34  43
35-ac_cv_lib_png12_main=no 44-ac_cv_lib_png12_main=no
36+ac_cv_lib_png_main=no 45+ac_cv_lib_png_main=no
37 fi 46 fi
38 rm -f conftest.err conftest.$ac_objext \ 47 rm -f conftest.err conftest.$ac_objext \
@@ -44,13 +53,21 @@ Fix configure with png>1.2. @@ -44,13 +53,21 @@ Fix configure with png>1.2.
44-if test $ac_cv_lib_png12_main = yes; then 53-if test $ac_cv_lib_png12_main = yes; then
45+echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5 54+echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
46+echo "${ECHO_T}$ac_cv_lib_png_main" >&6 55+echo "${ECHO_T}$ac_cv_lib_png_main" >&6
47+if test $ac_cv_lib_png_main = yes; then 56+if test $ac_cv_lib_png_main = yes; then
48 cat >>confdefs.h <<_ACEOF 57 cat >>confdefs.h <<_ACEOF
49 #define HAVE_LIBPNG12 1 58 #define HAVE_LIBPNG12 1
50 _ACEOF 59 _ACEOF
51  60
52- LIBS="-lpng12 $LIBS" 61- LIBS="-lpng12 $LIBS"
53+ LIBS="-lpng $LIBS" 62+ LIBS="-lpng $LIBS"
54  63
55 else 64 else
56 { { echo "$as_me:$LINENO: error: libpng is needed" >&5 65 { { echo "$as_me:$LINENO: error: libpng is needed" >&5
 66@@ -4174,7 +4173,6 @@ fi
 67
 68
 69
 70-subdirs="$subdirs curl"
 71
 72
 73 ac_config_files="$ac_config_files Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile"
cvs diff -r1.1 -r1.2 pkgsrc/games/criticalmass/patches/patch-game_main.cpp (expand / switch to unified diff)

--- pkgsrc/games/criticalmass/patches/patch-game_main.cpp 2011/06/20 09:30:03 1.1
+++ pkgsrc/games/criticalmass/patches/patch-game_main.cpp 2016/12/10 21:46:52 1.2
@@ -1,14 +1,28 @@ @@ -1,14 +1,28 @@
1$NetBSD: patch-game_main.cpp,v 1.1 2011/06/20 09:30:03 wiz Exp $ 1$NetBSD: patch-game_main.cpp,v 1.2 2016/12/10 21:46:52 dholland Exp $
2 2
3Add missing include (uncovered by png-1.5). 3Add missing include (uncovered by png-1.5).
 4Disable online update by default.
4 5
5--- game/main.cpp.orig 2006-06-30 03:46:11.000000000 +0000 6--- game/main.cpp.orig 2006-06-30 03:46:11.000000000 +0000
6+++ game/main.cpp 7+++ game/main.cpp
7@@ -24,6 +24,7 @@ 8@@ -24,17 +24,18 @@
8 #include <ResourceManager.hpp> 9 #include <ResourceManager.hpp>
9 #include <GetDataPath.hpp> 10 #include <GetDataPath.hpp>
10 #include <OnlineUpdate.hpp> 11 #include <OnlineUpdate.hpp>
11+#include <zlib.h> 12+#include <zlib.h>
12  13
13 #include <sys/stat.h> 14 #include <sys/stat.h>
14 #include <sys/types.h> 15 #include <sys/types.h>
 16
 17 void migrateConfig( void)
 18 {
 19- //if onlineCheck is not set, default it to true
 20+ //if onlineCheck is not set, default it to false
 21 bool dummy;
 22 if( ! ConfigS::instance()->getBoolean( "onlineCheck", dummy))
 23 {
 24- ConfigS::instance()->updateKeyword( "onlineCheck", "1");
 25+ ConfigS::instance()->updateKeyword( "onlineCheck", "0");
 26 }
 27
 28 #ifdef WIN32