Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Apr 2014 19:26:35 +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: r350152 - head/editors/diakonos
Message-ID:  <201404041926.s34JQZ1f052077@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Fri Apr  4 19:26:35 2014
New Revision: 350152
URL: http://svnweb.freebsd.org/changeset/ports/350152
QAT: https://qat.redports.org/buildarchive/r350152/

Log:
  - Add staging support
  - Define DOCS option

Modified:
  head/editors/diakonos/Makefile

Modified: head/editors/diakonos/Makefile
==============================================================================
--- head/editors/diakonos/Makefile	Fri Apr  4 19:17:37 2014	(r350151)
+++ head/editors/diakonos/Makefile	Fri Apr  4 19:26:35 2014	(r350152)
@@ -4,8 +4,8 @@
 PORTNAME=	diakonos
 PORTVERSION=	0.9.1
 CATEGORIES=	editors ruby
-MASTER_SITES=   http://diakonos.pist0s.ca/archives/ \
-         	http://distfiles.bsdjunk.com
+MASTER_SITES=	http://diakonos.pist0s.ca/archives/ \
+		http://distfiles.bsdjunk.com
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux editor for the masses
 
@@ -17,30 +17,24 @@ NO_BUILD=	yes
 SUB_FILES=	installation.rb
 SUB_LIST=	RUBY_SITELIBDIR=${RUBY_SITELIBDIR}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/bin/env ruby|${RUBY}|g' ${WRKSRC}/bin/${PORTNAME}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin/
-	${MKDIR} ${RUBY_SITELIBDIR}/${PORTNAME}
-	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${RUBY_SITELIBDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/installation.rb ${RUBY_SITELIBDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/diakonos.conf ${PREFIX}/etc/diakonos.conf.dist; \
-	if [ ! -f ${PREFIX}/etc/diakonos.conf ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/diakonos.conf.dist ${PREFIX}/etc/diakonos.conf; \
-	fi
-	${INSTALL_DATA} ${WRKSRC}/diakonos-256-colour.conf ${PREFIX}/etc/diakonos-256-colour.conf.dist; \
-	if [ ! -f ${PREFIX}/etc/diakonos-256-colour.conf ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/diakonos-256-colour.conf.dist ${PREFIX}/etc/diakonos-256-colour.conf; \
-	fi
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/help
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/LICENCE ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README.rdoc ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/help/*.dhf ${DOCSDIR}/help/
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
+	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_SITELIBDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/installation.rb \
+		${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/diakonos.conf \
+		${STAGEDIR}${PREFIX}/etc/diakonos.conf.dist
+	${INSTALL_DATA} ${WRKSRC}/diakonos-256-colour.conf \
+		${STAGEDIR}${PREFIX}/etc/diakonos-256-colour.conf.dist
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/help
+	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG LICENCE README.rdoc \
+		${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/help/*.dhf ${STAGEDIR}${DOCSDIR}/help
 
 .include <bsd.port.mk>



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