From owner-svn-ports-head@FreeBSD.ORG Thu Sep 26 21:24:50 2013 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 ESMTP id 492CD5A7; Thu, 26 Sep 2013 21:24:50 +0000 (UTC) (envelope-from pawel@FreeBSD.org) 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 360202C0B; Thu, 26 Sep 2013 21:24:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QLOoal087712; Thu, 26 Sep 2013 21:24:50 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QLOnTE087710; Thu, 26 Sep 2013 21:24:49 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201309262124.r8QLOnTE087710@svn.freebsd.org> From: Pawel Pekala Date: Thu, 26 Sep 2013 21:24:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328415 - 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.14 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: Thu, 26 Sep 2013 21:24:50 -0000 Author: pawel Date: Thu Sep 26 21:24:49 2013 New Revision: 328415 URL: http://svnweb.freebsd.org/changeset/ports/328415 Log: - This version does work only with python 2.x - Remove option for xml parser, expat is pulled in by port's dependencies so this is useless - Use global descriptions for options - Spelling backends are needed during runtime - Add support for STAGEDIR Modified: head/deskutils/treeline/Makefile head/deskutils/treeline/pkg-plist (contents, props changed) Modified: head/deskutils/treeline/Makefile ============================================================================== --- head/deskutils/treeline/Makefile Thu Sep 26 21:13:59 2013 (r328414) +++ head/deskutils/treeline/Makefile Thu Sep 26 21:24:49 2013 (r328415) @@ -3,7 +3,7 @@ PORTNAME= treeline PORTVERSION= 1.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/:treeline \ http://treeline.bellz.org/plugins/:plugins \ @@ -22,49 +22,38 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4- WRKSRC= ${WRKDIR}/TreeLine USE_QT4= # empty -USE_PYTHON= 2.5+ +USE_PYTHON= -2.7 NO_BUILD= yes DESKTOP_ENTRIES= "TreeLine" "Structured information storage program" \ "${DATADIR}/icons/tree/treeline.png" "treeline" \ "Utility;" false -OPTIONS_DEFINE= HTTPLOAD PYXML +OPTIONS_DEFINE= HTTPLOAD OPTIONS_SINGLE= SPELLER OPTIONS_SINGLE_SPELLER= ASPELL ISPELL -ASPELL_DESC= Install with aspell support -HTTPLOAD_DESC= Install httpLoad plugin -ISPELL_DESC= Install with ispell support -PYXML_DESC= Use pythons py-xml instead of textproc/expat2 +HTTPLOAD_DESC= httpLoad plugin +SPELLER_DESC= Spell checking backend -OPTIONS_DEFAULT= ASPELL PYXML +OPTIONS_DEFAULT= ASPELL OPTIONS_SUB= yes ASPELL_BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +ASPELL_RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell HTTPLOAD_DISTFILES= httpload2.py:plugins ISPELL_BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell +ISPELL_RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell -NO_STAGE= yes .include -.if !${PORT_OPTIONS:MPYXML} -LIB_DEPENDS+= expat:${PORTSDIR}/textproc/expat2 -.endif - do-install: - @cd ${WRKSRC} && ${PYTHON_CMD} install.py \ - -p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -x + cd ${WRKSRC} && ${PYTHON_CMD} install.py -p ${STAGEDIR}${PREFIX} \ + -d ${STAGEDIR}${DOCSDIR} -i ${STAGEDIR}${DATADIR}/icons -x + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins .if ${PORT_OPTIONS:MHTTPLOAD} - @${INSTALL_DATA} -d ${PREFIX}/lib/${PORTNAME}/plugins/ - @${INSTALL_DATA} ${DISTDIR}/httpload2.py ${PREFIX}/lib/${PORTNAME}/plugins/ -.endif - -post-install: - ${RM} ${DOCSDIR}/INSTALL ${DOCSDIR}/LICENSE -.if !${PORT_OPTIONS:MDOCS} - ${RM} ${DOCSDIR}/* - ${RMDIR} ${DOCSDIR} + ${INSTALL_DATA} ${DISTDIR}/httpload2.py \ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins/ .endif .include Modified: head/deskutils/treeline/pkg-plist ============================================================================== --- head/deskutils/treeline/pkg-plist Thu Sep 26 21:13:59 2013 (r328414) +++ head/deskutils/treeline/pkg-plist Thu Sep 26 21:24:49 2013 (r328415) @@ -237,6 +237,6 @@ lib/treeline/undo.pyc @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/templates @dirrm %%DATADIR%% -%%HTTPLOAD%%@dirrm lib/treeline/plugins +@dirrm lib/treeline/plugins @dirrm lib/treeline %%PORTDOCS%%@dirrm %%DOCSDIR%%