svn commit: r353529 - in head/devel: . sfml1

Dmitry Marakasov amdmi3 at FreeBSD.org
Fri May 9 22:07:32 UTC 2014 

Author: amdmi3
Date: Fri May  9 22:07:31 2014
New Revision: 353529
URL: http://svnweb.freebsd.org/changeset/ports/353529
QAT: https://qat.redports.org/buildarchive/r353529/

Log:
  - Repocopy graphics/sfml to graphics/sfml1 in preparaton for update to 2.x
  - Implement necessary hacks needed for graphics/sfml and graphics/sfml1 to coexist

Added:
  head/devel/sfml1/
     - copied from r353520, head/devel/sfml/
Modified:
  head/devel/Makefile
  head/devel/sfml1/Makefile
  head/devel/sfml1/pkg-plist

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri May  9 22:05:47 2014	(r353528)
+++ head/devel/Makefile	Fri May  9 22:07:31 2014	(r353529)
@@ -4464,6 +4464,7 @@
     SUBDIR += serdisplib
     SUBDIR += sfio
     SUBDIR += sfml
+    SUBDIR += sfml1
     SUBDIR += sfslite
     SUBDIR += sfslite-dbg
     SUBDIR += sfslite-noopt

Modified: head/devel/sfml1/Makefile
==============================================================================
--- head/devel/sfml/Makefile	Fri May  9 21:13:09 2014	(r353520)
+++ head/devel/sfml1/Makefile	Fri May  9 22:07:31 2014	(r353529)
@@ -3,10 +3,10 @@
 
 PORTNAME=	sfml
 PORTVERSION=	1.6
-PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	SFML-${PORTVERSION}-sdk-linux-32
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Simple and Fast Multimedia Library
@@ -25,6 +25,7 @@ DESTDIRNAME=	STAGEDIR
 
 WRKSRC=		${WRKDIR}/SFML-${PORTVERSION}
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 PORTDOCS=	*
 
 PORTSCOUT=	limit:[^c]$$
@@ -36,8 +37,14 @@ 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}
 .for lib in audio graphics network system window
-	@${LN} -s libsfml-${lib}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsfml-${lib}.so
+	${MV} ${STAGEDIR}${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libsfml${PKGNAMESUFFIX}-${lib}.so.${PORTVERSION}
+	${MV} ${STAGEDIR}${PREFIX}/lib/libsfml-${lib}.so ${STAGEDIR}${PREFIX}/lib/libsfml${PKGNAMESUFFIX}-${lib}.so
+	${LN} -s libsfml${PKGNAMESUFFIX}-${lib}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libsfml${PKGNAMESUFFIX}-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/}
+	${LN} -fs libsfml${PKGNAMESUFFIX}-${lib}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libsfml${PKGNAMESUFFIX}-${lib}.so
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/

Modified: head/devel/sfml1/pkg-plist
==============================================================================
--- head/devel/sfml/pkg-plist	Fri May  9 21:13:09 2014	(r353520)
+++ head/devel/sfml1/pkg-plist	Fri May  9 22:07:31 2014	(r353529)
@@ -1,98 +1,98 @@
-include/SFML/Audio.hpp
-include/SFML/Audio/AudioResource.hpp
-include/SFML/Audio/Listener.hpp
-include/SFML/Audio/Music.hpp
-include/SFML/Audio/Sound.hpp
-include/SFML/Audio/SoundBuffer.hpp
-include/SFML/Audio/SoundBufferRecorder.hpp
-include/SFML/Audio/SoundRecorder.hpp
-include/SFML/Audio/SoundStream.hpp
-include/SFML/Config.hpp
-include/SFML/Graphics.hpp
-include/SFML/Graphics/Color.hpp
-include/SFML/Graphics/Drawable.hpp
-include/SFML/Graphics/Font.hpp
-include/SFML/Graphics/Glyph.hpp
-include/SFML/Graphics/Image.hpp
-include/SFML/Graphics/Matrix3.hpp
-include/SFML/Graphics/Matrix3.inl
-include/SFML/Graphics/PostFX.hpp
-include/SFML/Graphics/Rect.hpp
-include/SFML/Graphics/Rect.inl
-include/SFML/Graphics/RenderTarget.hpp
-include/SFML/Graphics/RenderWindow.hpp
-include/SFML/Graphics/Shape.hpp
-include/SFML/Graphics/Sprite.hpp
-include/SFML/Graphics/String.hpp
-include/SFML/Graphics/View.hpp
-include/SFML/Network.hpp
-include/SFML/Network/Ftp.hpp
-include/SFML/Network/Http.hpp
-include/SFML/Network/IPAddress.hpp
-include/SFML/Network/Packet.hpp
-include/SFML/Network/Selector.hpp
-include/SFML/Network/Selector.inl
-include/SFML/Network/SelectorBase.hpp
-include/SFML/Network/SocketHelper.hpp
-include/SFML/Network/SocketTCP.hpp
-include/SFML/Network/SocketUDP.hpp
-include/SFML/Network/Sockets.hpp
-include/SFML/Network/Unix/SocketHelper.hpp
-include/SFML/Network/Win32/SocketHelper.hpp
-include/SFML/System.hpp
-include/SFML/System/Clock.hpp
-include/SFML/System/Lock.hpp
-include/SFML/System/Mutex.hpp
-include/SFML/System/NonCopyable.hpp
-include/SFML/System/Randomizer.hpp
-include/SFML/System/Resource.hpp
-include/SFML/System/Resource.inl
-include/SFML/System/ResourcePtr.inl
-include/SFML/System/Sleep.hpp
-include/SFML/System/Thread.hpp
-include/SFML/System/Unicode.hpp
-include/SFML/System/Unicode.inl
-include/SFML/System/Unix/Mutex.hpp
-include/SFML/System/Unix/Thread.hpp
-include/SFML/System/Vector2.hpp
-include/SFML/System/Vector2.inl
-include/SFML/System/Vector3.hpp
-include/SFML/System/Vector3.inl
-include/SFML/System/Win32/Mutex.hpp
-include/SFML/System/Win32/Thread.hpp
-include/SFML/Window.hpp
-include/SFML/Window/Context.hpp
-include/SFML/Window/Event.hpp
-include/SFML/Window/Input.hpp
-include/SFML/Window/OpenGL.hpp
-include/SFML/Window/VideoMode.hpp
-include/SFML/Window/Window.hpp
-include/SFML/Window/WindowHandle.hpp
-include/SFML/Window/WindowListener.hpp
-include/SFML/Window/WindowSettings.hpp
-include/SFML/Window/WindowStyle.hpp
-lib/libsfml-audio.so
-lib/libsfml-audio.so.1
-lib/libsfml-audio.so.1.6
-lib/libsfml-graphics.so
-lib/libsfml-graphics.so.1
-lib/libsfml-graphics.so.1.6
-lib/libsfml-network.so
-lib/libsfml-network.so.1
-lib/libsfml-network.so.1.6
-lib/libsfml-system.so
-lib/libsfml-system.so.1
-lib/libsfml-system.so.1.6
-lib/libsfml-window.so
-lib/libsfml-window.so.1
-lib/libsfml-window.so.1.6
- at dirrm include/SFML/Window
- at dirrm include/SFML/System/Win32
- at dirrm include/SFML/System/Unix
- at dirrm include/SFML/System
- at dirrm include/SFML/Network/Win32
- at dirrm include/SFML/Network/Unix
- at dirrm include/SFML/Network
- at dirrm include/SFML/Graphics
- at dirrm include/SFML/Audio
- at dirrm include/SFML
+include/SFML1/Audio.hpp
+include/SFML1/Audio/AudioResource.hpp
+include/SFML1/Audio/Listener.hpp
+include/SFML1/Audio/Music.hpp
+include/SFML1/Audio/Sound.hpp
+include/SFML1/Audio/SoundBuffer.hpp
+include/SFML1/Audio/SoundBufferRecorder.hpp
+include/SFML1/Audio/SoundRecorder.hpp
+include/SFML1/Audio/SoundStream.hpp
+include/SFML1/Config.hpp
+include/SFML1/Graphics.hpp
+include/SFML1/Graphics/Color.hpp
+include/SFML1/Graphics/Drawable.hpp
+include/SFML1/Graphics/Font.hpp
+include/SFML1/Graphics/Glyph.hpp
+include/SFML1/Graphics/Image.hpp
+include/SFML1/Graphics/Matrix3.hpp
+include/SFML1/Graphics/Matrix3.inl
+include/SFML1/Graphics/PostFX.hpp
+include/SFML1/Graphics/Rect.hpp
+include/SFML1/Graphics/Rect.inl
+include/SFML1/Graphics/RenderTarget.hpp
+include/SFML1/Graphics/RenderWindow.hpp
+include/SFML1/Graphics/Shape.hpp
+include/SFML1/Graphics/Sprite.hpp
+include/SFML1/Graphics/String.hpp
+include/SFML1/Graphics/View.hpp
+include/SFML1/Network.hpp
+include/SFML1/Network/Ftp.hpp
+include/SFML1/Network/Http.hpp
+include/SFML1/Network/IPAddress.hpp
+include/SFML1/Network/Packet.hpp
+include/SFML1/Network/Selector.hpp
+include/SFML1/Network/Selector.inl
+include/SFML1/Network/SelectorBase.hpp
+include/SFML1/Network/SocketHelper.hpp
+include/SFML1/Network/SocketTCP.hpp
+include/SFML1/Network/SocketUDP.hpp
+include/SFML1/Network/Sockets.hpp
+include/SFML1/Network/Unix/SocketHelper.hpp
+include/SFML1/Network/Win32/SocketHelper.hpp
+include/SFML1/System.hpp
+include/SFML1/System/Clock.hpp
+include/SFML1/System/Lock.hpp
+include/SFML1/System/Mutex.hpp
+include/SFML1/System/NonCopyable.hpp
+include/SFML1/System/Randomizer.hpp
+include/SFML1/System/Resource.hpp
+include/SFML1/System/Resource.inl
+include/SFML1/System/ResourcePtr.inl
+include/SFML1/System/Sleep.hpp
+include/SFML1/System/Thread.hpp
+include/SFML1/System/Unicode.hpp
+include/SFML1/System/Unicode.inl
+include/SFML1/System/Unix/Mutex.hpp
+include/SFML1/System/Unix/Thread.hpp
+include/SFML1/System/Vector2.hpp
+include/SFML1/System/Vector2.inl
+include/SFML1/System/Vector3.hpp
+include/SFML1/System/Vector3.inl
+include/SFML1/System/Win32/Mutex.hpp
+include/SFML1/System/Win32/Thread.hpp
+include/SFML1/Window.hpp
+include/SFML1/Window/Context.hpp
+include/SFML1/Window/Event.hpp
+include/SFML1/Window/Input.hpp
+include/SFML1/Window/OpenGL.hpp
+include/SFML1/Window/VideoMode.hpp
+include/SFML1/Window/Window.hpp
+include/SFML1/Window/WindowHandle.hpp
+include/SFML1/Window/WindowListener.hpp
+include/SFML1/Window/WindowSettings.hpp
+include/SFML1/Window/WindowStyle.hpp
+lib/libsfml1-audio.so
+lib/libsfml1-audio.so.1
+lib/libsfml1-audio.so.1.6
+lib/libsfml1-graphics.so
+lib/libsfml1-graphics.so.1
+lib/libsfml1-graphics.so.1.6
+lib/libsfml1-network.so
+lib/libsfml1-network.so.1
+lib/libsfml1-network.so.1.6
+lib/libsfml1-system.so
+lib/libsfml1-system.so.1
+lib/libsfml1-system.so.1.6
+lib/libsfml1-window.so
+lib/libsfml1-window.so.1
+lib/libsfml1-window.so.1.6
+ at dirrm include/SFML1/Audio
+ at dirrm include/SFML1/Graphics
+ at dirrm include/SFML1/Network/Unix
+ at dirrm include/SFML1/Network/Win32
+ at dirrm include/SFML1/Network
+ at dirrm include/SFML1/System/Unix
+ at dirrm include/SFML1/System/Win32
+ at dirrm include/SFML1/System
+ at dirrm include/SFML1/Window
+ at dirrm include/SFML1

More information about the svn-ports-all mailing list