Update to 0.5.0 add DOCS and NLS options

Approved by:	tabthorpe
Differential Revision:	https://reviews.freebsd.org/D5530

4 files changed, 120 insertions, 47 deletions

diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index 64344945fc1..571dbd17071 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -2,31 +2,53 @@
 # $FreeBSD$
 
 PORTNAME=	deforaos-browser
-PORTVERSION=	0.4.13
+PORTVERSION=	0.5.0
 CATEGORIES=	x11-fm
-MASTER_SITES=	http://www.defora.org/os/download/download/4310/
+MASTER_SITES=	http://www.defora.org/os/download/download/4418/
 DISTNAME=	Browser-${PORTVERSION}
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	DeforaOS desktop file browser
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
 		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
 		libXrandr.so:${PORTSDIR}/x11/libXrandr
 
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=		gettext
+DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
+    ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
 USE_GNOME=	gtk20
-USES=		desktop-file-utils gettext pkgconfig
+USES=		desktop-file-utils pkgconfig
+USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
-
 MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
 		${WRKSRC}/data/pkgconfig.sh
+	${REINPLACE_CMD} 's|-Wl,-pie||g' \
+		${WRKSRC}/tests/Makefile \
+		${WRKSRC}/tools/Makefile \
+		${WRKSRC}/src/Makefile
+
+post-patch-DOCS-off:
+	${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+	${REINPLACE_CMD} 's|include po src|include src|' \
+		${WRKSRC}/Makefile
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
+		${STAGEDIR}${PREFIX}/lib/Desktop/widget/browser.so \
+		${STAGEDIR}${PREFIX}/lib/Browser/plugins/* \
+		${STAGEDIR}${PREFIX}/lib/libBrowser.so.0.0
 
 .include <bsd.port.mk>
diff --git a/x11-fm/deforaos-browser/distinfo b/x11-fm/deforaos-browser/distinfo
index d671d680c4a..954a16b90c1 100644
--- a/x11-fm/deforaos-browser/distinfo
+++ b/x11-fm/deforaos-browser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Browser-0.4.13.tar.gz) = 7d8fa6c0f0b59c322d26033d6ebc4b644ad3211108078f10eef4ece36dd00446
-SIZE (Browser-0.4.13.tar.gz) = 129587
+SHA256 (Browser-0.5.0.tar.gz) = 188181174c25a417f2678de245a4a38489ee0cc43505375005e6f650cd2949e1
+SIZE (Browser-0.5.0.tar.gz) = 160871
diff --git a/x11-fm/deforaos-browser/files/patch-doc__Makefile b/x11-fm/deforaos-browser/files/patch-doc__Makefile
index 1773939ae4c..fe72a3f46cc 100644
--- a/x11-fm/deforaos-browser/files/patch-doc__Makefile
+++ b/x11-fm/deforaos-browser/files/patch-doc__Makefile
@@ -1,32 +1,74 @@
---- ./doc/Makefile.orig	2012-10-14 18:55:31.000000000 +0200
-+++ ./doc/Makefile	2012-12-19 02:27:58.521485272 +0100
+--- doc/Makefile.orig	2016-03-01 12:30:35.743108000 +0100
++++ doc/Makefile	2016-03-01 12:32:36.527634000 +0100
 @@ -1,4 +1,4 @@
--TARGETS	= browser.1 browser.html copy.1 copy.html delete.1 delete.html desktop.1 desktop.html desktopctl.1 desktopctl.html move.1 move.html open.1 open.html properties.1 properties.html view.1 view.html
-+TARGETS	= browser.1 copy.1 delete.1 desktop.1 desktopctl.1 move.1 open.1 properties.1 view.1
+-TARGETS	= $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)view.1 $(OBJDIR)view.html
++TARGETS	= $(OBJDIR)browser.1 $(OBJDIR)copy.1 $(OBJDIR)delete.1 $(OBJDIR)desktop.1 $(OBJDIR)desktopctl.1 $(OBJDIR)move.1 $(OBJDIR)open.1 $(OBJDIR)properties.1 $(OBJDIR)view.1
+ OBJDIR	=
  PREFIX	= /usr/local
  DESTDIR	=
- RM	?= rm -f
-@@ -71,23 +71,14 @@
+@@ -67,65 +67,38 @@
+ clean:
+ 	$(RM) -- $(browser.1_OBJS) $(browser.html_OBJS) $(copy.1_OBJS) $(copy.html_OBJS) $(delete.1_OBJS) $(delete.html_OBJS) $(desktop.1_OBJS) $(desktop.html_OBJS) $(desktopctl.1_OBJS) $(desktopctl.html_OBJS) $(move.1_OBJS) $(move.html_OBJS) $(open.1_OBJS) $(open.html_OBJS) $(properties.1_OBJS) $(properties.html_OBJS) $(view.1_OBJS) $(view.html_OBJS)
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)browser.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)browser.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)copy.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)copy.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)delete.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)delete.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktop.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktop.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktopctl.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)desktopctl.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)move.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)move.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)open.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)open.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)properties.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)properties.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)view.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)view.html"
+ 
+ distclean: clean
+ 	$(RM) -- $(TARGETS)
  
  install: $(TARGETS)
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "browser.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "browser.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "copy.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "copy.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "delete.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "delete.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktop.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktop.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktopctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktopctl.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "move.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "move.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "open.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "open.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "properties.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "properties.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "view.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "view.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)delete.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)delete.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.html"
  
  uninstall:
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.html"
+ 
+ .PHONY: all clean distclean install uninstall
diff --git a/x11-fm/deforaos-browser/pkg-plist b/x11-fm/deforaos-browser/pkg-plist
index 5466b2aaa8b..9a04e8d4aab 100644
--- a/x11-fm/deforaos-browser/pkg-plist
+++ b/x11-fm/deforaos-browser/pkg-plist
@@ -10,31 +10,40 @@ bin/view
 include/Desktop/Browser.h
 include/Desktop/Browser/desktop.h
 include/Desktop/Browser/plugin.h
+include/Desktop/Browser/vfs.h
 lib/Browser/plugins/cvs.so
 lib/Browser/plugins/dirtree.so
 lib/Browser/plugins/favorites.so
 lib/Browser/plugins/git.so
 lib/Browser/plugins/make.so
+lib/Browser/plugins/places.so
 lib/Browser/plugins/preview.so
 lib/Browser/plugins/properties.so
+lib/Browser/plugins/selection.so
 lib/Browser/plugins/subversion.so
+lib/Browser/plugins/trash.so
 lib/Browser/plugins/volumes.so
+lib/Desktop/widget/browser.so
+lib/libBrowser.a
+lib/libBrowser.so
+lib/libBrowser.so.0
+lib/libBrowser.so.0.0
 libdata/pkgconfig/Browser.pc
-man/man1/browser.1.gz
-man/man1/copy.1.gz
-man/man1/delete.1.gz
-man/man1/desktop.1.gz
-man/man1/desktopctl.1.gz
-man/man1/move.1.gz
-man/man1/open.1.gz
-man/man1/properties.1.gz
-man/man1/view.1.gz
-share/applications/browser.desktop
-share/applications/desktop-settings.desktop
+%%PORTDOCS%%man/man1/browser.1.gz
+%%PORTDOCS%%man/man1/copy.1.gz
+%%PORTDOCS%%man/man1/delete.1.gz
+%%PORTDOCS%%man/man1/desktop.1.gz
+%%PORTDOCS%%man/man1/desktopctl.1.gz
+%%PORTDOCS%%man/man1/move.1.gz
+%%PORTDOCS%%man/man1/open.1.gz
+%%PORTDOCS%%man/man1/properties.1.gz
+%%PORTDOCS%%man/man1/view.1.gz
+share/applications/deforaos-browser.desktop
+share/applications/deforaos-desktop-settings.desktop
 share/icons/hicolor/16x16/apps/browser-view-details.png
 share/icons/hicolor/16x16/apps/browser-view-icons.png
 share/icons/hicolor/16x16/apps/browser-view-list.png
-share/locale/de/LC_MESSAGES/Browser.mo
-share/locale/es/LC_MESSAGES/Browser.mo
-share/locale/fr/LC_MESSAGES/Browser.mo
-share/locale/it/LC_MESSAGES/Browser.mo
+%%NLS%%share/locale/de/LC_MESSAGES/Browser.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Browser.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Browser.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Browser.mo