- Fix license

- Remove redundant --prefix argument to configure
- Switch to options helpers

x11/florence/Makefile

@@ -9,8 +9,8 @@ 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
 
@@ -19,13 +19,14 @@ 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
@@ -34,20 +35,15 @@ 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}
 

x11/florence/pkg-descr

@@ -7,4 +7,4 @@ 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/