From owner-svn-ports-all@FreeBSD.ORG Sun Jan 20 18:28:50 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B1CBB54C; Sun, 20 Jan 2013 18:28:50 +0000 (UTC) (envelope-from sbz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A3D02ED6; Sun, 20 Jan 2013 18:28:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KISoEG070850; Sun, 20 Jan 2013 18:28:50 GMT (envelope-from sbz@svn.freebsd.org) Received: (from sbz@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KISo9A070848; Sun, 20 Jan 2013 18:28:50 GMT (envelope-from sbz@svn.freebsd.org) Message-Id: <201301201828.r0KISo9A070848@svn.freebsd.org> From: Sofian Brabez Date: Sun, 20 Jan 2013 18:28:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310711 - head/security/knock X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 18:28:50 -0000 Author: sbz Date: Sun Jan 20 18:28:49 2013 New Revision: 310711 URL: http://svnweb.freebsd.org/changeset/ports/310711 Log: - Convert to new option framework - Update MASTER_SITES Modified: head/security/knock/Makefile (contents, props changed) head/security/knock/pkg-descr (contents, props changed) Modified: head/security/knock/Makefile ============================================================================== --- head/security/knock/Makefile Sun Jan 20 18:14:28 2013 (r310710) +++ head/security/knock/Makefile Sun Jan 20 18:28:49 2013 (r310711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: knock -# Date Created: 2006-03-17 -# Whom: Shaun Amott -# +# Created by: Shaun Amott # $FreeBSD$ -# PORTNAME= knock PORTVERSION= 0.5 @@ -11,10 +7,10 @@ PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://www.zeroflux.org/proj/knock/files/ \ - ${MASTER_SITE_LOCAL:S,%SUBDIR%,sbz,} + LOCAL/sbz MAINTAINER= sbz@FreeBSD.org -COMMENT= A flexible port-knocking server and client +COMMENT= Flexible port-knocking server and client LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -25,25 +21,28 @@ GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include -OPTIONS= SERVER "Install knockd server" on \ - CLIENT "Install knock client" on +OPTIONS_DEFINE= CLIENT SERVER +OPTIONS_DEFAULT= CLIENT SERVER -.include +.include -.if defined(WITH_SERVER) +CLIENT_DESC= Install knock client +SERVER_DESC= Install knockd server + +.if ${PORT_OPTIONS:MSERVER} MAN1= knockd.1 USE_RC_SUBR= knockd PLIST_FILES+= bin/knockd PLIST_FILES+= etc/knockd.conf.sample .endif -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} MAN1+= knock.1 PLIST_FILES+= bin/knock .endif pre-configure: -.if defined(WITHOUT_SERVER) && defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MSERVER} && ${PORT_OPTIONS:MCLIENT} IGNORE= at least one component must be selected for installation .endif @@ -60,22 +59,22 @@ post-patch: ${WRKSRC}/src/knock.c do-install: -.if defined(WITH_SERVER) +.if ${PORT_OPTIONS:MSERVER} ${INSTALL_PROGRAM} ${WRKSRC}/knockd ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/knockd.conf ${PREFIX}/etc/knockd.conf.sample .endif -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} ${INSTALL_PROGRAM} ${WRKSRC}/knock ${PREFIX}/bin .endif post-install-script: -.if defined(WITH_SERVER) +.if ${PORT_OPTIONS:MSERVER} ${INSTALL_MAN} ${WRKSRC}/doc/knockd.1.in ${MAN1PREFIX}/man/man1/knockd.1 .endif -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} ${INSTALL_MAN} ${WRKSRC}/doc/knock.1.in ${MAN1PREFIX}/man/man1/knock.1 .endif -.include +.include Modified: head/security/knock/pkg-descr ============================================================================== --- head/security/knock/pkg-descr Sun Jan 20 18:14:28 2013 (r310710) +++ head/security/knock/pkg-descr Sun Jan 20 18:28:49 2013 (r310711) @@ -6,6 +6,6 @@ port on the server. This port need not b at the link-layer level, it sees all traffic even if it's destined for a closed port. When the server detects a specific sequence of port-hits port-hits, it runs a command defined in its configuration file. This -can be used to open up holes in a firewall for quick access. +can be used to open up holes in a firewall for quick access. WWW: http://www.zeroflux.org/projects/knock