From owner-svn-ports-head@freebsd.org  Sat Oct 24 15:08:41 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21A4CA1D70F;
 Sat, 24 Oct 2015 15:08:41 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 DACE4377;
 Sat, 24 Oct 2015 15:08:40 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9OF8dCx060491;
 Sat, 24 Oct 2015 15:08:39 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9OF8dOA060490;
 Sat, 24 Oct 2015 15:08:39 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201510241508.t9OF8dOA060490@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 24 Oct 2015 15:08:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r400125 - head/x11-clocks/glclock
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Oct 2015 15:08:41 -0000

Author: danfe
Date: Sat Oct 24 15:08:39 2015
New Revision: 400125
URL: https://svnweb.freebsd.org/changeset/ports/400125

Log:
  - Unbreak the build by s/glPolygonOffsetEXT/glPolygonOffset/
  - Simplify installation routine while I'm here
  
  PR:		203455
  Submitted by:	Walter Schwarzenfeld

Modified:
  head/x11-clocks/glclock/Makefile

Modified: head/x11-clocks/glclock/Makefile
==============================================================================
--- head/x11-clocks/glclock/Makefile	Sat Oct 24 14:46:28 2015	(r400124)
+++ head/x11-clocks/glclock/Makefile	Sat Oct 24 15:08:39 2015	(r400125)
@@ -10,8 +10,6 @@ MASTER_SITES=	http://www.daionet.gr.jp/~
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL spinning pocket watch demo and benchmark utility
 
-BROKEN=		fails to link
-
 USE_XORG=	xi xmu xext x11
 USE_GL=		gl glu glut
 MAKEFILE=	makefile
@@ -40,20 +38,14 @@ post-patch:
 		's|g\+\+|$${CXX}| ; \
 		 s|-O2|$${CXXFLAGS}| ; \
 		 s|/usr/X11R6|$${LOCALBASE}|' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|glPolygonOffsetEXT|glPolygonOffset|' \
+		${WRKSRC}/GLextensions.cpp
 
 do-install:
-.for i in ${PROGRAMS}
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} \
-		${STAGEDIR}${PREFIX}/bin)
-.endfor
-.for i in ${SCRIPTS}
-	(cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} \
-		${STAGEDIR}${PREFIX}/bin)
-.endfor
+	${INSTALL_PROGRAM} ${PROGRAMS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/glclock
-.for i in ${TEXTURES}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${PREFIX}/lib/X11/glclock)
-.endfor
+	${INSTALL_DATA} ${TEXTURES:S,^,${WRKSRC}/,} \
+		${STAGEDIR}${PREFIX}/lib/X11/glclock
 
 .include <bsd.port.mk>