Date: Mon, 18 Aug 2014 13:37:35 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365311 - in head/devel/sfml1: . files Message-ID: <201408181337.s7IDbZ3Y083977@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Aug 18 13:37:34 2014 New Revision: 365311 URL: http://svnweb.freebsd.org/changeset/ports/365311 QAT: https://qat.redports.org/buildarchive/r365311/ Log: - Use canonical patch filenames - Fix SONAMEs and simplify libraries installation Added: head/devel/sfml1/files/patch-src__SFML__Audio__Makefile - copied, changed from r365260, head/devel/sfml1/files/patch-src-SFML-Audio-Makefile head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile - copied, changed from r365260, head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile head/devel/sfml1/files/patch-src__SFML__Makefile - copied unchanged from r365260, head/devel/sfml1/files/patch-src-SFML-Makefile head/devel/sfml1/files/patch-src__SFML__Network__Makefile - copied, changed from r365260, head/devel/sfml1/files/patch-src-SFML-Network-Makefile head/devel/sfml1/files/patch-src__SFML__System__Makefile - copied, changed from r365260, head/devel/sfml1/files/patch-src-SFML-System-Makefile head/devel/sfml1/files/patch-src__SFML__Window__Makefile - copied, changed from r365260, head/devel/sfml1/files/patch-src-SFML-Window-Makefile Deleted: head/devel/sfml1/files/patch-src-SFML-Audio-Makefile head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile head/devel/sfml1/files/patch-src-SFML-Makefile head/devel/sfml1/files/patch-src-SFML-Network-Makefile head/devel/sfml1/files/patch-src-SFML-System-Makefile head/devel/sfml1/files/patch-src-SFML-Window-Makefile Modified: head/devel/sfml1/Makefile head/devel/sfml1/pkg-plist Modified: head/devel/sfml1/Makefile ============================================================================== --- head/devel/sfml1/Makefile Mon Aug 18 13:32:14 2014 (r365310) +++ head/devel/sfml1/Makefile Mon Aug 18 13:37:34 2014 (r365311) @@ -3,6 +3,7 @@ PORTNAME= sfml PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 @@ -39,13 +40,7 @@ post-extract: 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}/ Copied and modified: head/devel/sfml1/files/patch-src__SFML__Audio__Makefile (from r365260, head/devel/sfml1/files/patch-src-SFML-Audio-Makefile) ============================================================================== --- head/devel/sfml1/files/patch-src-SFML-Audio-Makefile Sun Aug 17 23:17:46 2014 (r365260, copy source) +++ head/devel/sfml1/files/patch-src__SFML__Audio__Makefile Mon Aug 18 13:37:34 2014 (r365311) @@ -1,10 +1,21 @@ ---- 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 @@ +--- 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) +-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 Copied and modified: head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile (from r365260, head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile) ============================================================================== --- head/devel/sfml1/files/patch-src-SFML-Graphics-Makefile Sun Aug 17 23:17:46 2014 (r365260, copy source) +++ head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile Mon Aug 18 13:37:34 2014 (r365311) @@ -1,12 +1,21 @@ ---- 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 +--- 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 -+libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL) ++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 Copied: head/devel/sfml1/files/patch-src__SFML__Makefile (from r365260, head/devel/sfml1/files/patch-src-SFML-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sfml1/files/patch-src__SFML__Makefile Mon Aug 18 13:37:34 2014 (r365311, copy of r365260, head/devel/sfml1/files/patch-src-SFML-Makefile) @@ -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 + Copied and modified: head/devel/sfml1/files/patch-src__SFML__Network__Makefile (from r365260, head/devel/sfml1/files/patch-src-SFML-Network-Makefile) ============================================================================== --- head/devel/sfml1/files/patch-src-SFML-Network-Makefile Sun Aug 17 23:17:46 2014 (r365260, copy source) +++ head/devel/sfml1/files/patch-src__SFML__Network__Makefile Mon Aug 18 13:37:34 2014 (r365311) @@ -1,10 +1,21 @@ ---- 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 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) +-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 Copied and modified: head/devel/sfml1/files/patch-src__SFML__System__Makefile (from r365260, head/devel/sfml1/files/patch-src-SFML-System-Makefile) ============================================================================== --- head/devel/sfml1/files/patch-src-SFML-System-Makefile Sun Aug 17 23:17:46 2014 (r365260, copy source) +++ head/devel/sfml1/files/patch-src__SFML__System__Makefile Mon Aug 18 13:37:34 2014 (r365311) @@ -1,10 +1,21 @@ ---- 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 @@ +--- 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) +-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 Copied and modified: head/devel/sfml1/files/patch-src__SFML__Window__Makefile (from r365260, head/devel/sfml1/files/patch-src-SFML-Window-Makefile) ============================================================================== --- head/devel/sfml1/files/patch-src-SFML-Window-Makefile Sun Aug 17 23:17:46 2014 (r365260, copy source) +++ head/devel/sfml1/files/patch-src__SFML__Window__Makefile Mon Aug 18 13:37:34 2014 (r365311) @@ -1,10 +1,21 @@ ---- 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 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) +-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 Modified: head/devel/sfml1/pkg-plist ============================================================================== --- head/devel/sfml1/pkg-plist Mon Aug 18 13:32:14 2014 (r365310) +++ head/devel/sfml1/pkg-plist Mon Aug 18 13:37:34 2014 (r365311) @@ -72,19 +72,14 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181337.s7IDbZ3Y083977>