Index: head/devel/sfml1/Makefile =================================================================== --- head/devel/sfml1/Makefile (revision 509616) +++ head/devel/sfml1/Makefile (revision 509617) @@ -1,49 +1,52 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= sfml PORTVERSION= 1.6 PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF PKGNAMESUFFIX= 1 DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.txt LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 -USES= gmake jpeg openal:al pkgconfig dos2unix +USES= gmake jpeg gl openal:al pkgconfig dos2unix 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 - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${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 Index: head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile =================================================================== --- head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile (revision 509616) +++ head/devel/sfml1/files/patch-src__SFML__Graphics__Makefile (revision 509617) @@ -1,30 +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 ++ $(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