diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 7d54322284b7..ba247c91c313 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	liblastfm
 PORTVERSION=	1.0.6
-#PORTREVISION=	0
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,35 +16,20 @@ LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 
 GH_ACCOUNT=	lastfm
 GH_COMMIT=	5826fe6
-GH_PROJECT=	liblastfm
-GH_TAGNAME=	${PORTVERSION}
-
-MAKE_JOBS_UNSAFE=	yes
-
-OPTIONS_DEFINE=		FINGERPRINT TESTS
-FINGERPRINT_DESC=	Build the lastfm-fingerprint library
-TESTS_DESC=		Build liblastfm tests
-OPTIONS_DEFAULT=	FINGERPRINT
 
 USES=		cmake pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 USE_QT4=	dbus moc_build rcc_build network qmake_build qtestlib sql xml
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFINGERPRINT}
-CMAKE_ARGS+=	-DBUILD_FINGERPRINT:BOOL=ON
-PLIST_SUB+=	FINGERPRINT=""
-.else
-CMAKE_ARGS+=	-DBUILD_FINGERPRINT:BOOL=OFF
-PLIST_SUB+=	FINGERPRINT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTESTS}
-CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=ON
-.else
-CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=OFF
-.endif
+OPTIONS_DEFINE=		FINGERPRINT TESTS
+OPTIONS_DEFAULT=	FINGERPRINT
+OPTIONS_SUB=		yes
+FINGERPRINT_DESC=	Build the lastfm-fingerprint library
+FINGERPRINT_CMAKE_ON=	-DBUILD_FINGERPRINT:BOOL=ON
+FINGERPRINT_CMAKE_OFF=	-DBUILD_FINGERPRINT:BOOL=OFF
+TESTS_DESC=		Build liblastfm tests
+TESTS_CMAKE_ON=		-DBUILD_TESTS:BOOL=ON
+TESTS_CMAKE_OFF=	-DBUILD_TESTS:BOOL=OFF
 
 .include <bsd.port.mk>