Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 23:07:49 +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: r336789 - in head/devel/sfml: . files
Message-ID:  <201312172307.rBHN7noa091095@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
+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 <bsd.port.mk>

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



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