Index: head/devel/sfml1/Makefile =================================================================== --- head/devel/sfml1/Makefile (revision 365310) +++ head/devel/sfml1/Makefile (revision 365311) @@ -1,52 +1,47 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= sfml PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 PKGNAMESUFFIX= 1 MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 USES= gmake openal:al pkgconfig dos2unix DOS2UNIX_GLOB= Makefile USE_XORG= x11 xrandr USE_GL= gl glu USE_LDCONFIG= yes DESTDIRNAME= STAGEDIR WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= * PORTSCOUT= limit:[^c]$$ OPTIONS_DEFINE= DOCS post-extract: @${RM} -f ${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} -.for lib in audio graphics network system window - ${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 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include Index: head/devel/sfml1/files/patch-src-SFML-Window-Makefile =================================================================== --- head/devel/sfml1/files/patch-src-SFML-Window-Makefile (revision 365310) +++ head/devel/sfml1/files/patch-src-SFML-Window-Makefile (nonexistent) @@ -1,15 +0,0 @@ ---- 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 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - - libsfml-window.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL -+ $(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 - Property changes on: head/devel/sfml1/files/patch-src-SFML-Window-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile =================================================================== --- head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile (revision 365310) +++ head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile (nonexistent) @@ -1,21 +0,0 @@ ---- 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 -lX11 -lGL -+libsfml-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 $< $(CFLAGS) -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 - Property changes on: head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src-SFML-Makefile =================================================================== --- head/devel/sfml1/files/patch-src-SFML-Makefile (revision 365310) +++ head/devel/sfml1/files/patch-src-SFML-Makefile (nonexistent) @@ -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 - Property changes on: head/devel/sfml1/files/patch-src-SFML-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src-SFML-Audio-Makefile =================================================================== --- head/devel/sfml1/files/patch-src-SFML-Audio-Makefile (revision 365310) +++ head/devel/sfml1/files/patch-src-SFML-Audio-Makefile (nonexistent) @@ -1,19 +0,0 @@ ---- src/SFML/Audio/Makefile.orig 2010-01-27 15:00:19.000000000 +0100 -+++ src/SFML/Audio/Makefile 2013-02-14 09:39:53.000000000 +0100 -@@ -19,13 +19,13 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) - - libsfml-audio.so: $(OBJ) $(OBJVORBIS) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal -+ $(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 - Property changes on: head/devel/sfml1/files/patch-src-SFML-Audio-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src-SFML-Network-Makefile =================================================================== --- head/devel/sfml1/files/patch-src-SFML-Network-Makefile (revision 365310) +++ head/devel/sfml1/files/patch-src-SFML-Network-Makefile (nonexistent) @@ -1,15 +0,0 @@ ---- 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 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - - libsfml-network.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - Property changes on: head/devel/sfml1/files/patch-src-SFML-Network-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src-SFML-System-Makefile =================================================================== --- head/devel/sfml1/files/patch-src-SFML-System-Makefile (revision 365310) +++ head/devel/sfml1/files/patch-src-SFML-System-Makefile (nonexistent) @@ -1,15 +0,0 @@ ---- src/SFML/System/Makefile.orig 2013-02-08 16:07:21.000000000 +0100 -+++ src/SFML/System/Makefile 2013-02-08 16:07:57.000000000 +0100 -@@ -17,10 +17,10 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) - - libsfml-system.so: $(OBJ) -- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -pthread - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - Property changes on: head/devel/sfml1/files/patch-src-SFML-System-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src__SFML__Audio__Makefile =================================================================== --- head/devel/sfml1/files/patch-src__SFML__Audio__Makefile (nonexistent) +++ head/devel/sfml1/files/patch-src__SFML__Audio__Makefile (revision 365311) @@ -0,0 +1,30 @@ +--- 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 + Property changes on: head/devel/sfml1/files/patch-src__SFML__Audio__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile =================================================================== --- head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile (nonexistent) +++ head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile (revision 365311) @@ -0,0 +1,30 @@ +--- 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 $< $(CFLAGS) -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 + Property changes on: head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src__SFML__Makefile =================================================================== --- head/devel/sfml1/files/patch-src__SFML__Makefile (nonexistent) +++ head/devel/sfml1/files/patch-src__SFML__Makefile (revision 365311) @@ -0,0 +1,40 @@ +--- 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 + Property changes on: head/devel/sfml1/files/patch-src__SFML__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src__SFML__Network__Makefile =================================================================== --- head/devel/sfml1/files/patch-src__SFML__Network__Makefile (nonexistent) +++ head/devel/sfml1/files/patch-src__SFML__Network__Makefile (revision 365311) @@ -0,0 +1,26 @@ +--- 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 + Property changes on: head/devel/sfml1/files/patch-src__SFML__Network__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src__SFML__System__Makefile =================================================================== --- head/devel/sfml1/files/patch-src__SFML__System__Makefile (nonexistent) +++ head/devel/sfml1/files/patch-src__SFML__System__Makefile (revision 365311) @@ -0,0 +1,26 @@ +--- 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) -pthread + + $(OBJ): %.o: %.cpp +- $(CPP) -o $@ -c $< $(CFLAGS) ++ $(CXX) -o $@ -c $< $(CXXFLAGS) + + .PHONY: clean mrproper + Property changes on: head/devel/sfml1/files/patch-src__SFML__System__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/sfml1/files/patch-src__SFML__Window__Makefile =================================================================== --- head/devel/sfml1/files/patch-src__SFML__Window__Makefile (nonexistent) +++ head/devel/sfml1/files/patch-src__SFML__Window__Makefile (revision 365311) @@ -0,0 +1,26 @@ +--- 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 + Property changes on: head/devel/sfml1/files/patch-src__SFML__Window__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/sfml1/pkg-plist =================================================================== --- head/devel/sfml1/pkg-plist (revision 365310) +++ head/devel/sfml1/pkg-plist (revision 365311) @@ -1,98 +1,93 @@ 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 @dirrm include/SFML1/Audio @dirrm include/SFML1/Graphics @dirrm include/SFML1/Network/Unix @dirrm include/SFML1/Network/Win32 @dirrm include/SFML1/Network @dirrm include/SFML1/System/Unix @dirrm include/SFML1/System/Win32 @dirrm include/SFML1/System @dirrm include/SFML1/Window @dirrm include/SFML1