Index: head/x11/florence/Makefile
===================================================================
--- head/x11/florence/Makefile	(revision 418991)
+++ head/x11/florence/Makefile	(revision 418992)
@@ -1,54 +1,50 @@
 # Created by: Kris Moore <kmoore@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	florence
 PORTVERSION=	0.6.3
 CATEGORIES=	x11
 MASTER_SITES=	SF/florence/florence/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible scalable virtual keyboard
 
-LICENSE=	GPLv2 GFDL
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+ GFDL
+LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		gmake iconv libtool pathfix pkgconfig tar:bzip2
 USE_XORG=	xtst xext
 USE_GNOME=	gtk30 cairo intlhack gnomedocutils librsvg2
 USE_GSTREAMER1=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix="${LOCALBASE}" \
-		--disable-static
+CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 GLIB_SCHEMAS=	org.florence.gschema.xml
 INSTALL_TARGET=	install-strip
 
+MAKE_JOBS_UNSAFE=	yes
+
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
-MAKE_JOBS_UNSAFE=	yes
-
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^Categories=.*|Categories=Application;Accessibility;System;|' \
 		${WRKSRC}/data/florence.desktop.in.in
 
-.if ! ${PORT_OPTIONS:MNLS}
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|^ALL_LINGUAS.*|ALL_LINGUAS =|' \
 		${WRKSRC}/po/Makefile.in.in
-.endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/x11/florence/pkg-descr
===================================================================
--- head/x11/florence/pkg-descr	(revision 418991)
+++ head/x11/florence/pkg-descr	(revision 418992)
@@ -1,10 +1,10 @@
 Florence is an extensible scalable virtual keyboard for GNOME. You need it if
 you can't use a real keyboard either because of a handicap, disease,
 broken keyboard or tablet PC but you can use a pointing device. If you can't
 use a pointing device, there is gok: http://www.gok.ca/
 Florence stays out of your way when you don't need it.
 It appears on the screen only when you need it.
 There is an auto-click functionality To help people having difficulties to use
 the click button.
 
-WWW: http://florence.sourceforge.net
+WWW: http://florence.sourceforge.net/