Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jun 2016 19:27:30 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416906 - head/graphics/libimg
Message-ID:  <201606141927.u5EJRUGp079256@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Tue Jun 14 19:27:30 2016
New Revision: 416906
URL: https://svnweb.freebsd.org/changeset/ports/416906

Log:
  Don't remove X11 linkage; this breaks the upcoming LinuxCNC port.
  
  PR:		210212
  Approved by:	maintainer (earlier version)

Modified:
  head/graphics/libimg/Makefile

Modified: head/graphics/libimg/Makefile
==============================================================================
--- head/graphics/libimg/Makefile	Tue Jun 14 19:22:46 2016	(r416905)
+++ head/graphics/libimg/Makefile	Tue Jun 14 19:27:30 2016	(r416906)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libimg
 PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	graphics tk
 MASTER_SITES=	SF/tkimg/tkimg/${PORTVERSION:R}
 DISTNAME=	tkimg${PORTVERSION}
@@ -12,7 +12,9 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Library of image format handlers for Tk4.1 and later
 
 BUILD_DEPENDS=	dtplite:devel/tcllib
-LIB_DEPENDS=	libpng.so:graphics/png \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 PLIST_SUB+=	SHLIB_NAME="${SHLIB_NAME}" \
@@ -20,6 +22,7 @@ PLIST_SUB+=	SHLIB_NAME="${SHLIB_NAME}" \
 
 WRKSRC=		${WRKDIR}/tkimg${PORTVERSION:R}
 USES=		autoreconf jpeg tk:tea tar:bzip2
+USE_XORG=	x11 xext xft xrender xscrnsaver
 
 # We don't need the bundled libraries:
 EXTRACT_AFTER_ARGS=	--exclude '*/libz/*' --exclude zlib \
@@ -37,9 +40,6 @@ post-patch:
 .endfor
 
 post-configure:
-	# Do not link with X11 -- none of tkimg code uses X directly
-	${REINPLACE_CMD} -E -e 's,-L[^[:space:]]+[[:space:]]+-lX[^[:space:]]*,,g' \
-		${WRKSRC}/*/Makefile
 .for l in jpeg png tiff
 	# Link with -l$l
 	${REINPLACE_CMD} -E \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606141927.u5EJRUGp079256>