From owner-svn-ports-all@FreeBSD.ORG  Mon Apr  7 21:41:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 15F21FB1;
 Mon,  7 Apr 2014 21:41:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DCDD083C;
 Mon,  7 Apr 2014 21:41:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37LfVJQ062881;
 Mon, 7 Apr 2014 21:41:31 GMT (envelope-from acm@svn.freebsd.org)
Received: (from acm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37LfVeK062880;
 Mon, 7 Apr 2014 21:41:31 GMT (envelope-from acm@svn.freebsd.org)
Message-Id: <201404072141.s37LfVeK062880@svn.freebsd.org>
From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
Date: Mon, 7 Apr 2014 21:41:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350545 - head/graphics/libgltext
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Apr 2014 21:41:32 -0000

Author: acm
Date: Mon Apr  7 21:41:31 2014
New Revision: 350545
URL: http://svnweb.freebsd.org/changeset/ports/350545
QAT: https://qat.redports.org/buildarchive/r350545/

Log:
  - Fix install
  - Add STAGE support
  - Remove BROKEN

Modified:
  head/graphics/libgltext/Makefile

Modified: head/graphics/libgltext/Makefile
==============================================================================
--- head/graphics/libgltext/Makefile	Mon Apr  7 21:39:52 2014	(r350544)
+++ head/graphics/libgltext/Makefile	Mon Apr  7 21:41:31 2014	(r350545)
@@ -11,25 +11,22 @@ DISTNAME=	gltext-${PORTVERSION}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Portable font rendering library for C++
 
-BROKEN=		Fails to install
-
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_AUTOTOOLS=	libtool
+USES=		gmake
 USE_GL=		glu
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	EXAMPLES
 EXAMPLES_DESC=	Compile examples, need libglut
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-USE_GL=	glut
+USE_GL+=	glut
+USE_XORG=	xmu
 FLAG_EXAMPLES=	true
 PLIST_SUB+=	EXAMPLES=""
 .else
@@ -38,30 +35,30 @@ PLIST_SUB+=	EXAMPLES="@comment "
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/${PORTNAME}-${PORTVERSION}.so \
-		${PREFIX}/lib/${PORTNAME}.so.0
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.0
 	${INSTALL_DATA} ${WRKSRC}/src/.libs/${PORTNAME}.a \
-		${PREFIX}/lib
+		${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.la \
-		${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/src/gltext.h ${PREFIX}/include
+		${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/src/gltext.h ${STAGEDIR}${PREFIX}/include
 
-	@cd ${PREFIX}/lib && \
+	@cd ${STAGEDIR}${PREFIX}/lib && \
 		${LN} -s ${PORTNAME}.so.0 ${PORTNAME}.so
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/tutorial.txt ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/tutorial.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if defined(FLAG_EXAMPLES)
 .for DIRE in alpha fps simple sizes
-	@${MKDIR} ${EXAMPLESDIR}/${DIRE}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${DIRE}
 	@cd ${WRKSRC}/examples && \
-		${INSTALL_DATA} ${DIRE}/${DIRE} ${DIRE}/${DIRE}.cpp ${EXAMPLESDIR}/${DIRE}
+		${INSTALL_DATA} ${DIRE}/${DIRE} ${DIRE}/${DIRE}.cpp ${STAGEDIR}${EXAMPLESDIR}/${DIRE}
 .endfor
 	@${ECHO_MSG}	""
-	@${ECHO_MSG}	"		Examples source and binary on ${EXAMPLESDIR}"
+	@${ECHO_MSG}	"		Examples source and binary on ${STAGEDIR}${EXAMPLESDIR}"
 	@${ECHO_MSG}	""
 .endif