Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Sep 2014 12:11:29 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368020 - head/print/ft2demos
Message-ID:  <201409121211.s8CCBTFj001588@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Fri Sep 12 12:11:28 2014
New Revision: 368020
URL: http://svnweb.freebsd.org/changeset/ports/368020
QAT: https://qat.redports.org/buildarchive/r368020/

Log:
  - Remove USE_AUTOTOOLS=libtool:env
  - Depend on libX11 instead of libXext
  - Minor tweaks

Modified:
  head/print/ft2demos/Makefile

Modified: head/print/ft2demos/Makefile
==============================================================================
--- head/print/ft2demos/Makefile	Fri Sep 12 11:02:15 2014	(r368019)
+++ head/print/ft2demos/Makefile	Fri Sep 12 12:11:28 2014	(r368020)
@@ -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 ftdu
 
 .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>



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