From 7a438985ceb7afae74582bf2bd0843d47accbb52 Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 10 Dec 2016 21:46:51 +0000 Subject: 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. --- games/criticalmass/Makefile | 9 +++++++-- games/criticalmass/distinfo | 10 +++++++--- games/criticalmass/patches/patch-Makefile.am | 15 ++++++++++++++ games/criticalmass/patches/patch-Makefile.in | 15 ++++++++++++++ games/criticalmass/patches/patch-aa | 23 +++++++++++++++++++--- games/criticalmass/patches/patch-game_Makefile.am | 15 ++++++++++++++ games/criticalmass/patches/patch-game_Makefile.in | 24 +++++++++++++++++++++++ games/criticalmass/patches/patch-game_main.cpp | 18 +++++++++++++++-- 8 files changed, 119 insertions(+), 10 deletions(-) create mode 100644 games/criticalmass/patches/patch-Makefile.am create mode 100644 games/criticalmass/patches/patch-Makefile.in create mode 100644 games/criticalmass/patches/patch-game_Makefile.am create mode 100644 games/criticalmass/patches/patch-game_Makefile.in (limited to 'games') diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index 6deb95b0829..4fa04cd6227 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.37 2015/04/25 14:22:53 tnn Exp $ +# $NetBSD: Makefile,v 1.38 2016/12/10 21:46:51 dholland Exp $ # DISTNAME= CriticalMass-1.0.2 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=criticalmass/} EXTRACT_SUFX= .tar.bz2 @@ -19,9 +19,14 @@ USE_TOOLS+= gmake LDFLAGS.SunOS+= -lsocket -lnsl +# delete builtin curl +post-extract: + ${RM} -rf ${WRKSRC}/curl + .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo index 260af64e79d..05ea36ed3ce 100644 --- a/games/criticalmass/distinfo +++ b/games/criticalmass/distinfo @@ -1,16 +1,20 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 20:56:47 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/12/10 21:46:51 dholland Exp $ SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d SHA512 (CriticalMass-1.0.2.tar.bz2) = af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037 Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes -SHA1 (patch-aa) = a5caa2facea22cd5e7d208540626ed2163d81f18 +SHA1 (patch-Makefile.am) = 32fb9a02d4bd9875317f0a53ac25c7e1f3886542 +SHA1 (patch-Makefile.in) = c63d831b2a3760f4880a0f6480d08950398823e3 +SHA1 (patch-aa) = 9fc730c1eb872ee30a24551be873161a79bffb66 SHA1 (patch-game_BitmapManager.cpp) = 31265aeb2f97b642ca8d7f862de13e6442287a27 SHA1 (patch-game_CallbackManager.cpp) = 6c5a7285397e52f3792420cc3bd775b6c0bd1c67 SHA1 (patch-game_CallbackManager.hpp) = 8eb7c0830fe883b75e23c163d488dd1ef5e1980b SHA1 (patch-game_FontManager.cpp) = 13e99966beba8b27e9bd1de41859fb7c6745b111 SHA1 (patch-game_Input.cpp) = a7b8587fc7a11879017a439e1a22b351c1819af2 SHA1 (patch-game_Input.hpp) = 25cda998a93075d527f79938f27e2f7d70248125 +SHA1 (patch-game_Makefile.am) = 9b9e63de5c937e3242968d773f3bee641768f284 +SHA1 (patch-game_Makefile.in) = ca85a895312fe3e7f7a557bb9358bd77ef241e75 SHA1 (patch-game_ModelManager.cpp) = 5f2bd67348673aefb8fb2b45e8e899e9afbff2d7 SHA1 (patch-game_ModelManager.hpp) = f12fdc00bc675480f39671dc0019637672b09814 SHA1 (patch-game_ParticleGroup.cpp) = f027845125e3ea383976a3062f704a03d74865c4 @@ -21,7 +25,7 @@ SHA1 (patch-game_SelectableFactory.cpp) = 885893f1f5b7f9faddcdcb9723bea879c0241f SHA1 (patch-game_SelectableFactory.hpp) = 99fab8bf9857f3e5b298caf08e3752870801daf6 SHA1 (patch-game_WeaponDepot.cpp) = bc58e929983e1db2597f58c76b8567274a864133 SHA1 (patch-game_WeaponDepot.hpp) = 3e54c85932c9c1dec781b5a6c57f0c855b40854f -SHA1 (patch-game_main.cpp) = 9dbf9b3de9de4ce97b0ed99ab4f4c983159124c0 +SHA1 (patch-game_main.cpp) = 2c8983487e6cd50bc7cea1e7b1f6e19ea8591a0e SHA1 (patch-tinyxml_tinyxml.cpp) = e25526fff0121795c1a54089b87ede52eb86f124 SHA1 (patch-tinyxml_tinyxmlparser.cpp) = 236ff1cbd6fe83045df28022a6b02f9f65da4ee8 SHA1 (patch-tools_Packer.cpp) = 06f2ce956fd627ef2293c3650238996b3f800d4c diff --git a/games/criticalmass/patches/patch-Makefile.am b/games/criticalmass/patches/patch-Makefile.am new file mode 100644 index 00000000000..1fb3289ccbc --- /dev/null +++ b/games/criticalmass/patches/patch-Makefile.am @@ -0,0 +1,15 @@ +$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 diff --git a/games/criticalmass/patches/patch-Makefile.in b/games/criticalmass/patches/patch-Makefile.in new file mode 100644 index 00000000000..5a81f0c4ad4 --- /dev/null +++ b/games/criticalmass/patches/patch-Makefile.in @@ -0,0 +1,15 @@ +$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) diff --git a/games/criticalmass/patches/patch-aa b/games/criticalmass/patches/patch-aa index 296096b52b0..ac35c1fa812 100644 --- a/games/criticalmass/patches/patch-aa +++ b/games/criticalmass/patches/patch-aa @@ -1,10 +1,19 @@ -$NetBSD: patch-aa,v 1.4 2011/06/20 09:29:50 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2016/12/10 21:46:52 dholland Exp $ Fix configure with png>1.2. +Remove references to ancient builtin copy of curl. --- configure.orig 2006-07-16 01:48:28.000000000 +0000 +++ configure -@@ -3864,13 +3864,13 @@ else +@@ -272,7 +272,6 @@ PACKAGE_STRING= + PACKAGE_BUGREPORT= + + ac_unique_file="game/main.cpp" +-ac_subdirs_all="$ac_subdirs_all curl" + 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' + ac_subst_files='' + +@@ -3864,13 +3863,13 @@ else LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" @@ -22,7 +31,7 @@ Fix configure with png>1.2. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -3908,25 +3908,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -3908,25 +3907,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -54,3 +63,11 @@ Fix configure with png>1.2. else { { echo "$as_me:$LINENO: error: libpng is needed" >&5 +@@ -4174,7 +4173,6 @@ fi + + + +-subdirs="$subdirs curl" + + + ac_config_files="$ac_config_files Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile" diff --git a/games/criticalmass/patches/patch-game_Makefile.am b/games/criticalmass/patches/patch-game_Makefile.am new file mode 100644 index 00000000000..b0d656cc9d3 --- /dev/null +++ b/games/criticalmass/patches/patch-game_Makefile.am @@ -0,0 +1,15 @@ +$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 \ diff --git a/games/criticalmass/patches/patch-game_Makefile.in b/games/criticalmass/patches/patch-game_Makefile.in new file mode 100644 index 00000000000..c7fead7d3e7 --- /dev/null +++ b/games/criticalmass/patches/patch-game_Makefile.in @@ -0,0 +1,24 @@ +$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)/\" diff --git a/games/criticalmass/patches/patch-game_main.cpp b/games/criticalmass/patches/patch-game_main.cpp index b74dc4dc420..1512d619c65 100644 --- a/games/criticalmass/patches/patch-game_main.cpp +++ b/games/criticalmass/patches/patch-game_main.cpp @@ -1,10 +1,11 @@ -$NetBSD: patch-game_main.cpp,v 1.1 2011/06/20 09:30:03 wiz Exp $ +$NetBSD: patch-game_main.cpp,v 1.2 2016/12/10 21:46:52 dholland Exp $ Add missing include (uncovered by png-1.5). +Disable online update by default. --- game/main.cpp.orig 2006-06-30 03:46:11.000000000 +0000 +++ game/main.cpp -@@ -24,6 +24,7 @@ +@@ -24,17 +24,18 @@ #include #include #include @@ -12,3 +13,16 @@ Add missing include (uncovered by png-1.5). #include #include + + void migrateConfig( void) + { +- //if onlineCheck is not set, default it to true ++ //if onlineCheck is not set, default it to false + bool dummy; + if( ! ConfigS::instance()->getBoolean( "onlineCheck", dummy)) + { +- ConfigS::instance()->updateKeyword( "onlineCheck", "1"); ++ ConfigS::instance()->updateKeyword( "onlineCheck", "0"); + } + + #ifdef WIN32 -- cgit v1.2.3