diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index 5e9640171458..8420a2b236a3 100644
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@@ -3,10 +3,9 @@
 
 PORTNAME=	lingot
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	coder@tuxfamily.org
 COMMENT=	LINGOT is a musical instrument tuner
@@ -14,35 +13,23 @@ COMMENT=	LINGOT is a musical instrument tuner
 LICENSE=	GPLv2
 
 USE_GNOME=	gtk20 libglade2
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig
 
+CONFIGURE_ENV=	DATADIRNAME="share"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	JACK ALSA
+OPTIONS_DEFINE=		DOCS
+OPTIONS_GROUP=		SOUND
+OPTIONS_GROUP_SOUND=	ALSA JACK
 OPTIONS_DEFAULT=	JACK
 
-.include <bsd.port.options.mk>
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_CONFIGURE_ENABLE=	alsa
 
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-CONFIGURE_ARGS+=--enable-jack
-.else
-CONFIGURE_ARGS+=--disable-jack
-.endif
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
-CONFIGURE_ARGS+=--enable-alsa
-.else
-CONFIGURE_ARGS+=--disable-alsa
-.endif
-
-.if ${OSVERSION} < 802502 || (${OSVERSION} > 900000 && ${OSVERSION} < 900027)
-EXTRA_PATCHES+=	${FILESDIR}/extra-lingot-config-scale.h
-.endif
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+			libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+JACK_CONFIGURE_ENABLE=	jack
 
 .include <bsd.port.mk>
diff --git a/audio/lingot/files/extra-lingot-config-scale.h b/audio/lingot/files/extra-lingot-config-scale.h
deleted file mode 100644
index 98c8ad8cb1c6..000000000000
--- a/audio/lingot/files/extra-lingot-config-scale.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lingot-config-scale.h.orig	2011-10-18 06:29:18.000000000 +0200
-+++ src/lingot-config-scale.h	2011-10-18 06:30:42.000000000 +0200
-@@ -23,6 +23,11 @@
- #ifndef LINGOT_CONFIG_SCALE_H_
- #define LINGOT_CONFIG_SCALE_H_
- 
-+/* FreeBSD patch for log2 */
-+#ifdef __FreeBSD__
-+#define log2(x) (log(x) / M_LN2)
-+#endif /* __FreeBSD__ */
-+
- #include "lingot-defs.h"
- 
- typedef struct _LingotScale LingotScale;
diff --git a/audio/lingot/files/patch-Makefile.in b/audio/lingot/files/patch-Makefile.in
new file mode 100644
index 000000000000..a51ec2fa1fce
--- /dev/null
+++ b/audio/lingot/files/patch-Makefile.in
@@ -0,0 +1,32 @@
+--- ./Makefile.in.orig	2011-08-22 10:10:09.000000000 -0400
++++ ./Makefile.in	2014-06-18 23:12:35.000000000 -0400
+@@ -291,21 +291,21 @@
+ lingotdocdir = ${docdir}
+ lingotdoc_DATA = \
+ 	README\
+-	COPYING\
+ 	AUTHORS\
+ 	ChangeLog\
+ 	INSTALL\
+ 	NEWS\
+-	TODO\
+ 	THANKS\
+-	MAINTAINERS\
+-	src/lingot-background.xpm\
+-	src/lingot-logo.xpm\
++	MAINTAINERS
++EXTRA_DIST = \
++	COPYING\
++	TODO\
+ 	intltool-extract.in\
+ 	intltool-merge.in\
+-	intltool-update.in
+-
+-EXTRA_DIST = $(lingotdoc_DATA)
++	intltool-update.in\
++	src/lingot-background.xpm\
++	src/lingot-logo.xpm\
++	$(lingotdoc_DATA)
+ CLEANFILES = \
+ 	intltool-extract\
+ 	intltool-merge\
diff --git a/audio/lingot/pkg-plist b/audio/lingot/pkg-plist
index b78c09848904..0ecb10bb93bc 100644
--- a/audio/lingot/pkg-plist
+++ b/audio/lingot/pkg-plist
@@ -1,54 +1,26 @@
 bin/lingot
-lib/locale/ca/LC_MESSAGES/lingot.mo
-lib/locale/cs/LC_MESSAGES/lingot.mo
-lib/locale/de/LC_MESSAGES/lingot.mo
-lib/locale/es/LC_MESSAGES/lingot.mo
-lib/locale/fr/LC_MESSAGES/lingot.mo
-lib/locale/gl/LC_MESSAGES/lingot.mo
-lib/locale/it/LC_MESSAGES/lingot.mo
-lib/locale/pt_BR/LC_MESSAGES/lingot.mo
-lib/locale/sv/LC_MESSAGES/lingot.mo
-lib/locale/zh_CN/LC_MESSAGES/lingot.mo
 share/applications/lingot.desktop
-share/doc/lingot/AUTHORS
-share/doc/lingot/COPYING
-share/doc/lingot/ChangeLog
-share/doc/lingot/INSTALL
-share/doc/lingot/MAINTAINERS
-share/doc/lingot/NEWS
-share/doc/lingot/README
-share/doc/lingot/THANKS
-share/doc/lingot/TODO
-share/doc/lingot/intltool-extract.in
-share/doc/lingot/intltool-merge.in
-share/doc/lingot/intltool-update.in
-share/doc/lingot/lingot-background.xpm
-share/doc/lingot/lingot-logo.xpm
-share/lingot/glade/lingot-config-dialog.glade
-share/lingot/glade/lingot-mainframe.glade
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%DATADIR%%/glade/lingot-config-dialog.glade
+%%DATADIR%%/glade/lingot-mainframe.glade
+share/locale/ca/LC_MESSAGES/lingot.mo
+share/locale/cs/LC_MESSAGES/lingot.mo
+share/locale/de/LC_MESSAGES/lingot.mo
+share/locale/es/LC_MESSAGES/lingot.mo
+share/locale/fr/LC_MESSAGES/lingot.mo
+share/locale/gl/LC_MESSAGES/lingot.mo
+share/locale/it/LC_MESSAGES/lingot.mo
+share/locale/pt_BR/LC_MESSAGES/lingot.mo
+share/locale/sv/LC_MESSAGES/lingot.mo
+share/locale/zh_CN/LC_MESSAGES/lingot.mo
 share/pixmaps/lingot/lingot-icon.svg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm share/pixmaps/lingot
-@dirrm share/lingot/glade
-@dirrm share/lingot
-@dirrm share/doc/lingot
-@dirrm lib/locale/zh_CN/LC_MESSAGES
-@dirrm lib/locale/zh_CN
-@dirrm lib/locale/sv/LC_MESSAGES
-@dirrm lib/locale/sv
-@dirrm lib/locale/pt_BR/LC_MESSAGES
-@dirrm lib/locale/pt_BR
-@dirrm lib/locale/it/LC_MESSAGES
-@dirrm lib/locale/it
-@dirrm lib/locale/gl/LC_MESSAGES
-@dirrm lib/locale/gl
-@dirrm lib/locale/fr/LC_MESSAGES
-@dirrm lib/locale/fr
-@dirrm lib/locale/es/LC_MESSAGES
-@dirrm lib/locale/es
-@dirrm lib/locale/de/LC_MESSAGES
-@dirrm lib/locale/de
-@dirrm lib/locale/cs/LC_MESSAGES
-@dirrm lib/locale/cs
-@dirrm lib/locale/ca/LC_MESSAGES
-@dirrm lib/locale/ca
-@dirrm lib/locale