Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jan 2014 23:50:29 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341678 - head/deskutils/treeline
Message-ID:  <201401282350.s0SNoTBg038109@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401282350.s0SNoTBg038109>