From owner-svn-ports-all@FreeBSD.ORG Tue Dec 17 11:46:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B3C2454; Tue, 17 Dec 2013 11:46:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EF760197D; Tue, 17 Dec 2013 11:46:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHBkUTS040914; Tue, 17 Dec 2013 11:46:30 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHBkUft040906; Tue, 17 Dec 2013 11:46:30 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312171146.rBHBkUft040906@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 17 Dec 2013 11:46:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336717 - in head/textproc/unoconv: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 11:46:31 -0000 Author: nemysis Date: Tue Dec 17 11:46:29 2013 New Revision: 336717 URL: http://svnweb.freebsd.org/changeset/ports/336717 Log: - 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) Modified: head/textproc/unoconv/Makefile head/textproc/unoconv/distinfo (contents, props changed) head/textproc/unoconv/files/unoconv.in (contents, props changed) head/textproc/unoconv/pkg-plist (contents, props changed) Modified: head/textproc/unoconv/Makefile ============================================================================== --- head/textproc/unoconv/Makefile Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/Makefile Tue Dec 17 11:46:29 2013 (r336717) @@ -1,12 +1,17 @@ +# Created by: Rusmir Dusko # $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}/textpr 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 +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 Modified: head/textproc/unoconv/distinfo ============================================================================== --- head/textproc/unoconv/distinfo Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/distinfo Tue Dec 17 11:46:29 2013 (r336717) @@ -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 Modified: head/textproc/unoconv/files/unoconv.in ============================================================================== --- head/textproc/unoconv/files/unoconv.in Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/files/unoconv.in Tue Dec 17 11:46:29 2013 (r336717) @@ -4,4 +4,4 @@ # cd "%%DATADIR%%" -./unoconv "$@" +exec ./unoconv "$@" Modified: head/textproc/unoconv/pkg-plist ============================================================================== --- head/textproc/unoconv/pkg-plist Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/pkg-plist Tue Dec 17 11:46:29 2013 (r336717) @@ -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%%