Bug 183426 - [PATCH] graphics/libcaca: fix hidden dependency on ftgl
Summary: [PATCH] graphics/libcaca: fix hidden dependency on ftgl
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-29 00:30 UTC by Dmitry Marakasov
Modified: 2013-11-11 16:50 UTC (History)
1 user (show)

See Also:


Attachments
libcaca-0.99.b18_4.patch (1.22 KB, patch)
2013-10-29 00:30 UTC, Dmitry Marakasov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Marakasov 2013-10-29 00:30:00 UTC
libcaca silently picks up graphics/ftgl when it's installed, with no means do disable it via configure args. The patch attached makes ftgl dependency optional and hacks configure to not pick it up when the option is disabled.

Port maintainer (multimedia@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)

How-To-Repeat: Install graphics/ftgl, install libcaca, ldd /usr/local/lib/libcaca.so
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-03 22:15:55 UTC
Responsible Changed
From-To: freebsd-ports-bugs->freebsd-multimedia

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 William Grzybowski freebsd_committer freebsd_triage 2013-11-11 16:35:03 UTC
Responsible Changed
From-To: freebsd-multimedia->wg

I'll take it.
Comment 3 William Grzybowski freebsd_committer freebsd_triage 2013-11-11 16:46:45 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-11-11 16:46:52 UTC
Author: wg
Date: Mon Nov 11 16:46:41 2013
New Revision: 333521
URL: http://svnweb.freebsd.org/changeset/ports/333521

Log:
  graphics/libcaca: add FTGL option
  
  PR:		ports/183426
  Submitted by:	Dmitry Marakasov <amdmi3 amdmi3.ru>

Modified:
  head/graphics/libcaca/Makefile

Modified: head/graphics/libcaca/Makefile
==============================================================================
--- head/graphics/libcaca/Makefile	Mon Nov 11 16:22:27 2013	(r333520)
+++ head/graphics/libcaca/Makefile	Mon Nov 11 16:46:41 2013	(r333521)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libcaca
 DISTVERSION=	0.99.beta18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://caca.zoy.org/raw-attachment/wiki/libcaca/
 
@@ -26,9 +26,10 @@ CONFIGURE_ARGS=	--disable-doc \
 DOCS=		AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \
 		NOTES README THANKS
 
-OPTIONS_DEFINE=	X11 IMLIB2 SLANG DOCS
+OPTIONS_DEFINE=	X11 IMLIB2 FTGL SLANG DOCS
 OPTIONS_DEFAULT=	X11 IMLIB2
 X11_DESC=	X11 and OpenGL support
+FTGL_DESC=	Freetype font rendering in OpenGL
 
 X11_USE=	XORG=x11 GL=glut
 X11_CONFIGURE_OFF=	--disable-x11 --disable-gl
@@ -37,7 +38,16 @@ IMLIB2_CONFIGURE_ENABLE=	imlib2
 SLANG_LIB_DEPENDS=	libslang.so.2:${PORTSDIR}/devel/libslang2
 SLANG_CONFIGURE_ENABLE=	slang
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFTGL} && ${PORT_OPTIONS:MX11}
+LIB_DEPENDS+=	libftgl.so:${PORTSDIR}/graphics/ftgl
+.endif
+
 post-patch:
+.if ! ${PORT_OPTIONS:MFTGL}
+	@${REINPLACE_CMD} -e '/PKG_CONFIG.*ftgl/ s|ftgl|no-&|' ${WRKSRC}/configure
+.endif
 	@${REINPLACE_CMD} -e 's|-g -O2 ||g ; s| -fomit-frame-pointer||g ; \
 		s|arpa\/inet.h ||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g ; s| csharp||g' \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"