Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Aug 2015 12:10:23 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395663 - head/net/exabgp
Message-ID:  <201508311210.t7VCANWQ060835@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Aug 31 12:10:22 2015
New Revision: 395663
URL: https://svnweb.freebsd.org/changeset/ports/395663

Log:
  - Add LICENSE_FILE
  - Add NO_ARCH
  - Switch to options helpers
  - Switch to @sample
  
  Approved by:	portmgr blanket

Modified:
  head/net/exabgp/Makefile
  head/net/exabgp/pkg-plist

Modified: head/net/exabgp/Makefile
==============================================================================
--- head/net/exabgp/Makefile	Mon Aug 31 10:43:30 2015	(r395662)
+++ head/net/exabgp/Makefile	Mon Aug 31 12:10:22 2015	(r395663)
@@ -11,6 +11,7 @@ MAINTAINER=	zi@FreeBSD.org
 COMMENT=	BGP engine and route injector
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exa-Networks
@@ -19,14 +20,13 @@ SUB_FILES=	pkg-message exabgp.sh
 SUB_LIST=	PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 USE_RC_SUBR=	${PORTNAME}
+NO_ARCH=	yes
 
 USERS=		_bgpd
 GROUPS=		_bgpd
 
 OPTIONS_DEFINE=	EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${MV} -f ${WRKSRC}/etc/systemd ${WRKSRC}
 
@@ -38,10 +38,10 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} ${STAGEDIR}${ETCDIR}
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR})
-.if ${PORT_OPTIONS:MEXAMPLES}
+	${INSTALL_DATA} ${FILESDIR}/exabgp.env ${STAGEDIR}${ETCDIR}/exabgp.env.sample
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
-	${CP} ${FILESDIR}/exabgp.env ${STAGEDIR}${ETCDIR}/exabgp.env.sample
 
 .include <bsd.port.mk>

Modified: head/net/exabgp/pkg-plist
==============================================================================
--- head/net/exabgp/pkg-plist	Mon Aug 31 10:43:30 2015	(r395662)
+++ head/net/exabgp/pkg-plist	Mon Aug 31 12:10:22 2015	(r395663)
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/exabgp/exabgp.env %D/etc/exabgp/exabgp.env.sample ; then rm -f %D/etc/exabgp/exabgp.env ; fi
-etc/exabgp/exabgp.env.sample
-@exec if [ ! -f %D/etc/exabgp/exabgp.env ]; then cp -p %D/%F %B/exabgp.env; fi
+@sample etc/exabgp/exabgp.env.sample
 man/man1/exabgp.1.gz
 sbin/exabgp
 %%PYTHON_SITELIBDIR%%/exabgp/__init__.py



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