git: 907bea97e142 - main - multimedia/smpeg: Revert configure patch file
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 18 Jun 2022 06:35:18 UTC
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=907bea97e142d2599363cfcf19b7b40504fa69e6 commit 907bea97e142d2599363cfcf19b7b40504fa69e6 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2022-06-18 06:28:04 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2022-06-18 06:28:04 +0000 multimedia/smpeg: Revert configure patch file * Commit 87624aab for PR #231524 has accidentally introduced two additional patches to the configure script, breaking parts of its workings. Revert these changes to fix the configuration. * Bump PORTREVISION PR: 263023 Reported by: Robert Clausecker <fuz _at_ fuz.su> --- audio/sdl_mixer/Makefile | 2 +- audio/sdl_sound/Makefile | 2 +- devel/p5-SDL/Makefile | 2 +- devel/py-game/Makefile | 1 + games/battletanks/Makefile | 2 +- games/fillets-ng/Makefile | 2 +- games/heroes/Makefile | 2 +- games/onscripter/Makefile | 1 + games/prboom-plus/Makefile | 2 +- games/prboom/Makefile | 2 +- games/rnd_jue/Makefile | 2 +- games/rocksndiamonds/Makefile | 2 +- games/tecnoballz/Makefile | 2 +- multimedia/dumpmpeg/Makefile | 2 +- multimedia/smpeg/Makefile | 2 +- multimedia/smpeg/files/patch-configure | 26 -------------------------- x11-fm/tdfsb/Makefile | 2 +- 17 files changed, 16 insertions(+), 40 deletions(-) diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile index 31c756f13770..56abadb7f845 100644 --- a/audio/sdl_mixer/Makefile +++ b/audio/sdl_mixer/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdl_mixer PORTVERSION= 1.2.12 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= audio MASTER_SITES= https://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL_mixer-${PORTVERSION} diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile index 6fd37e43bb53..176d6c76e5dc 100644 --- a/audio/sdl_sound/Makefile +++ b/audio/sdl_sound/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdl_sound PORTVERSION= 1.0.3 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= audio MASTER_SITES= http://www.icculus.org/SDL_sound/downloads/ DISTNAME= SDL_sound-${PORTVERSION} diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 4b13023477a2..3a72d714805b 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -2,7 +2,7 @@ PORTNAME= SDL PORTVERSION= 2.548 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile index 54ee46ca8282..344473528ec9 100644 --- a/devel/py-game/Makefile +++ b/devel/py-game/Makefile @@ -2,6 +2,7 @@ PORTNAME= game DISTVERSION= 2.1.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index 104601641ef9..79b94e0bf20b 100644 --- a/games/battletanks/Makefile +++ b/games/battletanks/Makefile @@ -2,7 +2,7 @@ PORTNAME= btanks PORTVERSION= 0.9.8083 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/ diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile index 78143cd1e248..14c1adbe20a6 100644 --- a/games/fillets-ng/Makefile +++ b/games/fillets-ng/Makefile @@ -1,6 +1,6 @@ PORTNAME= fillets-ng PORTVERSION= 1.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${PORTVERSION} \ SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${DATAVERSION}:data diff --git a/games/heroes/Makefile b/games/heroes/Makefile index 1ea2c9645c85..9ca3e817698b 100644 --- a/games/heroes/Makefile +++ b/games/heroes/Makefile @@ -2,7 +2,7 @@ PORTNAME= heroes PORTVERSION= 0.21 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= games MASTER_SITES= SF \ SF/${PORTNAME}/${PORTNAME}-data/${DATAVERSION}:data \ diff --git a/games/onscripter/Makefile b/games/onscripter/Makefile index a02bd9ed4af4..c8ddc2f817c6 100644 --- a/games/onscripter/Makefile +++ b/games/onscripter/Makefile @@ -1,5 +1,6 @@ PORTNAME= onscripter PORTVERSION= 20220123 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://onscripter.osdn.jp/ diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile index 9d29db1c6a3e..6a4f2dd69e95 100644 --- a/games/prboom-plus/Makefile +++ b/games/prboom-plus/Makefile @@ -2,7 +2,7 @@ PORTNAME= prboom-plus PORTVERSION= 2.5.1.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF diff --git a/games/prboom/Makefile b/games/prboom/Makefile index aab18f71c8f0..4fa34785eaf6 100644 --- a/games/prboom/Makefile +++ b/games/prboom/Makefile @@ -2,7 +2,7 @@ PORTNAME= prboom PORTVERSION= 2.5.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} diff --git a/games/rnd_jue/Makefile b/games/rnd_jue/Makefile index 6a89974b2369..fe681ed86b81 100644 --- a/games/rnd_jue/Makefile +++ b/games/rnd_jue/Makefile @@ -2,7 +2,7 @@ PORTNAME= rnd_jue PORTVERSION= 3.3.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/:game \ SF/nemysisfreebsdp/${CATEGORIES}/rocksndiamonds/ diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 1b4392260b5a..b9e7bc3c2fc1 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -2,7 +2,7 @@ PORTNAME= rocksndiamonds PORTVERSION= 3.3.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/:game \ http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels_artsoft \ diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile index 064a727ecdf5..47c197c6e44b 100644 --- a/games/tecnoballz/Makefile +++ b/games/tecnoballz/Makefile @@ -2,7 +2,7 @@ PORTNAME= tecnoballz PORTVERSION= 0.93.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://linux.tlk.fr/games/TecnoballZ/download/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile index 6b9b88be731f..54843667c2b5 100644 --- a/multimedia/dumpmpeg/Makefile +++ b/multimedia/dumpmpeg/Makefile @@ -2,7 +2,7 @@ PORTNAME= dumpmpeg PORTVERSION= 0.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia graphics MASTER_SITES= SF diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index 5327f969c50b..7e462e55beea 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -2,7 +2,7 @@ PORTNAME= smpeg PORTVERSION= 0.4.4 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= multimedia MASTER_SITES= ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \ GENTOO diff --git a/multimedia/smpeg/files/patch-configure b/multimedia/smpeg/files/patch-configure index c698a2f816b0..d50e0a35b262 100644 --- a/multimedia/smpeg/files/patch-configure +++ b/multimedia/smpeg/files/patch-configure @@ -1,13 +1,5 @@ --- configure.orig 2001-04-24 19:25:46 UTC +++ configure -@@ -58,7 +58,6 @@ ac_help="$ac_help - # The variables have the same names as the options, with - # dashes changed to underlines. - build=NONE --cache_file=./config.cache - exec_prefix=NONE - host=NONE - no_create= @@ -1055,7 +1054,7 @@ cat > conftest.$ac_ext << EOF #line 1056 "configure" #include "confdefs.h" @@ -17,24 +9,6 @@ EOF if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes -@@ -1850,7 +1849,7 @@ esac - - - # Save cache, so that ltconfig can load it --cat > confcache <<\EOF -+<<\EOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure - # scripts and configure runs. It is not useful on other systems. -@@ -1903,8 +1902,6 @@ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ - LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ - DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - - # Reload cache, that may have been modified by ltconfig @@ -2335,6 +2332,7 @@ rm -f conftest* CFLAGS="$CFLAGS $SDL_CFLAGS" diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile index 4d131e4634e3..c0d5237b8cca 100644 --- a/x11-fm/tdfsb/Makefile +++ b/x11-fm/tdfsb/Makefile @@ -2,7 +2,7 @@ PORTNAME= tdfsb PORTVERSION= 0.0.10 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-fm MASTER_SITES= http://www.determinate.net/webdata/data/