Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Aug 2019 17:20:45 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r509617 - in head/devel/sfml1: . files
Message-ID:  <201908221720.x7MHKjPg081583@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Aug 22 17:20:45 2019
New Revision: 509617
URL: https://svnweb.freebsd.org/changeset/ports/509617

Log:
  - Add USES=gl
  - Set c++ standard and fix passing c++ flags to the complier, which in turn fixes build on arm and aarch64
  - Switch to options helpers

Modified:
  head/devel/sfml1/Makefile
  head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile

Modified: head/devel/sfml1/Makefile
==============================================================================
--- head/devel/sfml1/Makefile	Thu Aug 22 17:10:06 2019	(r509616)
+++ head/devel/sfml1/Makefile	Thu Aug 22 17:20:45 2019	(r509617)
@@ -19,11 +19,12 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libpng.so:graphics/png \
 		libfreetype.so:print/freetype2
 
-USES=		gmake jpeg openal:al pkgconfig dos2unix
+USES=		gmake jpeg gl openal:al pkgconfig dos2unix
 DOS2UNIX_GLOB=	Makefile ResourcePtr.inl
 USE_XORG=	x11 xrandr
 USE_GL=		gl glu
 USE_LDCONFIG=	yes
+USE_CXXSTD=	c++98
 DESTDIRNAME=	STAGEDIR
 
 WRKSRC=		${WRKDIR}/SFML-${PORTVERSION}
@@ -40,10 +41,12 @@ post-extract:
 	@${FIND} ${WRKSRC}/samples/bin/ -type f -maxdepth 1 -delete
 
 post-install:
-	${FIND} ${STAGEDIR}${PREFIX}/include/SFML -name "*.hpp" -exec ${REINPLACE_CMD} -i '' -e '/#include/ s|SFML|&1|' {} \;
-	${MV} ${STAGEDIR}${PREFIX}/include/SFML ${STAGEDIR}${PREFIX}/include/SFML${PKGNAMESUFFIX}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${FIND} ${STAGEDIR}${PREFIX}/include/SFML -name "*.hpp" -exec ${REINPLACE_CMD} -i '' -e '/#include/ s|SFML|&1|' {} \;
+	@${MV} ${STAGEDIR}${PREFIX}/include/SFML ${STAGEDIR}${PREFIX}/include/SFML${PKGNAMESUFFIX}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile
==============================================================================
--- head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile	Thu Aug 22 17:10:06 2019	(r509616)
+++ head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile	Thu Aug 22 17:20:45 2019	(r509617)
@@ -20,7 +20,7 @@
  
  $(OBJ): %.o: %.cpp
 -	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-+	$(CXX) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
++	$(CXX) -o $@ -c $< $(CXXFLAGS) -I/usr/include/freetype2
  
  $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
 -	$(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG



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