From owner-dev-commits-ports-main@freebsd.org Thu Sep 2 22:20:41 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 55CD6668C9D; Thu, 2 Sep 2021 22:20:41 +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 4H0wNn1Pb4z4b7D; Thu, 2 Sep 2021 22:20:41 +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 1484120B7D; Thu, 2 Sep 2021 22:20:41 +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 182MKeCt086642; Thu, 2 Sep 2021 22:20:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 182MKeQd086641; Thu, 2 Sep 2021 22:20:40 GMT (envelope-from git) Date: Thu, 2 Sep 2021 22:20:40 GMT Message-Id: <202109022220.182MKeQd086641@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 616105693592 - main - devel/sdl12-compat: convert to libmap.conf(5) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6161056935927447d127f7deaf0d8d53c335cde7 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: Thu, 02 Sep 2021 22:20:41 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6161056935927447d127f7deaf0d8d53c335cde7 commit 6161056935927447d127f7deaf0d8d53c335cde7 Author: Jan Beich AuthorDate: 2021-09-02 21:39:17 +0000 Commit: Jan Beich CommitDate: 2021-09-02 22:18:23 +0000 devel/sdl12-compat: convert to libmap.conf(5) Drop headers to simplify usage as binary packge from the default repo. Hooking into USES=sdl would have required a lot of build testing just to trim some dependencies. --- devel/sdl12-compat/Makefile | 25 +++++++++++++++++++------ devel/sdl12-compat/pkg-message | 13 ------------- devel/sdl12-compat/pkg-plist | 42 ------------------------------------------ devel/sdl12/Makefile | 2 -- 4 files changed, 19 insertions(+), 63 deletions(-) diff --git a/devel/sdl12-compat/Makefile b/devel/sdl12-compat/Makefile index 151a74c678e1..1bf52b082de6 100644 --- a/devel/sdl12-compat/Makefile +++ b/devel/sdl12-compat/Makefile @@ -1,5 +1,6 @@ PORTNAME= sdl12-compat PORTVERSION= s20210901 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org @@ -8,26 +9,38 @@ COMMENT= SDL-1.2 compatibility layer that uses SDL 2.0 behind the scenes LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= sdl - -USES= cmake:testing gl localbase sdl +USES= cmake:testing localbase sdl USE_GITHUB= yes -USE_GL= glu USE_LDCONFIG= yes USE_SDL= sdl2 +CMAKE_OFF= SDL12DEVEL CMAKE_OFF+= ${CMAKE_TESTING_ON} CMAKE_TESTING_ON= SDL12TESTS CMAKE_TESTING_TARGET= # post-test GH_ACCOUNT= libsdl-org GH_TAGNAME= dae1119 +SUFFIX= -${PORTNAME:C/.*-//} +PLIST_FILES= etc/libmap.d/${PORTNAME}.conf \ + lib/libSDL-1.2${SUFFIX}.so \ + lib/libSDL-1.2${SUFFIX}.so.0 \ + lib/libSDL-1.2${SUFFIX}.so.1.2.50 \ + "@comment lib/libSDLmain.a" post-patch: -# Replace sdl12 for pkg-config consumers a la sdl-config - @${REINPLACE_CMD} -e '/DESTINATION/s/pkgconfig/& RENAME sdl.pc/' \ +# Add library suffix to co-exist with sdl12 package + @${REINPLACE_CMD} -e '/OUTPUT_NAME/s/")$$/${SUFFIX}&/' \ ${WRKSRC}/CMakeLists.txt # doesn't exist on BSDs and is included by on Linux @${REINPLACE_CMD} -e '/ALLOCA_H/d' \ ${WRKSRC}/include/SDL/SDL_config.h +# Drop unused dependency on libGLU + @${REINPLACE_CMD} -e '/glu\.h/d' \ + ${WRKSRC}/include/SDL/SDL_opengl.h + +post-install: +# Replace sdl12 with sdl12-compat at runtime + @${ECHO_CMD} ${PLIST_FILES:T:M*.so.?:_:S/${SUFFIX}//} $_ \ + >${STAGEDIR}${PREFIX}/etc/libmap.d/${PORTNAME}.conf pre-test: # Enable RPATH for test executables to avoid LD_LIBRARY_PATH diff --git a/devel/sdl12-compat/pkg-message b/devel/sdl12-compat/pkg-message deleted file mode 100644 index b8f4e5d330a5..000000000000 --- a/devel/sdl12-compat/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -[ -{ type: install - message: <