3 files changed, 31 insertions, 22 deletions

diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index be9fe80e2624..9c656eed6a8f 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	florence
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.6.2
 CATEGORIES=	x11
 MASTER_SITES=	SF/florence/florence/${PORTVERSION}/
 
@@ -14,15 +13,14 @@ LICENSE=	GPLv2 GFDL
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-BUILD_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake iconv pathfix pkgconfig tar:bzip2
+USES=		gmake iconv libtool pathfix pkgconfig tar:bzip2
 USE_XORG=	xtst xext
 USE_GNOME=	gtk30 cairo intlhack gnomedocutils librsvg2
-USE_GSTREAMER=	yes
+USE_GSTREAMER1=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--prefix="${LOCALBASE}" \
+		--disable-static
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 GLIB_SCHEMAS=	org.florence.gschema.xml
@@ -32,6 +30,7 @@ PORTDOCS=	AUTHORS ChangeLog NEWS README
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
+NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
@@ -46,6 +45,8 @@ post-patch:
 .endif
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libflorence-1.0.so.1
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/x11/florence/distinfo b/x11/florence/distinfo
index be00595a1ba0..e43c41436034 100644
--- a/x11/florence/distinfo
+++ b/x11/florence/distinfo
@@ -1,2 +1,2 @@
-SHA256 (florence-0.6.0.tar.bz2) = d2d74a923591e1a6db412058877dbf9ef839712af56e41fd41cb8eefbef1f60e
-SIZE (florence-0.6.0.tar.bz2) = 843826
+SHA256 (florence-0.6.2.tar.bz2) = 185ce805be5e5ef7cb42cd1f5abc93ab30b949651f04d37457e40022f98802f3
+SIZE (florence-0.6.2.tar.bz2) = 1073200
diff --git a/x11/florence/pkg-plist b/x11/florence/pkg-plist
index a9914463a16f..cbc96cba0503 100644
--- a/x11/florence/pkg-plist
+++ b/x11/florence/pkg-plist
@@ -1,4 +1,9 @@
 bin/florence
+include/florence-1.0/florence.h
+lib/libflorence-1.0.so
+lib/libflorence-1.0.so.1
+lib/libflorence-1.0.so.1.0.0
+libdata/pkgconfig/florence-1.0.pc
 man/man1/florence.1.gz
 man/man1/florence_applet.1.gz
 share/applications/florence.desktop
@@ -65,6 +70,7 @@ share/applications/florence.desktop
 %%DATADIR%%/styles/default/sounds/return_release.ogg
 %%DATADIR%%/styles/default/sounds/sounds.xml
 %%DATADIR%%/styles/default/symbols.xml
+%%DATADIR%%/styles/flat/florence.style
 %%DATADIR%%/styles/hard/default.svg
 %%DATADIR%%/styles/hard/florence.defs
 %%DATADIR%%/styles/hard/florence.style
@@ -164,20 +170,22 @@ share/omf/florence/florence-C.omf
 share/omf/florence/florence-fr.omf
 share/omf/florence/florence-ru.omf
 share/pixmaps/florence.svg
-@dirrm share/omf/florence
-@dirrm share/gnome/help/florence/ru/figures
-@dirrm share/gnome/help/florence/ru
-@dirrm share/gnome/help/florence/fr/figures
-@dirrm share/gnome/help/florence/fr
-@dirrm share/gnome/help/florence/C/figures
-@dirrm share/gnome/help/florence/C
-@dirrm share/gnome/help/florence
-@dirrm %%DATADIR%%/svg11
-@dirrm %%DATADIR%%/styles/hard
+@dirrm include/florence-1.0
+@dirrm %%DATADIR%%/layouts
+@dirrm %%DATADIR%%/relaxng
+@dirrm %%DATADIR%%/styles/bright
 @dirrm %%DATADIR%%/styles/default/sounds
 @dirrm %%DATADIR%%/styles/default
-@dirrm %%DATADIR%%/styles/bright
+@dirrm %%DATADIR%%/styles/flat
+@dirrm %%DATADIR%%/styles/hard
 @dirrm %%DATADIR%%/styles
-@dirrm %%DATADIR%%/relaxng
-@dirrm %%DATADIR%%/layouts
+@dirrm %%DATADIR%%/svg11
 @dirrm %%DATADIR%%
+@dirrm share/gnome/help/florence/C/figures
+@dirrm share/gnome/help/florence/C
+@dirrm share/gnome/help/florence/fr/figures
+@dirrm share/gnome/help/florence/fr
+@dirrm share/gnome/help/florence/ru/figures
+@dirrm share/gnome/help/florence/ru
+@dirrm share/gnome/help/florence
+@dirrm share/omf/florence