From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 4 21:50:04 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 736FE16A418 for ; Sun, 4 Nov 2007 21:50:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4D52613C480 for ; Sun, 4 Nov 2007 21:50:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4Lo3ko082321 for ; Sun, 4 Nov 2007 21:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id lA4Lo3FB082320; Sun, 4 Nov 2007 21:50:03 GMT (envelope-from gnats) Date: Sun, 4 Nov 2007 21:50:03 GMT Message-Id: <200711042150.lA4Lo3FB082320@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Marcus von Appen Cc: Subject: Re: ports/117814: conflict: graphics/sdl_ttf and x11-fonts/showfont X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus von Appen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 21:50:04 -0000 The following reply was made to PR ports/117814; it has been noted by GNATS. From: Marcus von Appen 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 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--