From e5203dbc509ce283c28ed53dff6493ec8e0bba05 Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Fri, 12 Sep 2014 12:11:28 +0000
Subject: - Remove USE_AUTOTOOLS=libtool:env - Depend on libX11 instead of
 libXext - Minor tweaks

---
 print/ft2demos/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'print')

diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 381438fa41ce..afe36bc29dd2 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ft2demos
 PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	SF/freetype/freetype-demos/${PORTVERSION} \
 		RINGSERVER/graphics/freetype/freetype2
@@ -14,12 +14,11 @@ COMMENT=	Demo programs for FreeType2
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS+=	${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build
+BUILD_DEPENDS=	${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
-USE_XORG=	xext
 USES=		gmake tar:bzip2
-USE_AUTOTOOLS=	libtool:env
+USE_XORG=	x11
 MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
 MAKE_ARGS=	EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}"
 
@@ -30,9 +29,10 @@ FT_PROGRAMS=	ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk \
 
 .include <bsd.port.pre.mk>
 
-FREETYPE_WRKSRC!=	cd ${.CURDIR}/../../print/freetype2; ${MAKE} -V WRKSRC
+FREETYPE_WRKSRC!=	${MAKE} -C ${.CURDIR}/../../print/freetype2 -V WRKSRC
 
 do-install:
-	@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${STAGEDIR}${PREFIX}/bin)
+	@(cd ${WRKSRC}/bin/.libs && \
+		${INSTALL_PROGRAM} ${FT_PROGRAMS} ${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.post.mk>
-- 
cgit