git: 616105693592 - main - devel/sdl12-compat: convert to libmap.conf(5)
Jan Beich
jbeich at FreeBSD.org
Thu Sep 2 22:20:41 UTC 2021
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6161056935927447d127f7deaf0d8d53c335cde7
commit 6161056935927447d127f7deaf0d8d53c335cde7
Author: Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-09-02 21:39:17 +0000
Commit: Jan Beich <jbeich at FreeBSD.org>
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 at 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
# <alloca.h> doesn't exist on BSDs and is included by <stdlib.h> 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: <<EOM
-To enable replace sdl12 dependency e.g.,
- $ pkg install cage xmoto
- $ pkg set -n sdl:sdl12-compat
- $ pkg set -o devel/sdl12:devel/sdl12-compat
- $ pkg upgrade -f sdl12-compat
- $ pkg autoremove
- $ SDL_VIDEODRIVER=wayland XDG_RUNTIME_DIR=/tmp cage -s xmoto
-EOM
-}
-]
diff --git a/devel/sdl12-compat/pkg-plist b/devel/sdl12-compat/pkg-plist
deleted file mode 100644
index 225484ef672a..000000000000
--- a/devel/sdl12-compat/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-bin/sdl-config
-include/SDL/SDL.h
-include/SDL/SDL_active.h
-include/SDL/SDL_audio.h
-include/SDL/SDL_byteorder.h
-include/SDL/SDL_cdrom.h
-include/SDL/SDL_config.h
-include/SDL/SDL_config.h.bak
-include/SDL/SDL_copying.h
-include/SDL/SDL_cpuinfo.h
-include/SDL/SDL_endian.h
-include/SDL/SDL_error.h
-include/SDL/SDL_events.h
-include/SDL/SDL_getenv.h
-include/SDL/SDL_joystick.h
-include/SDL/SDL_keyboard.h
-include/SDL/SDL_keysym.h
-include/SDL/SDL_loadso.h
-include/SDL/SDL_main.h
-include/SDL/SDL_mouse.h
-include/SDL/SDL_mutex.h
-include/SDL/SDL_name.h
-include/SDL/SDL_opengl.h
-include/SDL/SDL_platform.h
-include/SDL/SDL_quit.h
-include/SDL/SDL_rwops.h
-include/SDL/SDL_stdinc.h
-include/SDL/SDL_syswm.h
-include/SDL/SDL_thread.h
-include/SDL/SDL_timer.h
-include/SDL/SDL_types.h
-include/SDL/SDL_version.h
-include/SDL/SDL_video.h
-include/SDL/begin_code.h
-include/SDL/close_code.h
-lib/libSDL-1.2.so
-lib/libSDL-1.2.so.0
-lib/libSDL-1.2.so.1.2.50
-lib/libSDL.so
-lib/libSDLmain.a
-libdata/pkgconfig/sdl.pc
-share/aclocal/sdl.m4
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 4a2fb142e101..7a979cd0b043 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -16,8 +16,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= nasm:devel/nasm
-CONFLICTS_INSTALL= sdl12-compat
-
USES= gmake iconv libtool localbase:ldflags pathfix pkgconfig
USE_LDCONFIG= yes
More information about the dev-commits-ports-all
mailing list