Update to 0.4.0

4 files changed, 71 insertions, 23 deletions

diff --git a/editors/deforaos-editor/Makefile b/editors/deforaos-editor/Makefile
index 97db7062381b..ab99499de7df 100644
--- a/editors/deforaos-editor/Makefile
+++ b/editors/deforaos-editor/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	editor
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	editors
-MASTER_SITES=	http://www.defora.org/os/download/download/4326/
+MASTER_SITES=	http://www.defora.org/os/download/download/4398/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Editor-${PORTVERSION}
 
@@ -14,17 +13,35 @@ COMMENT=	DeforaOS desktop text editor
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xsltproc:textproc/libxslt \
-		docbook-xsl>=0:textproc/docbook-xsl
-
 LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
-		libDesktop.so:x11/deforaos-libdesktop
-
-MAKE_ARGS=	PREFIX=${PREFIX}
-USES=		desktop-file-utils gettext pkgconfig
-USE_GNOME=	gtk20
-
-MANDIRS=	${PREFIX}/share/man/man1
+		libDesktop.so:x11/deforaos-libdesktop \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+MAKE_ARGS+=	PREFIX=${PREFIX}
+MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
+
+USES=		desktop-file-utils pkgconfig
+USE_GNOME=	gtk20 cairo gdkpixbuf2
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+
+post-patch-DOCS-off:
+	${REINPLACE_CMD} 's|data doc po|data po|' \
+		${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+	${REINPLACE_CMD} 's|po src tools|src tools|' \
+		${WRKSRC}/Makefile
+
+post-patch:
+	@${REINPLACE_CMD} 's|-Wl,-pie||g' \
+		${WRKSRC}/tools/Makefile \
+		${WRKSRC}/src/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/editor \
diff --git a/editors/deforaos-editor/distinfo b/editors/deforaos-editor/distinfo
index 89681a5ead8d..faace885bbc6 100644
--- a/editors/deforaos-editor/distinfo
+++ b/editors/deforaos-editor/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Editor-0.3.0.tar.gz) = f08f3c7dacc416849eb9ce33b8d14ae0db90e8efc799b99ddb39fabcc7f98dd9
-SIZE (Editor-0.3.0.tar.gz) = 33801
+TIMESTAMP = 1484322291
+SHA256 (Editor-0.4.0.tar.gz) = 6d74ef9880c3dacd9beb25c622db23f1814d7f629ddd0ca15abac2db49e0536c
+SIZE (Editor-0.4.0.tar.gz) = 25363
diff --git a/editors/deforaos-editor/files/patch-doc_Makefile b/editors/deforaos-editor/files/patch-doc_Makefile
new file mode 100644
index 000000000000..bce0ae3c984d
--- /dev/null
+++ b/editors/deforaos-editor/files/patch-doc_Makefile
@@ -0,0 +1,32 @@
+--- doc/Makefile.orig	2017-01-13 15:29:31 UTC
++++ doc/Makefile
+@@ -1,4 +1,4 @@
+-TARGETS	= $(OBJDIR)editor.1 $(OBJDIR)editor.html $(OBJDIR)filter.1 $(OBJDIR)filter.html
++TARGETS	= $(OBJDIR)editor.1 $(OBJDIR)filter.1
+ OBJDIR	=
+ PREFIX	= /usr/local
+ DESTDIR	=
+@@ -25,23 +25,17 @@ $(OBJDIR)filter.html: filter.css.xml fil
+ clean:
+ 	$(RM) -- $(editor.1_OBJS) $(editor.html_OBJS) $(filter.1_OBJS) $(filter.html_OBJS)
+ 	./docbook.sh -c -P "$(PREFIX)" -- "editor.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "editor.html"
+ 	./docbook.sh -c -P "$(PREFIX)" -- "filter.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "filter.html"
+ 
+ distclean: clean
+ 	$(RM) -- $(TARGETS)
+ 
+ install: $(TARGETS)
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)editor.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)editor.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)filter.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)filter.html"
+ 
+ uninstall:
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.html"
+ 
+ .PHONY: all clean distclean install uninstall
diff --git a/editors/deforaos-editor/pkg-plist b/editors/deforaos-editor/pkg-plist
index e9f880257588..0a435ceaa85a 100644
--- a/editors/deforaos-editor/pkg-plist
+++ b/editors/deforaos-editor/pkg-plist
@@ -1,11 +1,9 @@
 bin/editor
 bin/filter
 share/applications/deforaos-editor.desktop
-share/doc/html/Editor/editor.html
-share/doc/html/Editor/filter.html
-share/locale/de/LC_MESSAGES/Editor.mo
-share/locale/es/LC_MESSAGES/Editor.mo
-share/locale/fr/LC_MESSAGES/Editor.mo
-share/locale/it/LC_MESSAGES/Editor.mo
-share/man/man1/editor.1.gz
-share/man/man1/filter.1.gz
+%%PORTDOCS%%man/man1/editor.1.gz
+%%PORTDOCS%%man/man1/filter.1.gz
+%%NLS%%share/locale/de/LC_MESSAGES/Editor.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Editor.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Editor.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Editor.mo