- Change maintainer email to @FreeBSD.org

- Use the new format for LIB_DEPENDS
- USES gmake instead of USE_GMAKE
- Support STAGEDIR

Approved by:	pawel / wg (mentors, implicit)

x11/florence/Makefile

@@ -6,24 +6,23 @@ PORTVERSION=	0.6.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/florence/florence/${PORTVERSION}/
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Extensible scalable virtual keyboard
 
 LICENSE=	GPLv2 GFDL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 BUILD_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
-USES=		desktop-file-utils iconv pathfix pkgconfig
+USES=		desktop-file-utils gmake iconv pathfix pkgconfig
 USE_XORG=	xtst xext
 USE_GNOME=	gtk30 cairo intlhack gnomedocutils librsvg2
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${LOCALBASE}
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 GLIB_SCHEMAS=	org.florence.gschema.xml
@@ -37,7 +36,6 @@ OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -50,9 +48,7 @@ post-patch:
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

x11/florence/pkg-plist

@@ -1,4 +1,6 @@
 bin/florence
+man/man1/florence.1.gz
+man/man1/florence_applet.1.gz
 share/applications/florence.desktop
 %%DATADIR%%/florence.conf
 %%DATADIR%%/florence.css