diff options
Diffstat (limited to '')
-rw-r--r-- | devel/sfml/Makefile | 10 | ||||
-rw-r--r-- | devel/sfml/distinfo | 6 | ||||
-rw-r--r-- | devel/sfml/files/patch-include_SFML_System_String.hpp | 134 | ||||
-rw-r--r-- | devel/sfml/pkg-plist | 20 | ||||
-rw-r--r-- | devel/sfml1/Makefile | 50 | ||||
-rw-r--r-- | devel/sfml1/distinfo | 2 | ||||
-rw-r--r-- | devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl | 10 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Audio__Makefile | 30 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Graphics__Makefile | 30 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Makefile | 40 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Network__Makefile | 26 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__System__Makefile | 26 | ||||
-rw-r--r-- | devel/sfml1/files/patch-src__SFML__Window__Makefile | 26 | ||||
-rw-r--r-- | devel/sfml1/pkg-descr | 7 | ||||
-rw-r--r-- | devel/sfml1/pkg-plist | 83 |
15 files changed, 152 insertions, 348 deletions
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index 1f4725c6abd4..33bdc3e06787 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -1,9 +1,8 @@ PORTNAME= SFML -PORTVERSION= 2.6.1 -PORTREVISION= 1 +DISTVERSION= 2.6.2 CATEGORIES= devel -MAINTAINER= amdmi3@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Simple and Fast Multimedia Library WWW= https://www.sfml-dev.org/ \ https://github.com/SFML/SFML @@ -11,8 +10,6 @@ WWW= https://www.sfml-dev.org/ \ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.md -BROKEN_FreeBSD_15= compilation fails with libc++ 19, see PR281540 - USES= cmake compiler:c++11-lang USE_GITHUB= yes CMAKE_ON= SFML_USE_SYSTEM_DEPS @@ -23,6 +20,9 @@ CONFLICTS= sfml251 PORTDATA= * PORTDOCS= * +PLIST_SUB= LONGVERSION=${DISTVERSION} \ + SHORTVERSION=${DISTVERSION:R} + OPTIONS_DEFINE= DOCS DOXYGEN OPTIONS_GROUP= MODULES OPTIONS_GROUP_MODULES= AUDIO GRAPHICS NETWORK WINDOW diff --git a/devel/sfml/distinfo b/devel/sfml/distinfo index 96bc007dc613..8d0b3b95beec 100644 --- a/devel/sfml/distinfo +++ b/devel/sfml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717434619 -SHA256 (SFML-SFML-2.6.1_GH0.tar.gz) = 82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d -SIZE (SFML-SFML-2.6.1_GH0.tar.gz) = 25499153 +TIMESTAMP = 1731608442 +SHA256 (SFML-SFML-2.6.2_GH0.tar.gz) = 15ff4d608a018f287c6a885db0a2da86ea389e516d2323629e4d4407a7ce047f +SIZE (SFML-SFML-2.6.2_GH0.tar.gz) = 28624288 diff --git a/devel/sfml/files/patch-include_SFML_System_String.hpp b/devel/sfml/files/patch-include_SFML_System_String.hpp new file mode 100644 index 000000000000..ae79639bd4a2 --- /dev/null +++ b/devel/sfml/files/patch-include_SFML_System_String.hpp @@ -0,0 +1,134 @@ +--- include/SFML/System/String.hpp.orig 2023-10-30 00:03:26 UTC ++++ include/SFML/System/String.hpp +@@ -35,6 +35,131 @@ + #include <string> + + ++namespace std ++{ ++ ++namespace // anonymous ++{ ++ ++template<class CharType, class IntType, IntType EOFVal> ++struct char_traits_base ++{ ++ using char_type = CharType; ++ using int_type = IntType; ++ using off_type = streamoff; ++ using pos_type = fpos<mbstate_t>; ++ using state_type = mbstate_t; ++ ++ static inline constexpr void assign(char_type& c1, const char_type& c2) noexcept ++ { ++ c1 = c2; ++ } ++ ++ static inline constexpr bool eq(char_type c1, char_type c2) noexcept ++ { ++ return c1 == c2; ++ } ++ ++ static inline constexpr bool lt(char_type c1, char_type c2) noexcept ++ { ++ return c1 < c2; ++ } ++ ++ static constexpr int compare(const char_type* lhs, const char_type* rhs, size_t count) noexcept ++ { ++ for (; count; --count, ++lhs, ++rhs) ++ { ++ if (lt(*lhs, *rhs)) ++ return -1; ++ if (lt(*rhs, *lhs)) ++ return 1; ++ } ++ return 0; ++ } ++ ++ static inline size_t constexpr length(const char_type* s) noexcept ++ { ++ size_t i = 0; ++ for (; s[i] != '\0'; ++i) ++ { ++ } ++ return i; ++ } ++ ++ static constexpr const char_type* find(const char_type* s, size_t n, const char_type& a) noexcept ++ { ++ for (; n; --n) ++ { ++ if (*s == a) ++ return s; ++ ++s; ++ } ++ return nullptr; ++ } ++ ++ static inline char_type* move(char_type* s1, const char_type* s2, size_t n) noexcept ++ { ++ return reinterpret_cast<char_type*>(__builtin_memmove(s1, s2, n * sizeof(char_type))); ++ } ++ ++ static inline char_type* copy(char_type* s1, const char_type* s2, size_t n) noexcept ++ { ++ __builtin_memmove(s1, s2, n * sizeof(char_type)); ++ return s1; ++ } ++ ++ static inline char_type* assign(char_type* s, size_t n, char_type a) noexcept ++ { ++ std::fill_n(s, n, a); ++ return s; ++ } ++ ++ static inline constexpr int_type not_eof(int_type c) noexcept ++ { ++ return eq_int_type(c, eof()) ? ~eof() : c; ++ } ++ ++ static inline constexpr char_type to_char_type(int_type c) noexcept ++ { ++ return char_type(c); ++ } ++ ++ static inline constexpr int_type to_int_type(char_type c) noexcept ++ { ++ return int_type(c); ++ } ++ ++ static inline constexpr bool eq_int_type(int_type c1, int_type c2) noexcept ++ { ++ return c1 == c2; ++ } ++ ++ static inline constexpr int_type eof() noexcept ++ { ++ return int_type(EOF); ++ } ++}; ++ ++} // namespace anonymous ++ ++template<> ++struct char_traits<unsigned char> : char_traits_base<unsigned char, unsigned int, static_cast<unsigned int>(EOF)> ++{ ++}; ++ ++template<> ++struct char_traits<unsigned short> : char_traits_base<unsigned short, unsigned int, static_cast<unsigned int>(0xFFFF)> ++{ ++}; ++ ++template<> ++struct char_traits<unsigned int> : char_traits_base<unsigned int, unsigned int, static_cast<unsigned int>(0xFFFFFFFF)> ++{ ++}; ++ ++} // namespace std ++ ++ + namespace sf + { + //////////////////////////////////////////////////////////// diff --git a/devel/sfml/pkg-plist b/devel/sfml/pkg-plist index 9ea258788869..c40d1217fe01 100644 --- a/devel/sfml/pkg-plist +++ b/devel/sfml/pkg-plist @@ -113,20 +113,20 @@ lib/cmake/SFML/SFMLConfigVersion.cmake lib/cmake/SFML/SFMLSharedTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SFML/SFMLSharedTargets.cmake %%AUDIO%%lib/libsfml-audio.so -%%AUDIO%%lib/libsfml-audio.so.2.6 -%%AUDIO%%lib/libsfml-audio.so.2.6.1 +%%AUDIO%%lib/libsfml-audio.so.%%SHORTVERSION%% +%%AUDIO%%lib/libsfml-audio.so.%%LONGVERSION%% %%GRAPHICS%%lib/libsfml-graphics.so -%%GRAPHICS%%lib/libsfml-graphics.so.2.6 -%%GRAPHICS%%lib/libsfml-graphics.so.2.6.1 +%%GRAPHICS%%lib/libsfml-graphics.so.%%SHORTVERSION%% +%%GRAPHICS%%lib/libsfml-graphics.so.%%LONGVERSION%% %%NETWORK%%lib/libsfml-network.so -%%NETWORK%%lib/libsfml-network.so.2.6 -%%NETWORK%%lib/libsfml-network.so.2.6.1 +%%NETWORK%%lib/libsfml-network.so.%%SHORTVERSION%% +%%NETWORK%%lib/libsfml-network.so.%%LONGVERSION%% lib/libsfml-system.so -lib/libsfml-system.so.2.6 -lib/libsfml-system.so.2.6.1 +lib/libsfml-system.so.%%SHORTVERSION%% +lib/libsfml-system.so.%%LONGVERSION%% %%WINDOW%%lib/libsfml-window.so -%%WINDOW%%lib/libsfml-window.so.2.6 -%%WINDOW%%lib/libsfml-window.so.2.6.1 +%%WINDOW%%lib/libsfml-window.so.%%SHORTVERSION%% +%%WINDOW%%lib/libsfml-window.so.%%LONGVERSION%% libdata/pkgconfig/sfml-all.pc %%AUDIO%%libdata/pkgconfig/sfml-audio.pc %%GRAPHICS%%libdata/pkgconfig/sfml-graphics.pc diff --git a/devel/sfml1/Makefile b/devel/sfml1/Makefile deleted file mode 100644 index aec0074ded1f..000000000000 --- a/devel/sfml1/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PORTNAME= sfml -PORTVERSION= 1.6 -PORTREVISION= 8 -CATEGORIES= devel -MASTER_SITES= https://www.sfml-dev.org/files/ -PKGNAMESUFFIX= 1 -DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 - -MAINTAINER= amdmi3@FreeBSD.org -COMMENT= Simple and Fast Multimedia Library -WWW= https://www.sfml-dev.org/ - -LICENSE= ZLIB -LICENSE_FILE= ${WRKSRC}/license.txt - -LIB_DEPENDS= libsndfile.so:audio/libsndfile \ - libpng.so:graphics/png \ - libfreetype.so:print/freetype2 - -USES= gmake jpeg gl openal:al pkgconfig dos2unix xorg -DOS2UNIX_GLOB= Makefile ResourcePtr.inl -USE_XORG= x11 xrandr -USE_GL= gl glu -USE_LDCONFIG= yes -USE_CXXSTD= c++98 -DESTDIRNAME= STAGEDIR - -WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} - -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -PORTDOCS= * - -PORTSCOUT= limit:[^c]$$ - -OPTIONS_DEFINE= DOCS - -post-extract: - @${RM} ${WRKSRC}/lib/* - @${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} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ - -.include <bsd.port.mk> diff --git a/devel/sfml1/distinfo b/devel/sfml1/distinfo deleted file mode 100644 index 65042a5c4cc2..000000000000 --- a/devel/sfml1/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (SFML-1.6-sdk-linux-32.tar.gz) = b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 -SIZE (SFML-1.6-sdk-linux-32.tar.gz) = 12937755 diff --git a/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl b/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl deleted file mode 100644 index e2923b8c4917..000000000000 --- a/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl +++ /dev/null @@ -1,10 +0,0 @@ ---- include/SFML/System/ResourcePtr.inl.orig 2010-01-27 16:53:54.000000000 +0300 -+++ include/SFML/System/ResourcePtr.inl 2015-03-27 15:46:53.809250000 +0300 -@@ -22,6 +22,7 @@ - // - //////////////////////////////////////////////////////////// - -+#include <cstddef> - - //////////////////////////////////////////////////////////// - /// Default constructor diff --git a/devel/sfml1/files/patch-src__SFML__Audio__Makefile b/devel/sfml1/files/patch-src__SFML__Audio__Makefile deleted file mode 100644 index f64ca2a4c4d1..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Audio__Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- src/SFML/Audio/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Audio/Makefile 2014-08-18 16:52:27.000000000 +0400 -@@ -8,7 +8,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-audio.so -+ LIB = libsfml1-audio.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -18,14 +18,14 @@ - libsfml-audio-s.a: $(OBJ) $(OBJVORBIS) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) - --libsfml-audio.so: $(OBJ) $(OBJVORBIS) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal -+libsfml1-audio.so: $(OBJ) $(OBJVORBIS) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - $(OBJVORBIS): %.o: %.c -- $(CC) -o $@ -c $< $(CFLAGSEXT) -+ $(CC) -o $@ -c $< $(CFLAGS) - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__Graphics__Makefile b/devel/sfml1/files/patch-src__SFML__Graphics__Makefile deleted file mode 100644 index e567ea54e24a..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Graphics__Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- src/SFML/Graphics/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Graphics/Makefile 2014-08-18 16:52:41.000000000 +0400 -@@ -16,7 +16,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-graphics.so -+ LIB = libsfml1-graphics.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -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 -lX11 -lGL -+libsfml1-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL) -+ $(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) -I/usr/include/freetype2 - - $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c -- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG -+ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__Makefile b/devel/sfml1/files/patch-src__SFML__Makefile deleted file mode 100644 index e135231d049f..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Makefile +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 - else -- DEBUGFLAGS = -O2 -DNDEBUG -+ DEBUGFLAGS = - endif - - ifeq ($(STATIC), no) -@@ -15,11 +15,11 @@ - LINKFLAGS = - endif - --export CC = gcc --export CPP = g++ --export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) --export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS) --export LDFLAGS = $(LINKFLAGS) -+export CC ?= gcc -+export CXX ?= g++ -+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.6 - export CP = cp -@@ -27,9 +27,9 @@ - export LNFLAGS = -s -f - export AR = ar - export ARFLAGS = rcs --export DESTDIR = /usr/local -+export DESTDIR = ${STAGEDIR}${PREFIX} - export DESTLIBDIR = $(DESTDIR)/lib --export DESTINCDIR = $(DESTDIR)/include -+export DESTINCDIR = $(DESTDIR)/include/SFML - - all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio - diff --git a/devel/sfml1/files/patch-src__SFML__Network__Makefile b/devel/sfml1/files/patch-src__SFML__Network__Makefile deleted file mode 100644 index 466a8280bcb2..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Network__Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/SFML/Network/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Network/Makefile 2014-08-18 16:53:09.000000000 +0400 -@@ -6,7 +6,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-network.so -+ LIB = libsfml1-network.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -16,11 +16,11 @@ - libsfml-network-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - --libsfml-network.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -+libsfml1-network.so: $(OBJ) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__System__Makefile b/devel/sfml1/files/patch-src__SFML__System__Makefile deleted file mode 100644 index fd2be586cb4c..000000000000 --- a/devel/sfml1/files/patch-src__SFML__System__Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/SFML/System/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/System/Makefile 2014-08-18 16:52:53.000000000 +0400 -@@ -6,7 +6,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-system.so -+ LIB = libsfml1-system.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -16,11 +16,11 @@ - libsfml-system-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - --libsfml-system.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread -+libsfml1-system.so: $(OBJ) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - diff --git a/devel/sfml1/files/patch-src__SFML__Window__Makefile b/devel/sfml1/files/patch-src__SFML__Window__Makefile deleted file mode 100644 index 6d3f8e272000..000000000000 --- a/devel/sfml1/files/patch-src__SFML__Window__Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/SFML/Window/Makefile.orig 2014-08-18 16:51:52.000000000 +0400 -+++ src/SFML/Window/Makefile 2014-08-18 16:53:01.000000000 +0400 -@@ -7,7 +7,7 @@ - LIBNAME = $(LIBPATH)/$(LIB) - INSTALL = - else -- LIB = libsfml-window.so -+ LIB = libsfml1-window.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) - endif -@@ -17,11 +17,11 @@ - libsfml-window-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - --libsfml-window.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL -+libsfml1-window.so: $(OBJ) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - diff --git a/devel/sfml1/pkg-descr b/devel/sfml1/pkg-descr deleted file mode 100644 index 1ff9a8306396..000000000000 --- a/devel/sfml1/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -SFML is a portable and easy to use multimedia API written in C++. -You can see it as a modern, object-oriented alternative to SDL. - -SFML is composed of several packages to perfectly suit your needs. -You can use SFML as a minimal windowing system to interface with -OpenGL, or as a fully-featured multimedia library for building games -or interactive programs. diff --git a/devel/sfml1/pkg-plist b/devel/sfml1/pkg-plist deleted file mode 100644 index 833c471316a9..000000000000 --- a/devel/sfml1/pkg-plist +++ /dev/null @@ -1,83 +0,0 @@ -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.6 -lib/libsfml1-graphics.so -lib/libsfml1-graphics.so.1.6 -lib/libsfml1-network.so -lib/libsfml1-network.so.1.6 -lib/libsfml1-system.so -lib/libsfml1-system.so.1.6 -lib/libsfml1-window.so -lib/libsfml1-window.so.1.6 |