From 03cceed935615886af3d9551e9fb9b573ce3744a Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Thu, 14 Feb 2013 09:42:12 +0000 Subject: - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: devel) Approved by: portmgr --- devel/sfml/Makefile | 1 + devel/sfml/files/patch-src-SFML-Audio-Makefile | 36 ++++++------ devel/sfml/files/patch-src-SFML-Graphics-Makefile | 36 ++++++------ devel/sfml/files/patch-src-SFML-Makefile | 70 +++++++++++------------ devel/sfml/files/patch-src-SFML-Network-Makefile | 24 ++++---- devel/sfml/files/patch-src-SFML-System-Makefile | 28 ++++----- devel/sfml/files/patch-src-SFML-Window-Makefile | 24 ++++---- 7 files changed, 110 insertions(+), 109 deletions(-) (limited to 'devel/sfml') diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index 3c761cbe7163..42f1633c9ef6 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -25,6 +25,7 @@ USE_OPENAL= al USE_XORG= x11 xrandr USE_GL= gl glu USE_LDCONFIG= yes +USE_DOS2UNIX= Makefile MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} diff --git a/devel/sfml/files/patch-src-SFML-Audio-Makefile b/devel/sfml/files/patch-src-SFML-Audio-Makefile index f582c5fdcb51..7b5aa5389369 100644 --- a/devel/sfml/files/patch-src-SFML-Audio-Makefile +++ b/devel/sfml/files/patch-src-SFML-Audio-Makefile @@ -1,19 +1,19 @@ ---- 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 +--- 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 - + $(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 + diff --git a/devel/sfml/files/patch-src-SFML-Graphics-Makefile b/devel/sfml/files/patch-src-SFML-Graphics-Makefile index 40a80caa6645..69fcc9e6bc53 100644 --- a/devel/sfml/files/patch-src-SFML-Graphics-Makefile +++ b/devel/sfml/files/patch-src-SFML-Graphics-Makefile @@ -1,21 +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 @@ -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 - + 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 + diff --git a/devel/sfml/files/patch-src-SFML-Makefile b/devel/sfml/files/patch-src-SFML-Makefile index 3c765402c3ce..fff2516c153d 100644 --- a/devel/sfml/files/patch-src-SFML-Makefile +++ b/devel/sfml/files/patch-src-SFML-Makefile @@ -1,40 +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) + 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 + 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 = ${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 - + export LNFLAGS = -s -f + export AR = ar + export ARFLAGS = rcs +-export DESTDIR = /usr/local ++export DESTDIR = ${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/sfml/files/patch-src-SFML-Network-Makefile b/devel/sfml/files/patch-src-SFML-Network-Makefile index 17e30d21b567..041b37b664f4 100644 --- a/devel/sfml/files/patch-src-SFML-Network-Makefile +++ b/devel/sfml/files/patch-src-SFML-Network-Makefile @@ -1,15 +1,15 @@ --- 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 - + $(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 + diff --git a/devel/sfml/files/patch-src-SFML-System-Makefile b/devel/sfml/files/patch-src-SFML-System-Makefile index 6f05acbccc1f..ab836bf9d993 100644 --- a/devel/sfml/files/patch-src-SFML-System-Makefile +++ b/devel/sfml/files/patch-src-SFML-System-Makefile @@ -1,15 +1,15 @@ ---- 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 +--- 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_LIBS} - - $(OBJ): %.o: %.cpp -- $(CPP) -o $@ -c $< $(CFLAGS) -+ $(CXX) -o $@ -c $< $(CXXFLAGS) - - .PHONY: clean mrproper - + $(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 + diff --git a/devel/sfml/files/patch-src-SFML-Window-Makefile b/devel/sfml/files/patch-src-SFML-Window-Makefile index f3b76a19cbfb..7b95a5cc1319 100644 --- a/devel/sfml/files/patch-src-SFML-Window-Makefile +++ b/devel/sfml/files/patch-src-SFML-Window-Makefile @@ -1,15 +1,15 @@ --- 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 - + $(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 + -- cgit v1.2.3