Attachment #116728 for bug #158721

Lines 7-12 Link Here

(-)sfml/Makefile (+1 lines)
7		7
8	PORTNAME= sfml	8	PORTNAME= sfml
9	PORTVERSION= 1.6	9	PORTVERSION= 1.6
		10	PORTREVISION= 1
10	CATEGORIES= devel	11	CATEGORIES= devel
11	MASTER_SITES= SF	12	MASTER_SITES= SF
12	DISTNAME= SFML-${PORTVERSION}-sdk-linux-32	13	DISTNAME= SFML-${PORTVERSION}-sdk-linux-32




--- 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)




--- 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)
 

Lines 1-6 Link Here

(-)sfml/files/patch-src-SFML-Makefile (-6 / +9 lines)
1	--- src/SFML/Makefile.orig 2010-01-27 17:00:37.000000000 +0300	1	--- src/SFML/Makefile.orig 2010-01-27 15:00:37.000000000 +0100
2	+++ src/SFML/Makefile 2010-08-25 07:08:45.000000000 +0400	2	+++ src/SFML/Makefile 2011-07-07 18:04:51.328315292 +0200
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4	ifeq ($(DEBUGBUILD), yes)	4	ifeq ($(DEBUGBUILD), yes)
5	DEBUGFLAGS = -g -DDEBUG	5	DEBUGFLAGS = -g -DDEBUG
6	else	6	else
Lines 9-15 Link Here
9	endif	9	endif
10		10
11	ifeq ($(STATIC), no)	11	ifeq ($(STATIC), no)
12	@@ -15,11 +15,11 @@	12	@@ -15,21 +15,23 @@
13	LINKFLAGS =	13	LINKFLAGS =
14	endif	14	endif
15		15
Lines 24-32 Link Here
24	+export CXXFLAGS += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2	24	+export CXXFLAGS += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
25	+export LDFLAGS = -L${LOCALBASE}/lib $(LINKFLAGS)	25	+export LDFLAGS = -L${LOCALBASE}/lib $(LINKFLAGS)
26	export LIBPATH = ../../../lib	26	export LIBPATH = ../../../lib
27	export VERSION = 1.6	27	-export VERSION = 1.6
		28	+export MAJVERSION = 1
		29	+export MINVERSION = 6
		30	+export VERSION = $(MAJVERSION).$(MINVERSION)
28	export CP = cp	31	export CP = cp
29	@@ -27,9 +27,9 @@	32	export LN = ln
30	export LNFLAGS = -s -f	33	export LNFLAGS = -s -f
31	export AR = ar	34	export AR = ar
32	export ARFLAGS = rcs	35	export ARFLAGS = rcs




--- 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)




--- 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)




--- 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)




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

Return to bug 158721

Lines 1-6 Link Here

(-)sfml/files/patch-src-SFML-Audio-Makefile (-3 / +13 lines)
1	--- src/SFML/Audio/Makefile.orig 2009-05-28 19:57:04.000000000 +0400	1	--- src/SFML/Audio/Makefile.orig 2010-01-27 15:00:19.000000000 +0100
2	+++ src/SFML/Audio/Makefile 2009-07-07 19:51:57.000000000 +0400	2	+++ src/SFML/Audio/Makefile 2011-07-07 18:10:38.318404815 +0200
3	@@ -19,13 +19,13 @@	3	@@ -10,7 +10,8 @@
		4	else
		5	LIB = libsfml-audio.so
		6	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
		7	- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
		8	+ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
		9	+ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
		10	endif
		11
		12	all: $(LIB)
		13	@@ -19,13 +20,13 @@
4	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)	14	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
5		15
6	libsfml-audio.so: $(OBJ) $(OBJVORBIS)	16	libsfml-audio.so: $(OBJ) $(OBJVORBIS)

Lines 1-6 Link Here

(-)sfml/files/patch-src-SFML-Graphics-Makefile (-3 / +13 lines)
1	--- src/SFML/Graphics/Makefile.orig 2010-01-27 17:00:05.000000000 +0300	1	--- src/SFML/Graphics/Makefile.orig 2010-01-27 15:00:05.000000000 +0100
2	+++ src/SFML/Graphics/Makefile 2010-08-25 07:07:23.000000000 +0400	2	+++ src/SFML/Graphics/Makefile 2011-07-07 18:17:27.725542035 +0200
3	@@ -26,14 +26,14 @@	3	@@ -18,7 +18,8 @@
		4	else
		5	LIB = libsfml-graphics.so
		6	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
		7	- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
		8	+ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
		9	+ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
		10	endif
		11
		12	all: $(LIB)
		13	@@ -26,14 +27,14 @@
4	libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)	14	libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
5	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)	15	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
6		16

Lines 1-6 Link Here

(-)sfml/files/patch-src-SFML-Network-Makefile (-3 / +13 lines)
1	--- src/SFML/Network/Makefile.orig 2009-05-28 19:57:08.000000000 +0400	1	--- src/SFML/Network/Makefile.orig 2010-01-27 15:00:37.000000000 +0100
2	+++ src/SFML/Network/Makefile 2009-07-07 20:01:13.000000000 +0400	2	+++ src/SFML/Network/Makefile 2011-07-07 18:18:42.121053755 +0200
3	@@ -17,10 +17,10 @@	3	@@ -8,7 +8,8 @@
		4	else
		5	LIB = libsfml-network.so
		6	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
		7	- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
		8	+ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
		9	+ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
		10	endif
		11
		12	all: $(LIB)
		13	@@ -17,10 +18,10 @@
4	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)	14	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
5		15
6	libsfml-network.so: $(OBJ)	16	libsfml-network.so: $(OBJ)

Lines 1-6 Link Here

(-)sfml/files/patch-src-SFML-System-Makefile (-3 / +13 lines)
1	--- src/SFML/System/Makefile.orig 2009-05-28 19:57:04.000000000 +0400	1	--- src/SFML/System/Makefile.orig 2010-01-27 15:00:23.000000000 +0100
2	+++ src/SFML/System/Makefile 2009-07-07 19:51:23.000000000 +0400	2	+++ src/SFML/System/Makefile 2011-07-07 18:19:35.964973862 +0200
3	@@ -17,10 +17,10 @@	3	@@ -8,7 +8,8 @@
		4	else
		5	LIB = libsfml-system.so
		6	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
		7	- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
		8	+ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
		9	+ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
		10	endif
		11
		12	all: $(LIB)
		13	@@ -17,10 +18,10 @@
4	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)	14	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
5		15
6	libsfml-system.so: $(OBJ)	16	libsfml-system.so: $(OBJ)

Lines 1-6 Link Here

(-)sfml/files/patch-src-SFML-Window-Makefile (-3 / +13 lines)
1	--- src/SFML/Window/Makefile.orig 2009-05-28 19:57:08.000000000 +0400	1	--- src/SFML/Window/Makefile.orig 2010-01-27 15:00:37.000000000 +0100
2	+++ src/SFML/Window/Makefile 2009-07-07 19:51:46.000000000 +0400	2	+++ src/SFML/Window/Makefile 2011-07-07 18:20:29.367023005 +0200
3	@@ -18,10 +18,10 @@	3	@@ -9,7 +9,8 @@
		4	else
		5	LIB = libsfml-window.so
		6	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
		7	- INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
		8	+ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
		9	+ && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
		10	endif
		11
		12	all: $(LIB)
		13	@@ -18,10 +19,10 @@
4	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)	14	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
5		15
6	libsfml-window.so: $(OBJ)	16	libsfml-window.so: $(OBJ)

Lines 72-85 Link Here

(-)sfml/pkg-plist (+5 lines)
72	include/SFML/Window/WindowSettings.hpp	72	include/SFML/Window/WindowSettings.hpp
73	include/SFML/Window/WindowStyle.hpp	73	include/SFML/Window/WindowStyle.hpp
74	lib/libsfml-audio.so	74	lib/libsfml-audio.so
		75	lib/libsfml-audio.so.1
75	lib/libsfml-audio.so.1.6	76	lib/libsfml-audio.so.1.6
76	lib/libsfml-graphics.so	77	lib/libsfml-graphics.so
		78	lib/libsfml-graphics.so.1
77	lib/libsfml-graphics.so.1.6	79	lib/libsfml-graphics.so.1.6
78	lib/libsfml-network.so	80	lib/libsfml-network.so
		81	lib/libsfml-network.so.1
79	lib/libsfml-network.so.1.6	82	lib/libsfml-network.so.1.6
80	lib/libsfml-system.so	83	lib/libsfml-system.so
		84	lib/libsfml-system.so.1
81	lib/libsfml-system.so.1.6	85	lib/libsfml-system.so.1.6
82	lib/libsfml-window.so	86	lib/libsfml-window.so
		87	lib/libsfml-window.so.1
83	lib/libsfml-window.so.1.6	88	lib/libsfml-window.so.1.6
84	@dirrm include/SFML/Window	89	@dirrm include/SFML/Window
85	@dirrm include/SFML/System/Win32	90	@dirrm include/SFML/System/Win32