Index: devel/sfml/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- devel/sfml/Makefile 1 Sep 2010 18:05:18 -0000 1.7 +++ devel/sfml/Makefile 8 Jul 2011 07:04:33 -0000 @@ -7,6 +7,7 @@ PORTNAME= sfml PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 Index: devel/sfml/pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/sfml/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- devel/sfml/pkg-plist 1 Sep 2010 18:05:18 -0000 1.2 +++ devel/sfml/pkg-plist 8 Jul 2011 07:04:33 -0000 @@ -72,14 +72,19 @@ 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 @dirrm include/SFML/Window @dirrm include/SFML/System/Win32 Index: devel/sfml/files/patch-src-SFML-Audio-Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/files/patch-src-SFML-Audio-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-src-SFML-Audio-Makefile --- devel/sfml/files/patch-src-SFML-Audio-Makefile 16 Jul 2009 14:56:33 -0000 1.1 +++ devel/sfml/files/patch-src-SFML-Audio-Makefile 8 Jul 2011 07:04:33 -0000 @@ -1,6 +1,16 @@ ---- src/SFML/Audio/Makefile.orig 2009-05-28 19:57:04.000000000 +0400 -+++ src/SFML/Audio/Makefile 2009-07-07 19:51:57.000000000 +0400 -@@ -19,13 +19,13 @@ +--- src/SFML/Audio/Makefile.orig 2010-01-27 15:00:19.000000000 +0100 ++++ src/SFML/Audio/Makefile 2011-07-07 18:10:38.318404815 +0200 +@@ -10,7 +10,8 @@ + else + LIB = libsfml-audio.so + LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) +- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) ++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \ ++ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB) + endif + + all: $(LIB) +@@ -19,13 +20,13 @@ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) libsfml-audio.so: $(OBJ) $(OBJVORBIS) Index: devel/sfml/files/patch-src-SFML-Graphics-Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/files/patch-src-SFML-Graphics-Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-src-SFML-Graphics-Makefile --- devel/sfml/files/patch-src-SFML-Graphics-Makefile 1 Sep 2010 18:05:18 -0000 1.2 +++ devel/sfml/files/patch-src-SFML-Graphics-Makefile 8 Jul 2011 07:04:33 -0000 @@ -1,6 +1,16 @@ ---- 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 @@ +--- src/SFML/Graphics/Makefile.orig 2010-01-27 15:00:05.000000000 +0100 ++++ src/SFML/Graphics/Makefile 2011-07-07 18:17:27.725542035 +0200 +@@ -18,7 +18,8 @@ + else + LIB = libsfml-graphics.so + LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) +- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) ++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \ ++ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB) + endif + + all: $(LIB) +@@ -26,14 +27,14 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) Index: devel/sfml/files/patch-src-SFML-Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/files/patch-src-SFML-Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-src-SFML-Makefile --- devel/sfml/files/patch-src-SFML-Makefile 1 Sep 2010 18:05:18 -0000 1.2 +++ devel/sfml/files/patch-src-SFML-Makefile 8 Jul 2011 07:04:33 -0000 @@ -1,5 +1,5 @@ ---- src/SFML/Makefile.orig 2010-01-27 17:00:37.000000000 +0300 -+++ src/SFML/Makefile 2010-08-25 07:08:45.000000000 +0400 +--- src/SFML/Makefile.orig 2010-01-27 15:00:37.000000000 +0100 ++++ src/SFML/Makefile 2011-07-07 18:04:51.328315292 +0200 @@ -4,7 +4,7 @@ ifeq ($(DEBUGBUILD), yes) DEBUGFLAGS = -g -DDEBUG @@ -9,7 +9,7 @@ endif ifeq ($(STATIC), no) -@@ -15,11 +15,11 @@ +@@ -15,21 +15,23 @@ LINKFLAGS = endif @@ -24,9 +24,12 @@ +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.6 +-export VERSION = 1.6 ++export MAJVERSION = 1 ++export MINVERSION = 6 ++export VERSION = $(MAJVERSION).$(MINVERSION) export CP = cp -@@ -27,9 +27,9 @@ + export LN = ln export LNFLAGS = -s -f export AR = ar export ARFLAGS = rcs Index: devel/sfml/files/patch-src-SFML-Network-Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/files/patch-src-SFML-Network-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-src-SFML-Network-Makefile --- devel/sfml/files/patch-src-SFML-Network-Makefile 16 Jul 2009 14:56:33 -0000 1.1 +++ devel/sfml/files/patch-src-SFML-Network-Makefile 8 Jul 2011 07:04:33 -0000 @@ -1,6 +1,16 @@ ---- src/SFML/Network/Makefile.orig 2009-05-28 19:57:08.000000000 +0400 -+++ src/SFML/Network/Makefile 2009-07-07 20:01:13.000000000 +0400 -@@ -17,10 +17,10 @@ +--- src/SFML/Network/Makefile.orig 2010-01-27 15:00:37.000000000 +0100 ++++ src/SFML/Network/Makefile 2011-07-07 18:18:42.121053755 +0200 +@@ -8,7 +8,8 @@ + else + LIB = libsfml-network.so + LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) +- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) ++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \ ++ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB) + endif + + all: $(LIB) +@@ -17,10 +18,10 @@ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) libsfml-network.so: $(OBJ) Index: devel/sfml/files/patch-src-SFML-System-Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/files/patch-src-SFML-System-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-src-SFML-System-Makefile --- devel/sfml/files/patch-src-SFML-System-Makefile 16 Jul 2009 14:56:33 -0000 1.1 +++ devel/sfml/files/patch-src-SFML-System-Makefile 8 Jul 2011 07:04:33 -0000 @@ -1,6 +1,16 @@ ---- src/SFML/System/Makefile.orig 2009-05-28 19:57:04.000000000 +0400 -+++ src/SFML/System/Makefile 2009-07-07 19:51:23.000000000 +0400 -@@ -17,10 +17,10 @@ +--- src/SFML/System/Makefile.orig 2010-01-27 15:00:23.000000000 +0100 ++++ src/SFML/System/Makefile 2011-07-07 18:19:35.964973862 +0200 +@@ -8,7 +8,8 @@ + else + LIB = libsfml-system.so + LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) +- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) ++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \ ++ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB) + endif + + all: $(LIB) +@@ -17,10 +18,10 @@ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) libsfml-system.so: $(OBJ) Index: devel/sfml/files/patch-src-SFML-Window-Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/files/patch-src-SFML-Window-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-src-SFML-Window-Makefile --- devel/sfml/files/patch-src-SFML-Window-Makefile 16 Jul 2009 14:56:33 -0000 1.1 +++ devel/sfml/files/patch-src-SFML-Window-Makefile 8 Jul 2011 07:04:33 -0000 @@ -1,6 +1,16 @@ ---- src/SFML/Window/Makefile.orig 2009-05-28 19:57:08.000000000 +0400 -+++ src/SFML/Window/Makefile 2009-07-07 19:51:46.000000000 +0400 -@@ -18,10 +18,10 @@ +--- src/SFML/Window/Makefile.orig 2010-01-27 15:00:37.000000000 +0100 ++++ src/SFML/Window/Makefile 2011-07-07 18:20:29.367023005 +0200 +@@ -9,7 +9,8 @@ + else + LIB = libsfml-window.so + LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) +- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) ++ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \ ++ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB) + endif + + all: $(LIB) +@@ -18,10 +19,10 @@ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) libsfml-window.so: $(OBJ)