- Change Makefile header

- Change master sites, icon
- Change maintainer email to @FreeBSD.org
- Remove PORTDATA
- Support STAGEDIR
- Fix the usage of 'python' to get rid of the implicit lang/python dependency
- Change pkg-plist, remove DOCS

Approved by:	pawel / wg (mentors, implicit)

4 files changed, 34 insertions, 44 deletions

diff --git a/textproc/unoconv/Makefile b/textproc/unoconv/Makefile
index e53b80164940..624d43e1cdd1 100644
--- a/textproc/unoconv/Makefile
+++ b/textproc/unoconv/Makefile
@@ -1,12 +1,17 @@
+# Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	unoconv
 PORTVERSION=	0.6
 CATEGORIES=	textproc python
-MASTER_SITES=	http://dag.wieers.com/home-made/unoconv/
+MASTER_SITES=	http://dag.wieers.com/home-made/${PORTNAME}/ \
+		SF/nemysisfreebsdp/textproc/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
 DIST_SUBDIR=	python
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Convert any document from and to any LibreOffice supported format
 
 LICENSE=	GPLv2
@@ -16,7 +21,7 @@ RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
-PORTDATA=	 *
+PORTDOCS=	*
 
 DOCSRCDIR1=	${WRKSRC}
 DOC_FILES1=	AUTHORS ChangeLog README.asciidoc WISHLIST
@@ -26,41 +31,30 @@ DOCSDIR2=	${DOCSDIR}/doc
 DOC_FILES2=	errcode.txt filters.txt formats.txt office-installations.txt \
 		selinux.txt unoconv.1.txt
 
-MAN1=		${PORTNAME}.1
-
 SUB_FILES=	${PORTNAME} pkg-message
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
+		${WRKSRC}/${PORTNAME}
 
 do-install:
-# Scripts
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
-# Executable
-	${MKDIR} ${DATADIR}/tests
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/tests/
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
 
-# Data
 .for f in *.odt *.csv
-	@(cd ${WRKSRC}/tests && ${INSTALL_DATA} ${f} ${DATADIR}/tests)
+	@(cd ${WRKSRC}/tests && ${INSTALL_DATA} ${f} ${STAGEDIR}${DATADIR}/tests)
 .endfor
 
-# Pixmaps
-	${INSTALL_DATA} ${WRKSRC}/tests/dag.gif ${PREFIX}/share/pixmaps/${PORTNAME}.gif
-
-# Documentation
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
-	${MKDIR} ${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
-	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
-.endif
-
-# pkg-message
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
 
 .include <bsd.port.mk>
diff --git a/textproc/unoconv/distinfo b/textproc/unoconv/distinfo
index b06df627f474..8b98fbf4e393 100644
--- a/textproc/unoconv/distinfo
+++ b/textproc/unoconv/distinfo
@@ -1,2 +1,4 @@
 SHA256 (python/unoconv-0.6.tar.gz) = 790e614b8615217ef4588b187f0018b526ec2bb480c6b9b2ffb9b82f48da73d4
 SIZE (python/unoconv-0.6.tar.gz) = 91578
+SHA256 (python/unoconv.png) = 459f7dbc60e34ccce5c9d46a7317be02dd3c8275e7f7588b7b3885c67b6738eb
+SIZE (python/unoconv.png) = 744
diff --git a/textproc/unoconv/files/unoconv.in b/textproc/unoconv/files/unoconv.in
index 394215075428..b9ae8208e158 100644
--- a/textproc/unoconv/files/unoconv.in
+++ b/textproc/unoconv/files/unoconv.in
@@ -4,4 +4,4 @@
 #
 
 cd "%%DATADIR%%"
-./unoconv "$@"
+exec ./unoconv "$@"
diff --git a/textproc/unoconv/pkg-plist b/textproc/unoconv/pkg-plist
index a8826c49ebca..328540adb04f 100644
--- a/textproc/unoconv/pkg-plist
+++ b/textproc/unoconv/pkg-plist
@@ -1,14 +1,8 @@
 bin/unoconv
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.asciidoc
-%%PORTDOCS%%%%DOCSDIR%%/WISHLIST
-%%PORTDOCS%%%%DOCSDIR%%/doc/errcode.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/filters.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/formats.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/office-installations.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/selinux.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/unoconv.1.txt
-share/pixmaps/unoconv.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+man/man1/unoconv.1.gz
+share/pixmaps/unoconv.png
+%%DATADIR%%/tests/document-example.odt
+%%DATADIR%%/tests/spreadsheet-example.csv
+%%DATADIR%%/unoconv
+@dirrm %%DATADIR%%/tests
+@dirrm %%DATADIR%%