From nobody Mon Apr 18 17:25:30 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E9E7211E1014; Mon, 18 Apr 2022 17:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Khv2y5nMBz3MPN; Mon, 18 Apr 2022 17:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650302730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kyctkg8OpMFrkN2g/8pFJJJ2vOHoeEuNXTVS7BR7apM=; b=aZtqcGH+d7ZeTAngfKrTh3T6yvbzF67WJzuLFBw+NTX5ldjOGivm9UpjYEfRbpCpGjFGtr bvOZKMiVcVq5KfinRLllxhlaI7aw9cdIX+sod3QgbUMLPR/PfJ0yBvPyIRtp2dgCHmrJYs kjaFTO+HiidL4Kh2R/Six4C7pkZBM+W7ZhM7T/FTeMPZeD4Z1Qsr6KpZBD2/wAUyIHZ1Hg p2o6YitZyVEuQf0+Jv5+6n1FQylSh3QH/uXluM/AGwJ0E4DLjKqkFKcYXEHVAo0i8d9ajS 8C8qE63Uc54cbMe0GInXj12i5GJNcFkCp9/lqE/dSUttgpySnsn8snVyljzSJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A561C16F71; Mon, 18 Apr 2022 17:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23IHPUwd053331; Mon, 18 Apr 2022 17:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IHPUK0053330; Mon, 18 Apr 2022 17:25:30 GMT (envelope-from git) Date: Mon, 18 Apr 2022 17:25:30 GMT Message-Id: <202204181725.23IHPUK0053330@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: c03dd32be651 - main - games/cultivation: remove obsoleted port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c03dd32be651be987c8760a8536cebdc1212f4a0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650302730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kyctkg8OpMFrkN2g/8pFJJJ2vOHoeEuNXTVS7BR7apM=; b=L4geDHMFwPj+53ci9VFaDfbP9LBbrTjh7PfJ/lyaP7v9Ellgvxpze95+sBr3FDP/amJEDw CnjmTUw7GNyEV0wX4UoafkWfZBS/7Qhd+SEGc6kYvRWOHIedTiACGc+mI8Ur0yNoJGOpPQ JedkbjH2sfY/bePsuiJli87UV793mrKEHgm2PTWpZtl5ytWZNplIpKPuTJqxxZzwkYcmSf t0a0npeBS6vkzBl2P3i9LKLFm9wn+dz+dPnNi4c1kZ6xBQx44BNIPnP/W/NnpzN11Lm7ky 4Tyg1cwq1WJRFKWPCaXCM/RGN+QGZCXifCoSHH+EywPyO/UMCmKJfzvsnllOpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650302730; a=rsa-sha256; cv=none; b=Kq8xCVekoEr1n2EgEP8t53kmdShCleLLz2SsdTg4o3rVKsu14bUj3znuS/o6sK+vwQr2mK I/vJNJJYLfj4CiYjE7m9bSf31XMTcuNkAJHdn/MQG1qE+IdiX41T067Bip8sXoNkpwVRDm H9GrYmxoeU7esiMhwoPnA6k1Sarjmvhml8i+/SsMZzhjuAkcHuwAssWms39HI6zRnBW6/n AKhhgbSes1BWzLjUHNUC8uUAzWYKwGULBWV4jDTuBZl0gRXjbhvVheuNs6n8jWzJQ1TKNv P/NZ/89ZhN/jyj0b2Rghi2R1uQ+GzO9AMkv8zcX7uHV0Gn3Tozl8SHMcDZQ0Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=c03dd32be651be987c8760a8536cebdc1212f4a0 commit c03dd32be651be987c8760a8536cebdc1212f4a0 Author: Dmitry Marakasov AuthorDate: 2022-04-18 11:02:45 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-18 17:24:01 +0000 games/cultivation: remove obsoleted port --- MOVED | 1 + games/cultivation/Makefile | 56 ---------------- games/cultivation/distinfo | 2 - games/cultivation/files/patch-Makefile.GnuLinux | 22 ------ games/cultivation/files/patch-Makefile.common | 11 --- .../patch-gameSource_sound_SoundEffectsBank.cpp | 10 --- .../files/patch-gameSource_sound_SoundPlayer.h | 13 ---- games/cultivation/files/portaudio19.patch | 78 ---------------------- games/cultivation/pkg-descr | 14 ---- 9 files changed, 1 insertion(+), 206 deletions(-) diff --git a/MOVED b/MOVED index 76798eaa454f..4d427058ec62 100644 --- a/MOVED +++ b/MOVED @@ -17131,3 +17131,4 @@ graphics/py-pyglet150|graphics/py-pyglet|2022-04-16|Has expired: No longer neede games/critterding||2022-04-16|Has expired: Abandonware with last release in 2013, newer version bundles depends and requires Qt4 lang/gcc10-devel||2022-04-17|Has expired: Not serving its purpose any longer due to lack of maintenance devel/py-installer03|devel/py-installer|2022-04-17|Remove obsoleted port. Use devel/py-installer instead +games/cultivation||2022-04-18|Has expired: Abandonware with last release in 2010, non-portable build system diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile deleted file mode 100644 index 93b849200227..000000000000 --- a/games/cultivation/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -PORTNAME= cultivation -PORTVERSION= 8 -PORTREVISION= 7 -CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION} -DISTNAME= Cultivation_${PORTVERSION}_UnixSource - -MAINTAINER= amdmi3@FreeBSD.org -COMMENT= Unique game of conflict and cooperation in a gardening community - -LIB_DEPENDS= libportaudio.so:audio/portaudio - -BROKEN= does not start -DEPRECATED= Abandonware with last release in 2010, non-portable build system -EXPIRATION_DATE=2022-04-17 - -USES= gl gmake xorg -USE_XORG= x11 xi xext xmu -USE_GL= glut - -WRKSRC= ${WRKDIR}/${DISTNAME}/game2 -BUILD_WRKSRC= ${WRKSRC}/gameSource -MAKE_ARGS= CXX=${CXX} - -EXTRA_PATCHES= ${FILESDIR}/portaudio19.patch:-p2 - -PLIST_FILES= bin/Cultivation -PORTDATA= * -PORTDOCS= changeLog.txt how_to_play.txt - -OPTIONS_DEFINE= DOCS - -post-patch: - @cd ${WRKSRC} && ${CAT} Makefile.GnuLinux Makefile.common \ - ../minorGems/build/Makefile.minorGems gameSource/Makefile.all \ - ../minorGems/build/Makefile.minorGems_targets > gameSource/Makefile - @${REINPLACE_CMD} -e 's|font\.tga|${DATADIR}/font.tga|; \ - s|language\.txt|${DATADIR}/language.txt|; \ - s|features\.txt|${DATADIR}/features.txt|' \ - ${BUILD_WRKSRC}/game.cpp - @${REINPLACE_CMD} -e 's|"languages"|"${DATADIR}/languages"|' \ - ${WRKSRC}/../minorGems/util/TranslationManager.cpp - -do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/Cultivation ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DATADIR}/languages - ${INSTALL_DATA} ${BUILD_WRKSRC}/font.tga ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${BUILD_WRKSRC}/features.txt ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${BUILD_WRKSRC}/language.txt ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${BUILD_WRKSRC}/languages/* ${STAGEDIR}${DATADIR}/languages - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/documentation/${f} ${STAGEDIR}${DOCSDIR} -.endfor - -.include diff --git a/games/cultivation/distinfo b/games/cultivation/distinfo deleted file mode 100644 index 0be1c672a975..000000000000 --- a/games/cultivation/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (Cultivation_8_UnixSource.tar.gz) = 001805c03711f0c32b99ed87cdd65f5ffa47b540bd9266ff5948801019ff7da3 -SIZE (Cultivation_8_UnixSource.tar.gz) = 1125886 diff --git a/games/cultivation/files/patch-Makefile.GnuLinux b/games/cultivation/files/patch-Makefile.GnuLinux deleted file mode 100644 index 2282fe9fc6e7..000000000000 --- a/games/cultivation/files/patch-Makefile.GnuLinux +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.GnuLinux.orig Mon Apr 23 18:30:54 2007 -+++ Makefile.GnuLinux Tue Aug 14 01:57:08 2007 -@@ -15,16 +15,16 @@ - ## - - --PLATFORM_COMPILE_FLAGS = -DLINUX -+PLATFORM_COMPILE_FLAGS = ${CXXFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include -DLINUX - - - # various GL and X windows librariesneeded for linux - # also need portaudio library (which in turn needs pthreads) --PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread -+PLATFORM_LINK_FLAGS = -L${LOCALBASE}/lib -L${LOCALBASE}/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu -pthread -lportaudio - - - # All platforms but OSX support g++ and need no linker hacks --GXX = g++ -+GXX = ${CXX} - LINK_FLAGS = - - diff --git a/games/cultivation/files/patch-Makefile.common b/games/cultivation/files/patch-Makefile.common deleted file mode 100644 index 94ca25d672ad..000000000000 --- a/games/cultivation/files/patch-Makefile.common +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.common.orig Mon Apr 23 18:30:54 2007 -+++ Makefile.common Tue Aug 14 01:58:17 2007 -@@ -52,7 +52,7 @@ - - - --COMPILE_FLAGS = -Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH} -I${PORT_AUDIO_PATH}/pa_common -+COMPILE_FLAGS = -Wall ${PLATFORM_COMPILE_FLAGS} -I${ROOT_PATH} - - - COMPILE = ${GXX} ${COMPILE_FLAGS} -c diff --git a/games/cultivation/files/patch-gameSource_sound_SoundEffectsBank.cpp b/games/cultivation/files/patch-gameSource_sound_SoundEffectsBank.cpp deleted file mode 100644 index b43b590b1ff8..000000000000 --- a/games/cultivation/files/patch-gameSource_sound_SoundEffectsBank.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- gameSource/sound/SoundEffectsBank.cpp.orig 2007-08-09 15:45:15 UTC -+++ gameSource/sound/SoundEffectsBank.cpp -@@ -10,6 +10,7 @@ - - #include "minorGems/util/random/StdRandomSource.h" - -+#include - - extern int globalSoundSampleRate; - diff --git a/games/cultivation/files/patch-gameSource_sound_SoundPlayer.h b/games/cultivation/files/patch-gameSource_sound_SoundPlayer.h deleted file mode 100644 index 1ffd5d98428f..000000000000 --- a/games/cultivation/files/patch-gameSource_sound_SoundPlayer.h +++ /dev/null @@ -1,13 +0,0 @@ ---- gameSource/sound/SoundPlayer.h.orig 2015-05-30 19:01:03 UTC -+++ gameSource/sound/SoundPlayer.h -@@ -52,9 +52,7 @@ - #include "SoundFilter.h" - #include "PlayableSound.h" - --#include "minorGems/sound/portaudio/pa_common/portaudio.h" --#include "minorGems/sound/portaudio/pablio/pablio.h" -- -+#include - - #include "minorGems/util/SimpleVector.h" - diff --git a/games/cultivation/files/portaudio19.patch b/games/cultivation/files/portaudio19.patch deleted file mode 100644 index 4cac2eb4de8e..000000000000 --- a/games/cultivation/files/portaudio19.patch +++ /dev/null @@ -1,78 +0,0 @@ -Author: Barry deFreese -Description: Patch system to utilize portaudio v19 -Bug-Debian: http://bugs.debian.org/594015 -Last-Update: 2013-06-01 ---- a/game2/gameSource/sound/SoundPlayer.h -+++ b/game2/gameSource/sound/SoundPlayer.h -@@ -239,7 +239,7 @@ - char mFadingIn; - int mNumFadeFramesRemaining; - -- PortAudioStream *mAudioStream; -+ PaStream *mAudioStream; - - // realtime sounds that should be mixed into the next to-speaker call - SimpleVector *mRealtimeSounds; ---- a/game2/gameSource/sound/SoundPlayer.cpp -+++ b/game2/gameSource/sound/SoundPlayer.cpp -@@ -52,9 +52,11 @@ - - - // callback passed into portaudio --static int portaudioCallback( void *inputBuffer, void *outputBuffer, -+int portaudioCallback( const void *inputBuffer, void *outputBuffer, - unsigned long framesPerBuffer, -- PaTimestamp outTime, void *userData ) { -+ const PaStreamCallbackTimeInfo *outTime, -+ PaStreamCallbackFlags statusFlags, -+ void *userData ) { - - - SoundPlayer *player = (SoundPlayer *)userData; -@@ -157,21 +159,13 @@ - - if( error == paNoError ) { - -- error = Pa_OpenStream( -+ error = Pa_OpenDefaultStream( - &mAudioStream, -- paNoDevice,// default input device - 0, // no input -- paFloat32, // 32 bit floating point input -- NULL, -- Pa_GetDefaultOutputDeviceID(), - 2, // stereo output - paFloat32, // 32 bit floating point output -- NULL, - mSampleRate, - 1024, // frames per buffer -- 0, // number of buffers, if zero then use default minimum -- paClipOff, // we won't output out of range samples so -- // don't bother clipping them - portaudioCallback, - (void *)this ); // pass self-pointer to callback function - ---- a/game2/gameSource/sound/MusicPlayer.cpp -+++ b/game2/gameSource/sound/MusicPlayer.cpp -@@ -112,13 +112,14 @@ - - // get parts and positions of gardeners - int numParts = 0; -- Vector3D **positions = -- globalWorld->getAllGardenerPositions( &numParts ); -- MusicPart **musicParts = -- globalWorld->getAllGardenerMusicParts( &numParts ); -- double *volumeModifiers = -- globalWorld->getAllGardenerMusicVolumeModifiers( &numParts ); -- -+ Vector3D **positions = NULL; -+ MusicPart **musicParts = NULL; -+ double *volumeModifiers = NULL; -+ if ( globalWorld ){ -+ positions = globalWorld->getAllGardenerPositions( &numParts ); -+ musicParts = globalWorld->getAllGardenerMusicParts( &numParts ); -+ volumeModifiers = globalWorld->getAllGardenerMusicVolumeModifiers( &numParts ); -+ } - - // get center position from current player position - Vector3D *centerPosition = new Vector3D( &globalPlayerCurrentPosition ); diff --git a/games/cultivation/pkg-descr b/games/cultivation/pkg-descr deleted file mode 100644 index dd4197610163..000000000000 --- a/games/cultivation/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Cultivation is quite different from most other games. It is a social -simulation, and the primary form of conflict is over land and plant -resources---there is no shooting, but there are plenty of angry -looks. It is also an evolution simulation. Within the world of -Cultivation, you can explore a virtually infinite spectrum of -different plant and gardener varieties. - -All of the graphics, sounds, melodies,and other content in Cultivation -are 100% procedurally generated at playtime. In other words, there -are no hand-painted texture maps---instead, each object has a -uniquely "grown" appearance. Every time you play, Cultivation -generates fresh visuals, music, and behaviors. - -WWW: http://cultivation.sourceforge.net/