From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 23:50:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDE1EA92; Tue, 28 Jan 2014 23:50:29 +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 8FC0C16F7; Tue, 28 Jan 2014 23:50:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SNoTTP038110; Tue, 28 Jan 2014 23:50:29 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SNoTBg038109; Tue, 28 Jan 2014 23:50:29 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201401282350.s0SNoTBg038109@svn.freebsd.org> From: Pawel Pekala Date: Tue, 28 Jan 2014 23:50:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341678 - head/deskutils/treeline X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 23:50:29 -0000 Author: pawel Date: Tue Jan 28 23:50:29 2014 New Revision: 341678 URL: http://svnweb.freebsd.org/changeset/ports/341678 QAT: https://qat.redports.org/buildarchive/r341678/ Log: - Remove option for ispell spell checking, now deprecated [1] - Add DOCS option to config menu - Revise DESKTOP_ENTRIES - Fix staging support, use install.py -b option to set STAGEDIR correctly, otherwise it leaks to compiled code and scripts Submitted by: bapt [1] Modified: head/deskutils/treeline/Makefile Modified: head/deskutils/treeline/Makefile ============================================================================== --- head/deskutils/treeline/Makefile Tue Jan 28 23:38:25 2014 (r341677) +++ head/deskutils/treeline/Makefile Tue Jan 28 23:50:29 2014 (r341678) @@ -3,7 +3,7 @@ PORTNAME= treeline PORTVERSION= 1.4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/:treeline \ http://treeline.bellz.org/plugins/:plugins \ @@ -17,43 +17,34 @@ COMMENT= Structured information storage LICENSE= GPLv2 +BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network + ${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \ + aspell:${PORTSDIR}/textproc/aspell WRKSRC= ${WRKDIR}/TreeLine USE_QT4= # empty USE_PYTHON= 2 NO_BUILD= yes -DESKTOP_ENTRIES= "TreeLine" "Structured information storage program" \ - "${DATADIR}/icons/tree/treeline.png" "treeline" \ - "Utility;" false - -OPTIONS_DEFINE= HTTPLOAD -OPTIONS_SINGLE= SPELLER -OPTIONS_SINGLE_SPELLER= ASPELL ISPELL +DESKTOP_ENTRIES= "TreeLine" "" "${DATADIR}/icons/tree/treeline.png" \ + "${PORTNAME}" "Utility;" false -HTTPLOAD_DESC= httpLoad plugin -SPELLER_DESC= Spell checking backend - -OPTIONS_DEFAULT= ASPELL +OPTIONS_DEFINE= DOCS HTTPLOAD OPTIONS_SUB= yes -ASPELL_BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell -ASPELL_RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +HTTPLOAD_DESC= httpLoad plugin HTTPLOAD_DISTFILES= httpload2.py:plugins -ISPELL_BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell -ISPELL_RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell .include do-install: - cd ${WRKSRC} && ${PYTHON_CMD} install.py -p ${STAGEDIR}${PREFIX} \ - -d ${STAGEDIR}${DOCSDIR} -i ${STAGEDIR}${DATADIR}/icons -x + (cd ${WRKSRC} && ${PYTHON_CMD} install.py -b ${STAGEDIR} -p ${PREFIX} \ + -d ${DOCSDIR} -i ${DATADIR}/icons) @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins .if ${PORT_OPTIONS:MHTTPLOAD} ${INSTALL_DATA} ${DISTDIR}/httpload2.py \ - ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins/ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins .endif .include