From owner-svn-ports-head@FreeBSD.ORG Fri Oct 25 16:15:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BDC5B47E; Fri, 25 Oct 2013 16:15:38 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9C3A7212D; Fri, 25 Oct 2013 16:15:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PGFcQ2030259; Fri, 25 Oct 2013 16:15:38 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PGFbXK030252; Fri, 25 Oct 2013 16:15:37 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201310251615.r9PGFbXK030252@svn.freebsd.org> From: Marcus von Appen Date: Fri, 25 Oct 2013 16:15:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331607 - in head: audio/sdl2_mixer devel/sdl20 devel/sdl20/files graphics/sdl2_image graphics/sdl2_ttf net/sdl2_net X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2013 16:15:38 -0000 Author: mva Date: Fri Oct 25 16:15:36 2013 New Revision: 331607 URL: http://svnweb.freebsd.org/changeset/ports/331607 Log: - Update devel/sdl20 to version 2.0.1 - Bump PORTREVISIONs for SDL2-related ports to chase the changed SDL2 shlib version - Enable staging support for the SDL2 ports - Switch to new LIB_DEPENDS format for the SDL2 ports - Add LICENSE to the SDL2 ports - Use gmake USES for the SDL2 ports Deleted: head/devel/sdl20/files/ Modified: head/audio/sdl2_mixer/Makefile head/devel/sdl20/Makefile head/devel/sdl20/distinfo head/devel/sdl20/pkg-plist head/graphics/sdl2_image/Makefile head/graphics/sdl2_ttf/Makefile head/net/sdl2_net/Makefile Modified: head/audio/sdl2_mixer/Makefile ============================================================================== --- head/audio/sdl2_mixer/Makefile Fri Oct 25 16:09:04 2013 (r331606) +++ head/audio/sdl2_mixer/Makefile Fri Oct 25 16:15:36 2013 (r331607) @@ -2,7 +2,7 @@ PORTNAME= sdl2_mixer PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL2_mixer-${PORTVERSION} @@ -13,7 +13,6 @@ COMMENT= A sample multi-channel audio mi LICENSE= ZLIB USES= gmake pathfix pkgconfig -NO_STAGE= yes USE_SDL= sdl2 GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -37,14 +36,18 @@ MIKMOD_CONFIGURE_ENABLE= music-mod-mikmo MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= music-mod-modplug -FLAC_LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_ENABLE= music-flac -FLUIDSYNTH_LIB_DEPENDS= fluidsynth:${PORTSDIR}/audio/fluidsynth +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth FLUIDSYNTH_CONFIGURE_ON= --enable-music-midi --enable-music-midi-fluidsynth FLUIDSYNTH_CONFIGURE_OFF= --disable-music-midi --disable-music-midi-fluidsynth -VORBIS_LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= music-ogg +post-patch: + @${REINPLACE_CMD} -e 's|$(prefix)/libdata/pkgconfig|$(DESTDIR)$(prefix)/libdata/pkgconfig|' \ + ${WRKSRC}/Makefile.in + .include Modified: head/devel/sdl20/Makefile ============================================================================== --- head/devel/sdl20/Makefile Fri Oct 25 16:09:04 2013 (r331606) +++ head/devel/sdl20/Makefile Fri Oct 25 16:15:36 2013 (r331607) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sdl2 -PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTVERSION= 2.0.1 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} @@ -10,6 +9,8 @@ DISTNAME= SDL2-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= Cross-platform multimedia development API +LICENSE= ZLIB + USES= pathfix cmake:outsource iconv USE_LDCONFIG= yes @@ -52,7 +53,6 @@ SDL_VIDEO_DESC= Eanble the SDL Video su VIDEO_OPENGL_DESC= OpenGL rendering support VIDEO_X11_DESC= X11 rendering support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MALSA} @@ -60,7 +60,7 @@ NO_STAGE= yes IGNORE= option ALSA requires SDL_AUDIO .endif CMAKE_ARGS+= -DALSA:BOOL=ON -DALSA_SHARED:BOOL=ON -LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib +LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib .else CMAKE_ARGS+= -DALSA:BOOL=OFF .endif @@ -100,7 +100,7 @@ CMAKE_ARGS+= -DMMX:BOOL=OFF -D3DNOW:BOOL IGNORE= option NAS requires SDL_AUDIO .endif CMAKE_ARGS+= -DNAS:BOOL=ON -LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas +LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas .else CMAKE_ARGS+= -DNAS:BOOL=OFF .endif Modified: head/devel/sdl20/distinfo ============================================================================== --- head/devel/sdl20/distinfo Fri Oct 25 16:09:04 2013 (r331606) +++ head/devel/sdl20/distinfo Fri Oct 25 16:15:36 2013 (r331607) @@ -1,2 +1,2 @@ -SHA256 (SDL2-2.0.0.tar.gz) = 6f6ac8153d90e06a118474d5400624ae82b3d3e080915505db27cebc52b27178 -SIZE (SDL2-2.0.0.tar.gz) = 3623960 +SHA256 (SDL2-2.0.1.tar.gz) = 0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0 +SIZE (SDL2-2.0.1.tar.gz) = 3660224 Modified: head/devel/sdl20/pkg-plist ============================================================================== --- head/devel/sdl20/pkg-plist Fri Oct 25 16:09:04 2013 (r331606) +++ head/devel/sdl20/pkg-plist Fri Oct 25 16:15:36 2013 (r331607) @@ -20,6 +20,7 @@ include/SDL2/SDL_cpuinfo.h include/SDL2/SDL_endian.h include/SDL2/SDL_error.h include/SDL2/SDL_events.h +include/SDL2/SDL_filesystem.h include/SDL2/SDL_gamecontroller.h include/SDL2/SDL_gesture.h include/SDL2/SDL_haptic.h @@ -75,8 +76,8 @@ share/aclocal/sdl2.m4 lib/libSDL2.a lib/libSDL2.so lib/libSDL2-2.0.so -lib/libSDL2-2.0.so.0 -lib/libSDL2-2.0.so.0.0.0 +lib/libSDL2-2.0.so.1 +lib/libSDL2-2.0.so.1.0.1 lib/libSDL2main.a libdata/pkgconfig/sdl2.pc @dirrm include/SDL2 Modified: head/graphics/sdl2_image/Makefile ============================================================================== --- head/graphics/sdl2_image/Makefile Fri Oct 25 16:09:04 2013 (r331606) +++ head/graphics/sdl2_image/Makefile Fri Oct 25 16:15:36 2013 (r331607) @@ -2,7 +2,7 @@ PORTNAME= sdl2_image PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL2_image-${PORTVERSION} @@ -10,19 +10,19 @@ DISTNAME= SDL2_image-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= A simple library to load images of various formats as SDL surfaces -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - tiff:${PORTSDIR}/graphics/tiff \ - webp:${PORTSDIR}/graphics/webp +LICENSE= ZLIB -USES= pkgconfig:build pathfix +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libwebp.so:${PORTSDIR}/graphics/webp + +USES= pkgconfig:build pathfix gmake USE_AUTOTOOLS= libtool USE_SDL= sdl2 -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lm USE_LDCONFIG= yes -NO_STAGE= yes .include Modified: head/graphics/sdl2_ttf/Makefile ============================================================================== --- head/graphics/sdl2_ttf/Makefile Fri Oct 25 16:09:04 2013 (r331606) +++ head/graphics/sdl2_ttf/Makefile Fri Oct 25 16:15:36 2013 (r331607) @@ -2,6 +2,7 @@ PORTNAME= sdl2_ttf PORTVERSION= 2.0.12 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ DISTNAME= SDL2_ttf-${PORTVERSION} @@ -9,12 +10,13 @@ DISTNAME= SDL2_ttf-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= A library to use TrueType fonts to render text in SDL applications -LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 +LICENSE= ZLIB -USES= pkgconfig:build pathfix +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 + +USES= pkgconfig:build pathfix gmake USE_SDL= sdl2 USE_AUTOTOOLS= libtool -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -22,7 +24,6 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= OPENGL -NO_STAGE= yes .include .if ${PORT_OPTIONS:MOPENGL} @@ -30,7 +31,7 @@ USE_GL= yes .endif post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/.libs/glfont ${PREFIX}/bin/sdl2-glfont - ${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont ${PREFIX}/bin/sdl2-showfont + ${INSTALL_PROGRAM} ${WRKSRC}/.libs/glfont ${STAGEDIR}${PREFIX}/bin/sdl2-glfont + ${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont ${STAGEDIR}${PREFIX}/bin/sdl2-showfont .include Modified: head/net/sdl2_net/Makefile ============================================================================== --- head/net/sdl2_net/Makefile Fri Oct 25 16:09:04 2013 (r331606) +++ head/net/sdl2_net/Makefile Fri Oct 25 16:15:36 2013 (r331607) @@ -2,6 +2,7 @@ PORTNAME= sdl2_net PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.libsdl.org/projects/SDL_net/release/ DISTNAME= SDL2_net-${PORTVERSION} @@ -9,14 +10,14 @@ DISTNAME= SDL2_net-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= A small sample cross-platform networking library +LICENSE= ZLIB + USE_AUTOTOOLS= libtool USE_SDL= sdl2 -USES= pathfix pkgconfig:build -USE_GMAKE= yes +USES= pathfix pkgconfig:build gmake GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS+=--disable-gui -NO_STAGE= yes .include