From owner-svn-ports-all@freebsd.org Thu Aug 22 17:20:46 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 75A42CD898; Thu, 22 Aug 2019 17:20:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46DrsB24f4z3C0D; Thu, 22 Aug 2019 17:20:46 +0000 (UTC) (envelope-from amdmi3@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42954766D; Thu, 22 Aug 2019 17:20:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7MHKkBm081584; Thu, 22 Aug 2019 17:20:46 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7MHKjPg081583; Thu, 22 Aug 2019 17:20:45 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201908221720.x7MHKjPg081583@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 22 Aug 2019 17:20:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509617 - in head/devel/sfml1: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/devel/sfml1: . files X-SVN-Commit-Revision: 509617 X-SVN-Commit-Repository: ports 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.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2019 17:20:46 -0000 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 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