Date: Fri, 13 Jun 2014 11:47:41 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357672 - head/net/relayd Message-ID: <201406131147.s5DBlfZg062996@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Fri Jun 13 11:47:41 2014 New Revision: 357672 URL: http://svnweb.freebsd.org/changeset/ports/357672 QAT: https://qat.redports.org/buildarchive/r357672/ Log: * USES=uidfix -- staging without needing root access * Don't install relayd.conf to staging; switch to @sample in pkg-plist * Drop warnings for FreeBSD 7.x compat as that's long out of support * Modernize LIB_DEPENDS * Fix LICENSE: this is OpenBSD code, but it uses the ISC Licence wording rather than either of the {2,3}-clause BSD licenses. Approved by: portmgr (blanket "just fix it") Modified: head/net/relayd/Makefile head/net/relayd/pkg-plist Modified: head/net/relayd/Makefile ============================================================================== --- head/net/relayd/Makefile Fri Jun 13 11:40:46 2014 (r357671) +++ head/net/relayd/Makefile Fri Jun 13 11:47:41 2014 (r357672) @@ -2,19 +2,20 @@ PORTNAME= relayd PORTVERSION= 5.4.20131122 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= GH MAINTAINER= mm@FreeBSD.org COMMENT= OpenBSD relay daemon -LICENSE= BSD +LICENSE= ISCL GH_ACCOUNT= mmatuska GH_COMMIT= a4f6140 WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/src/usr.sbin +USES= uidfix USE_GITHUB= yes USE_RC_SUBR= relayd @@ -34,14 +35,10 @@ LIBEVENT_STATIC_DESC= Build with static BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent MAKE_ARGS+= LIBEVENT=${LOCALBASE}/lib/libevent.a .else -LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent MAKE_ARGS+= LIBEVENT=-levent .endif -.if ${OSVERSION} < 800041 -BROKEN= does not build on FreeBSD 7.X -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/relayd/relay.c \ @@ -52,7 +49,5 @@ post-patch: post-install: @${INSTALL_DATA} ${WRKSRC}/../etc/relayd.conf \ ${STAGEDIR}${PREFIX}/etc/relayd.conf.sample - @${CP} -n ${WRKSRC}/../etc/relayd.conf \ - ${STAGEDIR}${PREFIX}/etc/relayd.conf || ${TRUE} .include <bsd.port.post.mk> Modified: head/net/relayd/pkg-plist ============================================================================== --- head/net/relayd/pkg-plist Fri Jun 13 11:40:46 2014 (r357671) +++ head/net/relayd/pkg-plist Fri Jun 13 11:47:41 2014 (r357672) @@ -1,6 +1,4 @@ -@unexec if cmp -s %D/etc/relayd.conf %D/etc/relayd.conf.sample; then rm -f %D/etc/relayd.conf; fi -etc/relayd.conf.sample -@exec cp -n %B/%f %B/relayd.conf +@sample etc/relayd.conf.sample man/man5/relayd.conf.5.gz man/man8/relayctl.8.gz man/man8/relayd.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406131147.s5DBlfZg062996>