Date: Sun, 4 Nov 2007 21:50:03 GMT From: Marcus von Appen <mva@sysfault.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/117814: conflict: graphics/sdl_ttf and x11-fonts/showfont Message-ID: <200711042150.lA4Lo3FB082320@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/117814; it has been noted by GNATS. From: Marcus von Appen <mva@sysfault.org> To: bug-followup@freebsd.org Cc: makc@issp.ac.ru Subject: Re: ports/117814: conflict: graphics/sdl_ttf and x11-fonts/showfont Date: Sun, 4 Nov 2007 22:50:16 +0100 --adJ1OR3c6QgCpb/j Content-Type: multipart/mixed; boundary="CdrF4e02JqNVZeln" Content-Disposition: inline --CdrF4e02JqNVZeln Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The attached patch should fix this issue by renaming the SDL_ttf showfont utility to sdl-showfont. Note to the commiter: Depending on the freeze priority, please keep in mind, that it conflicts partially with ports/117611, so one of them will need a manual merge later on. It should be noted in UPDATING as well, so people using both will enforce an update on both ports (thus the PORTREVISION bump - maybe x11/showfont should be bumped as well). Regards Marcus --CdrF4e02JqNVZeln Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="sdl_ttf.diff" Content-Transfer-Encoding: quoted-printable diff -Nur sdl_ttf/Makefile sdl_ttf.fix/Makefile --- sdl_ttf/Makefile 2007-10-28 13:01:33.000000000 +0100 +++ sdl_ttf.fix/Makefile 2007-11-04 22:48:22.000000000 +0100 @@ -7,7 +7,7 @@ =20 PORTNAME=3D sdl_ttf PORTVERSION=3D 2.0.8 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D graphics MASTER_SITES=3D http://www.libsdl.org/projects/SDL_ttf/release/ DISTNAME=3D SDL_ttf-${PORTVERSION} @@ -31,6 +31,6 @@ =20 post-install: ${INSTALL_PROGRAM} ${WRKSRC}/.libs/glfont ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont ${PREFIX}/bin/sdl-showfont =20 .include <bsd.port.mk> diff -Nur sdl_ttf/pkg-plist sdl_ttf.fix/pkg-plist --- sdl_ttf/pkg-plist 2006-09-20 13:21:42.000000000 +0200 +++ sdl_ttf.fix/pkg-plist 2007-11-04 22:36:07.000000000 +0100 @@ -1,5 +1,5 @@ bin/glfont -bin/showfont +bin/sdl-showfont include/SDL/SDL_ttf.h lib/libSDL_ttf.a lib/libSDL_ttf.la --CdrF4e02JqNVZeln-- --adJ1OR3c6QgCpb/j Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFHLj6Yo/JpszXavhwRAhfAAJ9T0sRr14nTG797auIyJ8TgPBH9GwCfbHWK FcQKp/gn1baWXdjsdq18N7A= =kCQK -----END PGP SIGNATURE----- --adJ1OR3c6QgCpb/j--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711042150.lA4Lo3FB082320>