From owner-svn-ports-all@FreeBSD.ORG Tue Dec 17 23:07:49 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6133793; Tue, 17 Dec 2013 23:07:49 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 88293167D; Tue, 17 Dec 2013 23:07:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHN7nXN091098; Tue, 17 Dec 2013 23:07:49 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHN7noa091095; Tue, 17 Dec 2013 23:07:49 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312172307.rBHN7noa091095@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 17 Dec 2013 23:07:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336789 - in head/devel/sfml: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 23:07:49 -0000 Author: amdmi3 Date: Tue Dec 17 23:07:48 2013 New Revision: 336789 URL: http://svnweb.freebsd.org/changeset/ports/336789 Log: - Support staging - Use new LIB_DEPENDS syntax Modified: head/devel/sfml/Makefile head/devel/sfml/files/patch-src-SFML-Makefile Modified: head/devel/sfml/Makefile ============================================================================== --- head/devel/sfml/Makefile Tue Dec 17 22:47:29 2013 (r336788) +++ head/devel/sfml/Makefile Tue Dec 17 23:07:48 2013 (r336789) @@ -11,10 +11,10 @@ DISTNAME= SFML-${PORTVERSION}-sdk-linux- MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library -LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile \ - jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng.so:${PORTSDIR}/graphics/png \ + libfreetype.so:${PORTSDIR}/print/freetype2 USES= gmake pkgconfig USE_OPENAL= al @@ -22,6 +22,7 @@ USE_XORG= x11 xrandr USE_GL= gl glu USE_LDCONFIG= yes USE_DOS2UNIX= Makefile +DESTDIRNAME= STAGEDIR WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} @@ -29,8 +30,7 @@ PORTDOCS= * PORTSCOUT= limit:[^c]$$ -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS post-extract: @${RM} -f ${WRKSRC}/lib/* @@ -38,11 +38,9 @@ post-extract: post-install: .for lib in audio graphics network system window - @${LN} -s libsfml-${lib}.so.${PORTVERSION} ${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/} + @${LN} -s libsfml-${lib}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/} .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "*" ${DOCSDIR}/ -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include Modified: head/devel/sfml/files/patch-src-SFML-Makefile ============================================================================== --- head/devel/sfml/files/patch-src-SFML-Makefile Tue Dec 17 22:47:29 2013 (r336788) +++ head/devel/sfml/files/patch-src-SFML-Makefile Tue Dec 17 23:07:48 2013 (r336789) @@ -31,7 +31,7 @@ export AR = ar export ARFLAGS = rcs -export DESTDIR = /usr/local -+export DESTDIR = ${PREFIX} ++export DESTDIR = ${STAGEDIR}${PREFIX} export DESTLIBDIR = $(DESTDIR)/lib -export DESTINCDIR = $(DESTDIR)/include +export DESTINCDIR = $(DESTDIR)/include/SFML