36 files changed, 18 insertions, 62 deletions

diff --git a/devel/geany-plugin-addons/Makefile b/devel/geany-plugin-addons/Makefile
index eac4706994c7..3a10d1ccbc91 100644
--- a/devel/geany-plugin-addons/Makefile
+++ b/devel/geany-plugin-addons/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-codenav/Makefile b/devel/geany-plugin-codenav/Makefile
index f6816c8999ab..c67f49fbf7d8 100644
--- a/devel/geany-plugin-codenav/Makefile
+++ b/devel/geany-plugin-codenav/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-commander/Makefile b/devel/geany-plugin-commander/Makefile
index 4eb320fd6506..5426fe066039 100644
--- a/devel/geany-plugin-commander/Makefile
+++ b/devel/geany-plugin-commander/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-devhelp/Makefile b/devel/geany-plugin-devhelp/Makefile
index aa0ffec81558..ee19d3939d44 100644
--- a/devel/geany-plugin-devhelp/Makefile
+++ b/devel/geany-plugin-devhelp/Makefile
@@ -7,11 +7,10 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
-		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
+		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 
 USE_GNOME=	gconf2
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-doc/Makefile b/devel/geany-plugin-doc/Makefile
index a1a2b71688b3..f609d8c875c4 100644
--- a/devel/geany-plugin-doc/Makefile
+++ b/devel/geany-plugin-doc/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-extrasel/Makefile b/devel/geany-plugin-extrasel/Makefile
index 0d182f72a2bd..63e510ccd62a 100644
--- a/devel/geany-plugin-extrasel/Makefile
+++ b/devel/geany-plugin-extrasel/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-gendoc/Makefile b/devel/geany-plugin-gendoc/Makefile
index 08de667f0954..634b4af14d73 100644
--- a/devel/geany-plugin-gendoc/Makefile
+++ b/devel/geany-plugin-gendoc/Makefile
@@ -7,9 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	ctpl:${PORTSDIR}/textproc/ctpl
+LIB_DEPENDS=	libctpl.so:${PORTSDIR}/textproc/ctpl
 RUN_DEPENDS=	${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-geniuspaste/Makefile b/devel/geany-plugin-geniuspaste/Makefile
index c063dac87e2b..19cc5e172e41 100644
--- a/devel/geany-plugin-geniuspaste/Makefile
+++ b/devel/geany-plugin-geniuspaste/Makefile
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-gproject/Makefile b/devel/geany-plugin-gproject/Makefile
index 8b9c2ce4562b..bd492569804e 100644
--- a/devel/geany-plugin-gproject/Makefile
+++ b/devel/geany-plugin-gproject/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-insertnum/Makefile b/devel/geany-plugin-insertnum/Makefile
index 706b23d7b44d..4db7815710f4 100644
--- a/devel/geany-plugin-insertnum/Makefile
+++ b/devel/geany-plugin-insertnum/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-latex/Makefile b/devel/geany-plugin-latex/Makefile
index 0f689b86e523..b7170d1c2f68 100644
--- a/devel/geany-plugin-latex/Makefile
+++ b/devel/geany-plugin-latex/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-lipsum/Makefile b/devel/geany-plugin-lipsum/Makefile
index 8854cea282d6..bdc6d08345f7 100644
--- a/devel/geany-plugin-lipsum/Makefile
+++ b/devel/geany-plugin-lipsum/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-lua/Makefile b/devel/geany-plugin-lua/Makefile
index f654419e6957..f6834f5afd73 100644
--- a/devel/geany-plugin-lua/Makefile
+++ b/devel/geany-plugin-lua/Makefile
@@ -9,6 +9,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
 USE_LUA=	5.1
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-macro/Makefile b/devel/geany-plugin-macro/Makefile
index f817a3fd81d2..62ea8134ecb5 100644
--- a/devel/geany-plugin-macro/Makefile
+++ b/devel/geany-plugin-macro/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-miniscript/Makefile b/devel/geany-plugin-miniscript/Makefile
index 084518d68e3a..67d899121c1f 100644
--- a/devel/geany-plugin-miniscript/Makefile
+++ b/devel/geany-plugin-miniscript/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-multiterm/Makefile b/devel/geany-plugin-multiterm/Makefile
index 943723498e52..d9199a261d7c 100644
--- a/devel/geany-plugin-multiterm/Makefile
+++ b/devel/geany-plugin-multiterm/Makefile
@@ -10,6 +10,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 USE_GNOME=	vte
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-numberedbookmarks/Makefile b/devel/geany-plugin-numberedbookmarks/Makefile
index 22f30ff642ad..c9350af74b7d 100644
--- a/devel/geany-plugin-numberedbookmarks/Makefile
+++ b/devel/geany-plugin-numberedbookmarks/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-pg/Makefile b/devel/geany-plugin-pg/Makefile
index 75b7b6cfc793..9fa5e7ceb9ec 100644
--- a/devel/geany-plugin-pg/Makefile
+++ b/devel/geany-plugin-pg/Makefile
@@ -11,6 +11,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-pretty-printer/Makefile b/devel/geany-plugin-pretty-printer/Makefile
index fe4b4f2cc1d7..0dec8f097126 100644
--- a/devel/geany-plugin-pretty-printer/Makefile
+++ b/devel/geany-plugin-pretty-printer/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-prj/Makefile b/devel/geany-plugin-prj/Makefile
index 380b2bfe51ef..4e6157fd53fd 100644
--- a/devel/geany-plugin-prj/Makefile
+++ b/devel/geany-plugin-prj/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-scope/Makefile b/devel/geany-plugin-scope/Makefile
index a97e7f9aa209..ef995c081ae6 100644
--- a/devel/geany-plugin-scope/Makefile
+++ b/devel/geany-plugin-scope/Makefile
@@ -9,6 +9,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
 USE_GNOME=	vte
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-sendmail/Makefile b/devel/geany-plugin-sendmail/Makefile
index 5c38ed5f05d6..b168e0634086 100644
--- a/devel/geany-plugin-sendmail/Makefile
+++ b/devel/geany-plugin-sendmail/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-shiftcolumn/Makefile b/devel/geany-plugin-shiftcolumn/Makefile
index 3dfc16bffed0..83aa2f7cc3d8 100644
--- a/devel/geany-plugin-shiftcolumn/Makefile
+++ b/devel/geany-plugin-shiftcolumn/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-spellcheck/Makefile b/devel/geany-plugin-spellcheck/Makefile
index 097655e119e7..1b2d26b926e4 100644
--- a/devel/geany-plugin-spellcheck/Makefile
+++ b/devel/geany-plugin-spellcheck/Makefile
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-tableconvert/Makefile b/devel/geany-plugin-tableconvert/Makefile
index bdbed68719e3..607f9bbf8589 100644
--- a/devel/geany-plugin-tableconvert/Makefile
+++ b/devel/geany-plugin-tableconvert/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-treebrowser/Makefile b/devel/geany-plugin-treebrowser/Makefile
index 96541ab9c43e..71543c3b8eb3 100644
--- a/devel/geany-plugin-treebrowser/Makefile
+++ b/devel/geany-plugin-treebrowser/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-updatechecker/Makefile b/devel/geany-plugin-updatechecker/Makefile
index c572e1ce423f..2f934b4d23e7 100644
--- a/devel/geany-plugin-updatechecker/Makefile
+++ b/devel/geany-plugin-updatechecker/Makefile
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-vc/Makefile b/devel/geany-plugin-vc/Makefile
index 215df2e55da1..3c81b98e0c9e 100644
--- a/devel/geany-plugin-vc/Makefile
+++ b/devel/geany-plugin-vc/Makefile
@@ -9,17 +9,10 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
 OPTIONS_DEFINE=	GTKSPELL
 OPTIONS_DEFAULT=	GTKSPELL
+
 GTKSPELL_DESC=	Spell checking support via GtkSpell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_CONFIGURE_ENABLE=	gtkspell
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
-# bsd.port.options.mk is already included
-
-.if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	gtkspell:${PORTSDIR}/textproc/gtkspell
-CONFIGURE_ARGS+=	--enable-gtkspell
-.else
-CONFIGURE_ARGS+=	--disable-gtkspell
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-webhelper/Makefile b/devel/geany-plugin-webhelper/Makefile
index f19d457581b2..666b2b07c918 100644
--- a/devel/geany-plugin-webhelper/Makefile
+++ b/devel/geany-plugin-webhelper/Makefile
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-xmlsnippets/Makefile b/devel/geany-plugin-xmlsnippets/Makefile
index b72b30afddde..d87cdfb61cfe 100644
--- a/devel/geany-plugin-xmlsnippets/Makefile
+++ b/devel/geany-plugin-xmlsnippets/Makefile
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins-l10n/Makefile b/devel/geany-plugins-l10n/Makefile
index eaebb563436a..48cad1a590c5 100644
--- a/devel/geany-plugins-l10n/Makefile
+++ b/devel/geany-plugins-l10n/Makefile
@@ -9,6 +9,5 @@ COMMENT=	Localization messages for Geany plugins
 
 USES=		pathfix
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile
index 713fb6c91762..d22c371d8fe5 100644
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@@ -11,8 +11,9 @@ COMMENT=	Geany plugins (meta port)
 
 .MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/files/bsd.geany-plugins.mk"
 
 OPTIONS_DEFINE=		NLS
@@ -37,7 +38,4 @@ RUN_DEPENDS+=	${${opt}_DEP}
 . endif
 .endfor
 
-do-install:
-	${DO_NADA}
-
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index 9a45d7d96ea7..1ea2e4872a55 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -14,10 +14,9 @@ CONFLICTS_INSTALL=	geany-plugins-0.*
 EXTRA_PATCHES=  ${.CURDIR}/../../devel/geany-plugins/files/extrapatch-configure
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS+=	libtool
-USES+=		pkgconfig
+USES+=		gmake pkgconfig
 USE_GNOME+=	gtk20
 
 # geany-plugins-l10n is not a plugin, thus special treatment
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 8abe15fb63d6..8f25133974de 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -14,9 +14,8 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -24,9 +23,6 @@ OPTIONS_DEFINE=	VTE NLS DOCS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 VTE_DESC=	Embedded virtual terminal
 
-MAN1=		geany.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index bf0cd4c6a8f6..15e9d45c296b 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -45,6 +45,7 @@ lib/geany/saveactions.so
 lib/geany/splitwindow.la
 lib/geany/splitwindow.so
 libdata/pkgconfig/geany.pc
+man/man1/geany.1.gz
 share/applications/geany.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile
index 2d87a7ab6ac3..b2bb9215e6f4 100644
--- a/devel/qsvn/Makefile
+++ b/devel/qsvn/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.anrichter.net/projects/qsvn/chrome/site/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt based GUI frontend for Subversion
 
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
 
 USE_QT4=	gui sql moc_build uic_build rcc_build qmake_build
 USE_LDCONFIG=	yes
@@ -19,12 +19,11 @@ USES=		cmake
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 DESKTOP_ENTRIES="QSvn" "SVN client" "${PREFIX}/share/pixmaps/qsvn.png" \
-		"qsvn" "Development;RevisionControl;Qt;" false
+		"qsvn" "Development;RevisionControl;Qt;" true
 
 SVNQT_INCLUDE_DIR=	include/svnqt4
 PLIST_SUB=	SVNQT_INCLUDE_DIR="${SVNQT_INCLUDE_DIR}"
 
-NO_STAGE=	yes
 pre-configure:
 	${REINPLACE_CMD} -e 's,include/svnqt,${SVNQT_INCLUDE_DIR},g' \
 		${WRKSRC}/svnqt/CMakeLists.txt
@@ -32,6 +31,6 @@ pre-configure:
 		${WRKSRC}/svnqt/cmakemodules/FindSubversion.cmake
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/images/qsvn.png ${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/images/qsvn.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>