Date: Tue, 2 Oct 2012 10:06:27 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305153 - in head/devel: . clanlib1 clanlib1/files Message-ID: <201210021006.q92A6Rop017676@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Tue Oct 2 10:06:27 2012 New Revision: 305153 URL: http://svn.freebsd.org/changeset/ports/305153 Log: - Repocopy devel/clanlib -> devel/clanlib1 - Update to 1.0.0 PR: ports/171333 Submitted by: Chris Petrik <c.petrik.sosa@gmail.com> Approved by: makc (mentor) Added: head/devel/clanlib1/ - copied from r305152, head/devel/clanlib/ head/devel/clanlib1/files/patch-Sources__Core__System__Unix__init_linux.cpp (contents, props changed) head/devel/clanlib1/files/patch-Sources__Display__Providers__png_provider_generic.cpp (contents, props changed) Deleted: head/devel/clanlib1/files/patch-Sources-Core-System-Unix_init_linux.cpp head/devel/clanlib1/files/patch-Sources-Display-Providers-png_provider_generic.cpp head/devel/clanlib1/files/patch-Sources-GL-GLX-display-window-opengl.cpp head/devel/clanlib1/files/patch-Sources-GL-GLX-input-device-linuxjoystick.h head/devel/clanlib1/files/patch-Sources-GL-GLX-input_device_linuxevent.cpp head/devel/clanlib1/files/patch-Sources-GL-GLX-input_device_linuxjoystick.cpp Modified: head/devel/Makefile head/devel/clanlib1/Makefile head/devel/clanlib1/distinfo (contents, props changed) head/devel/clanlib1/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue Oct 2 08:21:22 2012 (r305152) +++ head/devel/Makefile Tue Oct 2 10:06:27 2012 (r305153) @@ -218,6 +218,7 @@ SUBDIR += cl-uffi SUBDIR += cl-uffi-sbcl SUBDIR += clanlib + SUBDIR += clanlib1 SUBDIR += clewn SUBDIR += clig SUBDIR += clint Modified: head/devel/clanlib1/Makefile ============================================================================== --- head/devel/clanlib/Makefile Tue Oct 2 08:21:22 2012 (r305152) +++ head/devel/clanlib1/Makefile Tue Oct 2 10:06:27 2012 (r305153) @@ -2,48 +2,58 @@ # $FreeBSD$ PORTNAME= clanlib -PORTVERSION= 0.8.1 -PORTREVISION= 12 -PORTEPOCH= 1 +PORTVERSION= 1.0.0 CATEGORIES= devel -MASTER_SITES= http://www.clanlib.org/download/releases-0.8/ +MASTER_SITES= http://www.clanlib.org/download/releases-1.0/ DISTNAME= ClanLib-${PORTVERSION} EXTRACT_SUFX= .tgz MAINTAINER= c.petrik.sosa@gmail.com COMMENT= Cross-platform game SDK -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LICENSE= ZLIB +LICENSE_GROUPS= FSF OSI COPYFREE +LICENSE_NAME= ZLIB license +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} + +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ mikmod:${PORTSDIR}/audio/libmikmod \ vorbis:${PORTSDIR}/audio/libvorbis -WRKSRC= ${WRKDIR}/ClanLib-${PORTVERSION} -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -USE_AUTOTOOLS= libtool -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs +LATEST_LINK= ${PORTNAME}1 + USE_GMAKE= yes -USE_XORG= x11 xmu xi +USE_AUTOTOOLS= libtool +USE_XORG= x11 xi USE_GNOME= gnomehack USE_LDCONFIG= yes USE_SDL= gfx USE_GL= yes USE_PKGCONFIG= yes +MAKE_JOBS_SAFE= yes -PLIST_SUB+= VER=${PORTVERSION:R} +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs \ + --enable-clanDisplay \ + --enable-clanGL \ + --enable-clanSDL \ + --enable-clanSound \ + --enable-clanNetwork \ + --enable-clanGUI \ + --enable-clanMikMod \ + --enable-clanVorbis \ + --enable-getaddr -.include <bsd.port.pre.mk> +PLIST_SUB+= VER=${PORTVERSION:R} post-patch: @${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|SDL/SDL|SDL|g' - @${REINPLACE_CMD} -e 's|(CLvoid)|()|' \ - ${WRKSRC}/Sources/API/GL/opengl_wrap.h - @${REINPLACE_CMD} -e 's|-lasound||' \ - ${WRKSRC}/Sources/Sound/Makefile.in @${REINPLACE_CMD} -e 's|@perl_exec@|${PERL}|g' \ ${WRKSRC}/Documentation/Utilities/webbuilder.pl.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/clanlib1/distinfo ============================================================================== --- head/devel/clanlib/distinfo Tue Oct 2 08:21:22 2012 (r305152) +++ head/devel/clanlib1/distinfo Tue Oct 2 10:06:27 2012 (r305153) @@ -1,2 +1,2 @@ -SHA256 (ClanLib-0.8.1.tgz) = 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 -SIZE (ClanLib-0.8.1.tgz) = 7629019 +SHA256 (ClanLib-1.0.0.tgz) = 2a296c30be30b42866666a2d43815c78345c7d78ef2126e2dc1694405dfd67f9 +SIZE (ClanLib-1.0.0.tgz) = 7535910 Added: head/devel/clanlib1/files/patch-Sources__Core__System__Unix__init_linux.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/clanlib1/files/patch-Sources__Core__System__Unix__init_linux.cpp Tue Oct 2 10:06:27 2012 (r305153) @@ -0,0 +1,11 @@ +--- ./Sources/Core/System/Unix/init_linux.cpp.orig 2012-09-26 07:30:30.000000000 -0400 ++++ ./Sources/Core/System/Unix/init_linux.cpp 2012-09-26 07:29:01.000000000 -0400 +@@ -131,7 +131,7 @@ + + #else + #ifndef PROC_EXE_PATH +-#define PROC_EXE_PATH "/proc/self/exe" ++#define PROC_EXE_PATH "/proc/curproc/file" + #endif + int size; + struct stat sb; Added: head/devel/clanlib1/files/patch-Sources__Display__Providers__png_provider_generic.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/clanlib1/files/patch-Sources__Display__Providers__png_provider_generic.cpp Tue Oct 2 10:06:27 2012 (r305153) @@ -0,0 +1,11 @@ +--- ./Sources/Display/Providers/png_provider_generic.cpp.orig 2012-09-26 07:31:33.000000000 -0400 ++++ ./Sources/Display/Providers/png_provider_generic.cpp 2012-09-26 07:32:16.000000000 -0400 +@@ -107,7 +107,7 @@ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + cl_assert(false); + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + cl_assert(false); Modified: head/devel/clanlib1/pkg-plist ============================================================================== --- head/devel/clanlib/pkg-plist Tue Oct 2 08:21:22 2012 (r305152) +++ head/devel/clanlib1/pkg-plist Tue Oct 2 10:06:27 2012 (r305153) @@ -99,8 +99,8 @@ include/ClanLib-%%VER%%/ClanLib/Display/ include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_provider.h include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_provider_bitmap.h include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_provider_file.h -include/ClanLib-%%VER%%/ClanLib/Display/Providers/dc_buffer.h include/ClanLib-%%VER%%/ClanLib/Display/Providers/bmp_provider.h +include/ClanLib-%%VER%%/ClanLib/Display/Providers/dc_buffer.h include/ClanLib-%%VER%%/ClanLib/Display/Providers/jpeg_provider.h include/ClanLib-%%VER%%/ClanLib/Display/Providers/pcx_provider.h include/ClanLib-%%VER%%/ClanLib/Display/Providers/png_provider.h @@ -288,66 +288,54 @@ include/ClanLib-%%VER%%/ClanLib/sdl.h include/ClanLib-%%VER%%/ClanLib/signals.h include/ClanLib-%%VER%%/ClanLib/sound.h include/ClanLib-%%VER%%/ClanLib/vorbis.h -lib/libclanApp-%%VER%%.so -lib/libclanApp-%%VER%%.so.1 lib/libclanApp.a lib/libclanApp.la lib/libclanApp.so -lib/libclanCore-%%VER%%.so -lib/libclanCore-%%VER%%.so.1 +lib/libclanApp.so.1 lib/libclanCore.a lib/libclanCore.la lib/libclanCore.so -lib/libclanDisplay-%%VER%%.so -lib/libclanDisplay-%%VER%%.so.1 +lib/libclanCore.so.1 lib/libclanDisplay.a lib/libclanDisplay.la lib/libclanDisplay.so -lib/libclanGL-%%VER%%.so -lib/libclanGL-%%VER%%.so.1 +lib/libclanDisplay.so.1 lib/libclanGL.a lib/libclanGL.la lib/libclanGL.so -lib/libclanGUI-%%VER%%.so -lib/libclanGUI-%%VER%%.so.1 +lib/libclanGL.so.1 lib/libclanGUI.a lib/libclanGUI.la lib/libclanGUI.so -lib/libclanGUIStyleSilver-%%VER%%.so -lib/libclanGUIStyleSilver-%%VER%%.so.1 +lib/libclanGUI.so.1 lib/libclanGUIStyleSilver.a lib/libclanGUIStyleSilver.la lib/libclanGUIStyleSilver.so -lib/libclanMikMod-%%VER%%.so -lib/libclanMikMod-%%VER%%.so.1 +lib/libclanGUIStyleSilver.so.1 lib/libclanMikMod.a lib/libclanMikMod.la lib/libclanMikMod.so -lib/libclanNetwork-%%VER%%.so -lib/libclanNetwork-%%VER%%.so.1 +lib/libclanMikMod.so.1 lib/libclanNetwork.a lib/libclanNetwork.la lib/libclanNetwork.so -lib/libclanSDL-%%VER%%.so -lib/libclanSDL-%%VER%%.so.1 +lib/libclanNetwork.so.1 lib/libclanSDL.a lib/libclanSDL.la lib/libclanSDL.so -lib/libclanSignals-%%VER%%.so -lib/libclanSignals-%%VER%%.so.1 +lib/libclanSDL.so.1 lib/libclanSignals.a lib/libclanSignals.la lib/libclanSignals.so -lib/libclanSound-%%VER%%.so -lib/libclanSound-%%VER%%.so.1 +lib/libclanSignals.so.1 lib/libclanSound.a lib/libclanSound.la lib/libclanSound.so -lib/libclanVorbis-%%VER%%.so -lib/libclanVorbis-%%VER%%.so.1 +lib/libclanSound.so.1 lib/libclanVorbis.a lib/libclanVorbis.la lib/libclanVorbis.so +lib/libclanVorbis.so.1 libdata/pkgconfig/clanApp-%%VER%%.pc libdata/pkgconfig/clanCore-%%VER%%.pc libdata/pkgconfig/clanDisplay-%%VER%%.pc @@ -360,31 +348,31 @@ libdata/pkgconfig/clanSDL-%%VER%%.pc libdata/pkgconfig/clanSignals-%%VER%%.pc libdata/pkgconfig/clanSound-%%VER%%.pc libdata/pkgconfig/clanVorbis-%%VER%%.pc -@dirrm include/ClanLib-%%VER%%/ClanLib/Application -@dirrm include/ClanLib-%%VER%%/ClanLib/Core/IOData -@dirrm include/ClanLib-%%VER%%/ClanLib/Core/Math -@dirrm include/ClanLib-%%VER%%/ClanLib/Core/Resources -@dirrm include/ClanLib-%%VER%%/ClanLib/Core/System -@dirrm include/ClanLib-%%VER%%/ClanLib/Core/XML -@dirrm include/ClanLib-%%VER%%/ClanLib/Core -@dirrm include/ClanLib-%%VER%%/ClanLib/Display/Collision -@dirrm include/ClanLib-%%VER%%/ClanLib/Display/Providers -@dirrm include/ClanLib-%%VER%%/ClanLib/Display -@dirrm include/ClanLib-%%VER%%/ClanLib/GL -@dirrm include/ClanLib-%%VER%%/ClanLib/GUI -@dirrm include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver -@dirrm include/ClanLib-%%VER%%/ClanLib/MikMod -@dirrm include/ClanLib-%%VER%%/ClanLib/Network/IRC -@dirrm include/ClanLib-%%VER%%/ClanLib/Network/NetObjects -@dirrm include/ClanLib-%%VER%%/ClanLib/Network/NetSession -@dirrm include/ClanLib-%%VER%%/ClanLib/Network/NetVariables -@dirrm include/ClanLib-%%VER%%/ClanLib/Network/Socket -@dirrm include/ClanLib-%%VER%%/ClanLib/Network -@dirrm include/ClanLib-%%VER%%/ClanLib/SDL -@dirrm include/ClanLib-%%VER%%/ClanLib/Signals -@dirrm include/ClanLib-%%VER%%/ClanLib/Sound/SoundFilters +@dirrm include/ClanLib-%%VER%%/ClanLib/Vorbis @dirrm include/ClanLib-%%VER%%/ClanLib/Sound/SoundProviders +@dirrm include/ClanLib-%%VER%%/ClanLib/Sound/SoundFilters @dirrm include/ClanLib-%%VER%%/ClanLib/Sound -@dirrm include/ClanLib-%%VER%%/ClanLib/Vorbis +@dirrm include/ClanLib-%%VER%%/ClanLib/Signals +@dirrm include/ClanLib-%%VER%%/ClanLib/SDL +@dirrm include/ClanLib-%%VER%%/ClanLib/Network/Socket +@dirrm include/ClanLib-%%VER%%/ClanLib/Network/NetVariables +@dirrm include/ClanLib-%%VER%%/ClanLib/Network/NetSession +@dirrm include/ClanLib-%%VER%%/ClanLib/Network/NetObjects +@dirrm include/ClanLib-%%VER%%/ClanLib/Network/IRC +@dirrm include/ClanLib-%%VER%%/ClanLib/Network +@dirrm include/ClanLib-%%VER%%/ClanLib/MikMod +@dirrm include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver +@dirrm include/ClanLib-%%VER%%/ClanLib/GUI +@dirrm include/ClanLib-%%VER%%/ClanLib/GL +@dirrm include/ClanLib-%%VER%%/ClanLib/Display/Providers +@dirrm include/ClanLib-%%VER%%/ClanLib/Display/Collision +@dirrm include/ClanLib-%%VER%%/ClanLib/Display +@dirrm include/ClanLib-%%VER%%/ClanLib/Core/XML +@dirrm include/ClanLib-%%VER%%/ClanLib/Core/System +@dirrm include/ClanLib-%%VER%%/ClanLib/Core/Resources +@dirrm include/ClanLib-%%VER%%/ClanLib/Core/Math +@dirrm include/ClanLib-%%VER%%/ClanLib/Core/IOData +@dirrm include/ClanLib-%%VER%%/ClanLib/Core +@dirrm include/ClanLib-%%VER%%/ClanLib/Application @dirrm include/ClanLib-%%VER%%/ClanLib @dirrm include/ClanLib-%%VER%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210021006.q92A6Rop017676>