Index: graphics/libprojectm/Makefile
===================================================================
--- graphics/libprojectm/Makefile
+++ graphics/libprojectm/Makefile
@@ -1,36 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	libprojectM
-PORTVERSION=	2.0.1
-PORTREVISION=	5
+DISTVERSION=	2.1.0
 CATEGORIES=	graphics audio
 MASTER_SITES=	SF/${PORTNAME:tl:S/lib//}/${PORTVERSION}/
-DISTNAME=	${PORTNAME:S/lib//}-${DISTVERSION}-Source
+DISTNAME=	${PORTNAME:S/lib//}-complete-${DISTVERSION}-Source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Awesome music visualiser
 
 LICENSE=	LGPL21+
+LICENSE_FILE=	${CMAKE_SOURCE_PATH}/COPYING
 
 LIB_DEPENDS=	libftgl.so:graphics/ftgl \
 		libfreetype.so:print/freetype2
 
-USES=		cmake localbase:ldflags
-CMAKE_ARGS=	-DUSE_OPENMP=OFF # openmp breaks build on 11.x
-USE_GL=		glew
+USES=		cmake:outsource localbase:ldflags
+USE_GL=		gl glew glu
 USE_LDCONFIG=	yes
 
-post-patch:
-# Install config.inp.sample instead of overwriting user's file.
-# Needs to be specific enough not to rename config.inp.in too!
-# Also correct pkgconfig destination dir -- fiddly
-	@${REINPLACE_CMD} -e 's/config.inp\([\" ]\)/config.inp.sample\1/' \
-			-e 's#\(/lib\)[^}]*}\(/pkgconfig\)#\1data\2#' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's#/usr/X11R6#${LOCALBASE}#' \
-		${WRKSRC}/cmake/FindFreetype2.cmake
-# Fix empty libdir in pkgconfig file to stop vlc complaining
-	@${REINPLACE_CMD} -e 's#^\(libdir=\).*#\1${PREFIX}/lib#' \
-		${WRKSRC}/${PORTNAME}.pc.in
+CMAKE_SOURCE_PATH=	${WRKSRC}/src/libprojectM
+CMAKE_ARGS=	-DUSE_OPENMP=OFF # openmp breaks build on 11.x
+PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 .include <bsd.port.mk>
Index: graphics/libprojectm/distinfo
===================================================================
--- graphics/libprojectm/distinfo
+++ graphics/libprojectm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (projectM-2.0.1-Source.tar.gz) = c305182dfc8b7f87b82a146af6cf50a982e7c9c647877a0559dfef4b11dacb93
-SIZE (projectM-2.0.1-Source.tar.gz) = 865784
+TIMESTAMP = 1511075040
+SHA256 (projectM-complete-2.1.0-Source.tar.gz) = 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee
+SIZE (projectM-complete-2.1.0-Source.tar.gz) = 31130351
Index: graphics/libprojectm/files/patch-Renderer_TextureManager.cpp
===================================================================
--- graphics/libprojectm/files/patch-Renderer_TextureManager.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Renderer/TextureManager.cpp.orig	2009-12-06 02:42:51.000000000 +0100
-+++ Renderer/TextureManager.cpp
-@@ -25,6 +25,7 @@
- #ifdef MACOS
- #include <dirent.h>
- #endif
-+#include <sys/types.h>
- #include "TextureManager.hpp"
- #include "Common.hpp"
- #include "IdleTextures.hpp"
Index: graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake
===================================================================
--- graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindFreetype2.cmake.orig	2013-12-24 19:02:55.000000000 +0100
-+++ cmake/FindFreetype2.cmake	2013-12-24 19:03:21.000000000 +0100
-@@ -67,7 +67,7 @@
-       NO_DEFAULT_PATH
- )
- 
--FIND_PATH(FREETYPE2_FT2BUILD ft2build.h
-+FIND_PATH(FREETYPE2_FT2BUILD freetype2/ft2build.h
-        ${ADDITIONAL_INCLUDE_PATH}
-       /usr/include
-       /usr/X11/include
Index: graphics/libprojectm/files/patch-src_libprojectM_CMakeLists.txt
===================================================================
--- /dev/null
+++ graphics/libprojectm/files/patch-src_libprojectM_CMakeLists.txt
@@ -0,0 +1,42 @@
+--- src/libprojectM/CMakeLists.txt.orig	2012-05-20 03:43:26 UTC
++++ src/libprojectM/CMakeLists.txt
+@@ -199,7 +199,6 @@ if(BUILD_PROJECTM_STATIC)
+ 				${GLEW_LIBRARY}
+ 				${FTGL_LINK_TARGETS}
+ 				${MATH_LIBRARIES}
+-				dl
+ 				${OPENGL_LIBRARIES}
+ 	)
+ else(BUILD_PROJECTM_STATIC)
+@@ -210,7 +209,6 @@ else(BUILD_PROJECTM_STATIC)
+ 				${GLEW_LIBRARY}
+ 				${FTGL_LINK_TARGETS}
+ 				${MATH_LIBRARIES}
+-				dl
+ 				${OPENGL_LIBRARIES}
+ 	)
+ endif(BUILD_PROJECTM_STATIC)
+@@ -221,10 +219,13 @@ ADD_DEFINITIONS(-DprojectM_FONT_MENU="\\
+ ADD_DEFINITIONS(-DprojectM_FONT_TITLE="\\\"${projectM_FONT_TITLE}\\\"")
+ 
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc" @ONLY)
+-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY)
++# Install config.inp.sample instead of overwriting user's file.
++# Needs to be specific enough not to rename config.inp.in too!
++# Also correct pkgconfig destination dir -- fiddly
++CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp.sample" @ONLY)
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/Vera.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
+ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf")
+@@ -235,6 +236,6 @@ FILE(GLOB presets "presets/*.milk" "pres
+ INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
+ INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp.sample DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
+ INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
+ INSTALL(TARGETS projectM DESTINATION lib)
Index: graphics/libprojectm/files/patch-src_libprojectM_NativePresetFactory_CMakeLists.txt
===================================================================
--- /dev/null
+++ graphics/libprojectm/files/patch-src_libprojectM_NativePresetFactory_CMakeLists.txt
@@ -0,0 +1,17 @@
+--- src/libprojectM/NativePresetFactory/CMakeLists.txt.orig	2012-05-20 03:43:26 UTC
++++ src/libprojectM/NativePresetFactory/CMakeLists.txt
+@@ -5,7 +5,7 @@ SET(NativePresetFactory_SOURCES NativePr
+ IF(NOT MSVC)
+ 	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ ENDIF(NOT MSVC)
+-find_library(DL_LIBRARIES dl)
++#find_library(DL_LIBRARIES dl)
+ 
+ if(MSVC)
+ 	SET (MATH_LIBRARIES )
+@@ -15,4 +15,4 @@ endif(MSVC)
+ 
+ INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR})
+ ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES})
+-TARGET_LINK_LIBRARIES(NativePresetFactory Renderer ${MATH_LIBRARIES} ${DL_LIBRARIES})
++TARGET_LINK_LIBRARIES(NativePresetFactory Renderer ${MATH_LIBRARIES})
Index: graphics/libprojectm/pkg-plist
===================================================================
--- graphics/libprojectm/pkg-plist
+++ graphics/libprojectm/pkg-plist
@@ -6,7 +6,7 @@
 include/libprojectM/projectM.hpp
 lib/libprojectM.so
 lib/libprojectM.so.2
-lib/libprojectM.so.2.00
+lib/libprojectM.so.%%SHLIB_VER%%
 libdata/pkgconfig/libprojectM.pc
 @sample share/projectM/config.inp.sample
 share/projectM/fonts/Vera.ttf