Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Mar 2014 12:30:16 +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: r349133 - head/deskutils/griffith
Message-ID:  <201403251230.s2PCUGrS077941@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Tue Mar 25 12:30:16 2014
New Revision: 349133
URL: http://svnweb.freebsd.org/changeset/ports/349133
QAT: https://qat.redports.org/buildarchive/r349133/

Log:
  - Add staging support
  - Use options helpers, update description to current standards
  - Convert USE_GMAKE, USE_XZ to USES

Modified:
  head/deskutils/griffith/Makefile
  head/deskutils/griffith/pkg-plist

Modified: head/deskutils/griffith/Makefile
==============================================================================
--- head/deskutils/griffith/Makefile	Tue Mar 25 12:15:53 2014	(r349132)
+++ head/deskutils/griffith/Makefile	Tue Mar 25 12:30:16 2014	(r349133)
@@ -18,28 +18,25 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
 		${PYXML}
 
-OPTIONS_DEFINE=	LXML REPORTLAB2 CHARDET PYGNOMEEXTRAS
-LXML_DESC=	Enable lxml support
-REPORTLAB2_DESC=	Enable ReportLab2 support
-CHARDET_DESC=	Enable chardet support
-PYGNOMEEXTRAS_DESC=	Enable python-gnome-extras support
-
-USE_XZ=		yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gmake gettext tar:xz
 NO_BUILD=	yes
 
-MANLANG=	"" pl pt
-MAN1=		${PORTNAME}.1
+OPTIONS_DEFINE=	CHARDET LXML PYGNOMEEXTRAS REPORTLAB2    
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+CHARDET_DESC=		chardet support
+CHARDET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:${PORTSDIR}/textproc/py-chardet
 
-.if ${PORT_OPTIONS:MLXML}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
-.endif
+LXML_DESC=		lxml support
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
+
+PYGNOMEEXTRAS_DESC=	python-gnome-extras support
+PYGNOMEEXTRAS_USE=	GNOME=pygnomeextras
+
+REPORTLAB2_DESC=	ReportLab2 support
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREPORTLAB2}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab2>=2:${PORTSDIR}/print/py-reportlab2
@@ -47,25 +44,20 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}rep
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:${PORTSDIR}/print/py-reportlab1
 .endif
 
-.if ${PORT_OPTIONS:MCHARDET}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}chardet>=0:${PORTSDIR}/textproc/py-chardet
-.endif
-
-.if ${PORT_OPTIONS:MPYGNOMEEXTRAS}
-USE_GNOME+=	pygnomeextras
-.endif
-
 post-patch:
 .for file in Makefile
 	@${REINPLACE_CMD} -e \
 		'/^LANGUAGES=/s|find.*|cd i18n/\&\&ls -d *)|g ; \
-		 /^PREFIX/s|^|#|g ; \
+		 /^PREFIX/s|?=|=|g ; s|/usr|${PREFIX}|; /ln -s/d; \
 		 /^ETCDIR/s|=.*|= $$(PREFIX)/etc|g' ${WRKSRC}/${file}
 .endfor
 .for file in docs/en/Makefile docs/pl/Makefile docs/pt/Makefile
 	@${REINPLACE_CMD} -e \
-		'/^PREFIX/s|^|#|g ; \
-		 /^MANDIR/s|=.*|=${MANPREFIX}/man|g' ${WRKSRC}/${file}
+		'/^PREFIX/s|?=|=|g ; s|/usr|${PREFIX}|; \
+		 /^MANDIR/s|=.*|=${STAGEDIR}${MANPREFIX}/man|g' ${WRKSRC}/${file}
 .endfor
 
+pre-install:
+	${LN} -s ${DATADIR}/lib/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+
 .include <bsd.port.mk>

Modified: head/deskutils/griffith/pkg-plist
==============================================================================
--- head/deskutils/griffith/pkg-plist	Tue Mar 25 12:15:53 2014	(r349132)
+++ head/deskutils/griffith/pkg-plist	Tue Mar 25 12:30:16 2014	(r349133)
@@ -1,5 +1,8 @@
 bin/griffith
 etc/bash_completion.d/griffith
+man/man1/griffith.1.gz
+man/pl/man1/griffith.1.gz
+man/pt/man1/griffith.1.gz
 share/applications/griffith.desktop
 %%DATADIR%%/export_templates/csv/config.xml
 %%DATADIR%%/export_templates/csv/page.tpl



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