Date: Fri, 6 Aug 2021 10:46:07 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 09da8eb0f7ae - main - devel/sdl_sge: prepare for freetype2 update Message-ID: <202108061046.176Ak7WS043883@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=09da8eb0f7ae9e97ff67aa7d0781f8467e77a029 commit 09da8eb0f7ae9e97ff67aa7d0781f8467e77a029 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-06 10:42:50 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-06 10:45:46 +0000 devel/sdl_sge: prepare for freetype2 update - freetype2 will no longer ship freetype-config (which was a pkg-config wrapper) in the near future -- use pkg-config to gather the required flags. - while here, mark as abandonware. PR: 251512 --- devel/sdl_sge/Makefile | 4 ++++ devel/sdl_sge/files/patch-Makefile.conf | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile index 56783963deb3..b569cb8d07f5 100644 --- a/devel/sdl_sge/Makefile +++ b/devel/sdl_sge/Makefile @@ -19,10 +19,14 @@ USE_LDCONFIG= yes PORTDOCS= * PORTEXAMPLES= * +DEPRECATED= Upstream no longer maintained +EXPIRATION_DATE= 2021-10-31 + OPTIONS_DEFINE= SDL FREETYPE DOCS EXAMPLES OPTIONS_DEFAULT=SDL FREETYPE FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +FREETYPE_USES= pkgconfig FREETYPE_MAKE_ARGS= USE_FT=y FREETYPE_MAKE_ARGS_OFF= USE_FT=n diff --git a/devel/sdl_sge/files/patch-Makefile.conf b/devel/sdl_sge/files/patch-Makefile.conf index eae89fe5544e..7e638957ad24 100644 --- a/devel/sdl_sge/files/patch-Makefile.conf +++ b/devel/sdl_sge/files/patch-Makefile.conf @@ -1,6 +1,6 @@ ---- Makefile.conf.orig 2003-08-12 07:43:35.000000000 +0900 -+++ Makefile.conf 2011-08-23 21:00:48.000000000 +0900 -@@ -7,11 +7,6 @@ +--- Makefile.conf.orig 2003-08-11 22:43:35 UTC ++++ Makefile.conf +@@ -7,11 +7,6 @@ C_COMP = y #USE_IMG = n #QUIET = y @@ -12,7 +12,7 @@ # Make sure sdl-config is available HAVE_SDL =$(shell if (sdl-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) ifeq ($(HAVE_SDL),n) -@@ -19,27 +14,17 @@ +@@ -19,45 +14,24 @@ ifeq ($(HAVE_SDL),n) endif # Where should SGE be installed? @@ -29,23 +29,25 @@ SGE_CFLAGS =$(shell sdl-config --cflags) -# Uncomment to make some more optimizations -#CFLAGS =-Wall -O9 -ffast-math -march=i686 -- +- # Libs config -SGE_LIBS =$(shell sdl-config --libs) -lstdc++ -- ++SGE_LIBS =$(shell sdl-config --libs) + - -# Is freetype-config available? -HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) -ifeq ($(HAVE_FT),n) - USE_FT = n -endif -+SGE_LIBS =$(shell sdl-config --libs) - +- ifneq ($(USE_FT),n) USE_FT = y -@@ -47,17 +32,6 @@ - FT_CFLAGS =$(shell freetype-config --cflags) +- SGE_LIBS +=$(shell freetype-config --libs) +- FT_CFLAGS =$(shell freetype-config --cflags) ++ SGE_LIBS +=$(shell pkg-config freetype2 --libs) ++ FT_CFLAGS =$(shell pkg-config freetype2 --cflags) endif -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108061046.176Ak7WS043883>