Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jan 2014 14:28:03 +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: r340399 - head/security/bruteblock
Message-ID:  <201401201428.s0KES3rI010136@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Jan 20 14:28:03 2014
New Revision: 340399
URL: http://svnweb.freebsd.org/changeset/ports/340399
QAT: https://qat.redports.org/buildarchive/r340399/

Log:
  - Support staging
  - Use new LIB_DEPENDS syntax

Modified:
  head/security/bruteblock/Makefile
  head/security/bruteblock/pkg-plist

Modified: head/security/bruteblock/Makefile
==============================================================================
--- head/security/bruteblock/Makefile	Mon Jan 20 14:20:33 2014	(r340398)
+++ head/security/bruteblock/Makefile	Mon Jan 20 14:28:03 2014	(r340399)
@@ -11,40 +11,30 @@ MASTER_SITES=	http://samm.kiev.ua/bruteb
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Software for blocking bruteforce attacks with ipfw
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	bruteblockd
-MAN8=		bruteblock.8
 
 CONFDIR=	${PREFIX}/etc/${PORTNAME}
 
 PORTDOCS=	FAQ README CHANGES
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bruteblock ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${WRKSRC}/bruteblockd ${PREFIX}/sbin/
-	${MKDIR} ${PREFIX}/etc/bruteblock
+	${INSTALL_PROGRAM} ${WRKSRC}/bruteblock ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bruteblockd ${STAGEDIR}${PREFIX}/sbin/
+	${MKDIR} ${STAGEDIR}${CONFDIR}
 .for file in ssh proftpd
-	${INSTALL_DATA} ${WRKSRC}/etc/${file}.conf ${CONFDIR}/${file}.conf.dist
-	if [ ! -f ${CONFDIR}/${file}.conf ]; then \
-		${INSTALL_DATA} ${CONFDIR}/${file}.conf.dist ${CONFDIR}/${file}.conf; \
-	fi
+	${INSTALL_DATA} ${WRKSRC}/etc/${file}.conf ${STAGEDIR}${CONFDIR}/${file}.conf.dist
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/bruteblock.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}/
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/doc/bruteblock.8 ${PREFIX}/man/man8/
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${DOCSDIR}/
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/security/bruteblock/pkg-plist
==============================================================================
--- head/security/bruteblock/pkg-plist	Mon Jan 20 14:20:33 2014	(r340398)
+++ head/security/bruteblock/pkg-plist	Mon Jan 20 14:28:03 2014	(r340399)
@@ -6,4 +6,5 @@ etc/bruteblock/proftpd.conf.dist
 @unexec if cmp -s %D/etc/bruteblock/ssh.conf.dist %D/etc/bruteblock/ssh.conf; then rm -f %D/etc/bruteblock/ssh.conf; fi
 etc/bruteblock/ssh.conf.dist
 @exec if [ ! -f %B/ssh.conf ]; then cp -p %D/%F %B/ssh.conf; fi
+man/man8/bruteblock.8.gz
 @dirrmtry etc/bruteblock



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