- Update to 1.6

5 files changed, 24 insertions, 22 deletions

diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index a07b22ed334d..31654e1ebbe3 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sfml
-PORTVERSION=	1.5
-PORTREVISION=	4
+PORTVERSION=	1.6
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	SFML-${PORTVERSION}-sdk-linux-32
@@ -31,8 +30,11 @@ WRKSRC=		${WRKDIR}/SFML-${PORTVERSION}
 
 PORTDOCS=	*
 
+PORTSCOUT=	limit:[^c]$$
+
 post-extract:
-	@${RM} ${WRKSRC}/lib/*
+	@${RM} -f ${WRKSRC}/lib/*
+	@${FIND} ${WRKSRC}/samples/bin/ -type f -maxdepth 1 -delete
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/sfml/distinfo b/devel/sfml/distinfo
index d10931f18d16..b05517aafbf5 100644
--- a/devel/sfml/distinfo
+++ b/devel/sfml/distinfo
@@ -1,3 +1,3 @@
-MD5 (SFML-1.5-sdk-linux-32.tar.gz) = cd2d17ab09048af9e74c473f61125d4f
-SHA256 (SFML-1.5-sdk-linux-32.tar.gz) = aaa284b67f00d21fa25915b6acd65f08d3bdf1e35801385cc6fbed4a93e1f9c8
-SIZE (SFML-1.5-sdk-linux-32.tar.gz) = 13065958
+MD5 (SFML-1.6-sdk-linux-32.tar.gz) = acc678933c19558587aad8332ea6f459
+SHA256 (SFML-1.6-sdk-linux-32.tar.gz) = b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8
+SIZE (SFML-1.6-sdk-linux-32.tar.gz) = 12937755
diff --git a/devel/sfml/files/patch-src-SFML-Graphics-Makefile b/devel/sfml/files/patch-src-SFML-Graphics-Makefile
index a2ca18f8b615..40a80caa6645 100644
--- a/devel/sfml/files/patch-src-SFML-Graphics-Makefile
+++ b/devel/sfml/files/patch-src-SFML-Graphics-Makefile
@@ -1,17 +1,17 @@
---- src/SFML/Graphics/Makefile.orig	2009-05-28 19:57:02.000000000 +0400
-+++ src/SFML/Graphics/Makefile	2009-07-07 19:59:29.000000000 +0400
+--- src/SFML/Graphics/Makefile.orig	2010-01-27 17:00:05.000000000 +0300
++++ src/SFML/Graphics/Makefile	2010-08-25 07:07:23.000000000 +0400
 @@ -26,14 +26,14 @@
  libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)

  	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)

  

 -libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)

--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype

+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL

 +libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL)

-+	$(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lpng -ljpeg -lz

++	$(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lX11 -lGL -lpng -ljpeg -lz

  

  $(OBJ): %.o: %.cpp

 -	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2

-+	$(CXX) -o $@ -c $< $(CXXFLAGS)

++	$(CXX) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2

  

  $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c

 -	$(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG

diff --git a/devel/sfml/files/patch-src-SFML-Makefile b/devel/sfml/files/patch-src-SFML-Makefile
index dcd378ae19e6..3c765402c3ce 100644
--- a/devel/sfml/files/patch-src-SFML-Makefile
+++ b/devel/sfml/files/patch-src-SFML-Makefile
@@ -1,5 +1,5 @@
---- src/SFML/Makefile.orig	2009-05-28 19:57:08.000000000 +0400
-+++ src/SFML/Makefile	2009-07-07 20:02:57.000000000 +0400
+--- src/SFML/Makefile.orig	2010-01-27 17:00:37.000000000 +0300
++++ src/SFML/Makefile	2010-08-25 07:08:45.000000000 +0400
 @@ -4,7 +4,7 @@
  ifeq ($(DEBUGBUILD), yes)

      DEBUGFLAGS = -g -DDEBUG

@@ -20,17 +20,17 @@
 -export LDFLAGS    = $(LINKFLAGS)

 +export CC         ?= gcc

 +export CXX        ?= g++

-+export CFLAGS     += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)

-+export CXXFLAGS   += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)

++export CFLAGS     += -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2

++export CXXFLAGS   += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2

 +export LDFLAGS    = -L${LOCALBASE}/lib $(LINKFLAGS)

  export LIBPATH    = ../../../lib

- export VERSION    = 1.5

+ export VERSION    = 1.6

  export CP         = cp

 @@ -27,9 +27,9 @@
  export LNFLAGS    = -s -f

  export AR         = ar

  export ARFLAGS    = rcs

--export DESTDIR    = /usr

+-export DESTDIR    = /usr/local

 +export DESTDIR    = ${PREFIX}

  export DESTLIBDIR = $(DESTDIR)/lib

 -export DESTINCDIR = $(DESTDIR)/include

diff --git a/devel/sfml/pkg-plist b/devel/sfml/pkg-plist
index 5c26c035de60..7149dce24159 100644
--- a/devel/sfml/pkg-plist
+++ b/devel/sfml/pkg-plist
@@ -72,15 +72,15 @@ include/SFML/Window/WindowListener.hpp
 include/SFML/Window/WindowSettings.hpp
 include/SFML/Window/WindowStyle.hpp
 lib/libsfml-audio.so
-lib/libsfml-audio.so.1.5
+lib/libsfml-audio.so.1.6
 lib/libsfml-graphics.so
-lib/libsfml-graphics.so.1.5
+lib/libsfml-graphics.so.1.6
 lib/libsfml-network.so
-lib/libsfml-network.so.1.5
+lib/libsfml-network.so.1.6
 lib/libsfml-system.so
-lib/libsfml-system.so.1.5
+lib/libsfml-system.so.1.6
 lib/libsfml-window.so
-lib/libsfml-window.so.1.5
+lib/libsfml-window.so.1.6
 @dirrm include/SFML/Window
 @dirrm include/SFML/System/Win32
 @dirrm include/SFML/System/Unix