svn commit: r328415 - head/deskutils/treeline

[Pawel Pekala]

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 <bsd.port.options.mk>
 
-.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 <bsd.port.mk>

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
+ at dirrm lib/treeline/plugins
 @dirrm lib/treeline
 %%PORTDOCS%%@dirrm %%DOCSDIR%%