Date: Mon, 2 Nov 2015 10:13:00 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400646 - in head/x11-toolkits/irrlicht: . files Message-ID: <201511021013.tA2AD0bu068359@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Nov 2 10:12:59 2015 New Revision: 400646 URL: https://svnweb.freebsd.org/changeset/ports/400646 Log: - Update to version 1.8.3 and convert to option helpers - Reindent EXAMPLEDIRS and other lines to avoid wrapping PR: 203329 Modified: head/x11-toolkits/irrlicht/Makefile head/x11-toolkits/irrlicht/distinfo head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile Modified: head/x11-toolkits/irrlicht/Makefile ============================================================================== --- head/x11-toolkits/irrlicht/Makefile Mon Nov 2 09:49:49 2015 (r400645) +++ head/x11-toolkits/irrlicht/Makefile Mon Nov 2 10:12:59 2015 (r400646) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= irrlicht -PORTVERSION= 1.8.1 -PORTREVISION= 2 +PORTVERSION= 1.8.3 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/ @@ -22,15 +21,18 @@ USE_XORG= x11 xxf86vm USE_LDCONFIG= yes MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER} +CFLAGS_amd64= -fPIC +CFLAGS_ia64= -fPIC + PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER} SUB_FILES= pkg-message BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht SHARED_LIB_VER= 1 -EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \ - 06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \ - 11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \ - Demo +EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement \ + 05.UserInterface 06.2DGraphics 07.Collision 08.SpecialFX \ + 09.Meshviewer 10.Shaders 11.PerPixelLighting \ + 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile Demo OPTIONS_DEFINE= DEBUG EXAMPLES @@ -38,12 +40,6 @@ DEBUG_MAKE_ENV_OFF= NDEBUG=1 BROKEN_sparc64= Does not compile -.include <bsd.port.options.mk> - -.if ${ARCH} == amd64 || ${ARCH} == ia64 -CFLAGS+= -fPIC -.endif - post-patch: @${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \ -e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \ @@ -54,18 +50,19 @@ post-patch: do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} - cd ${WRKSRC}/include && \ - ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/include/*.h \ + ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a \ + ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/lib/FreeBSD/libIrrlicht.so.${SHARED_LIB_VER} \ - ${STAGEDIR}${PREFIX}/lib && ${LN} -s libIrrlicht.so.${SHARED_LIB_VER} \ - ${STAGEDIR}${PREFIX}/lib/libIrrlicht.so - -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${EXAMPLEDIRS}" ${STAGEDIR}${EXAMPLESDIR} "( -name Makefile -or -name *\.cpp -or -name *\.h )" - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/media - cd ${WRKSRC}/media && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/media -.endif + ${STAGEDIR}${PREFIX}/lib + ${LN} -sf libIrrlicht.so.${SHARED_LIB_VER} \ + ${STAGEDIR}${PREFIX}/lib/libIrrlicht.so + +do-install-EXAMPLES-on: + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${EXAMPLEDIRS}" \ + ${STAGEDIR}${EXAMPLESDIR} \ + "( -name Makefile -or -name *\.cpp -or -name *\.h )" + cd ${WRKSRC} && ${COPYTREE_SHARE} media ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/x11-toolkits/irrlicht/distinfo ============================================================================== --- head/x11-toolkits/irrlicht/distinfo Mon Nov 2 09:49:49 2015 (r400645) +++ head/x11-toolkits/irrlicht/distinfo Mon Nov 2 10:12:59 2015 (r400646) @@ -1,2 +1,2 @@ -SHA256 (irrlicht-1.8.1.zip) = 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b -SIZE (irrlicht-1.8.1.zip) = 24167632 +SHA256 (irrlicht-1.8.3.zip) = 9e7be44277bf2004d73580a8585e7bd3c9ce9a3c801691e4f4aed030ac68931c +SIZE (irrlicht-1.8.3.zip) = 24069061 Modified: head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile ============================================================================== --- head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile Mon Nov 2 09:49:49 2015 (r400645) +++ head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile Mon Nov 2 10:12:59 2015 (r400646) @@ -1,14 +1,5 @@ --- source/Irrlicht/Makefile.orig 2014-10-18 07:47:20 UTC +++ source/Irrlicht/Makefile -@@ -2,7 +2,7 @@ - VERSION_MINOR = 8 - VERSION_RELEASE = 1 - # Irrlicht Engine 1.8.1 --# Makefile for Linux -+# Makefile for Linux/FreeBSD - # - # To use, just run: - # @@ -56,23 +56,20 @@ EXTRAOBJ = LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511021013.tA2AD0bu068359>