From owner-dev-commits-ports-main@freebsd.org Fri Aug 6 10:46:07 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD0A0653FB2; Fri, 6 Aug 2021 10:46:07 +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 4Gh2Fq4Gmsz4RX1; Fri, 6 Aug 2021 10:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7B36246A5; Fri, 6 Aug 2021 10:46:07 +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 176Ak7ie043884; Fri, 6 Aug 2021 10:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176Ak7WS043883; Fri, 6 Aug 2021 10:46:07 GMT (envelope-from git) Date: Fri, 6 Aug 2021 10:46:07 GMT Message-Id: <202108061046.176Ak7WS043883@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 09da8eb0f7ae - main - devel/sdl_sge: prepare for freetype2 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09da8eb0f7ae9e97ff67aa7d0781f8467e77a029 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 10:46:07 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=09da8eb0f7ae9e97ff67aa7d0781f8467e77a029 commit 09da8eb0f7ae9e97ff67aa7d0781f8467e77a029 Author: Tobias C. Berner AuthorDate: 2021-08-06 10:42:50 +0000 Commit: Tobias C. Berner 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 -