svn commit: r400125 - head/x11-clocks/glclock

Alexey Dokuchaev danfe at FreeBSD.org
Sat Oct 24 15:08:41 UTC 2015


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 at 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>


More information about the svn-ports-all mailing list