From owner-svn-ports-all@FreeBSD.ORG  Fri Apr  4 13:54:42 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8C965C05;
 Fri,  4 Apr 2014 13:54:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5E1CE13A;
 Fri,  4 Apr 2014 13:54:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34DsgXI013064;
 Fri, 4 Apr 2014 13:54:42 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34Dsgjo013063;
 Fri, 4 Apr 2014 13:54:42 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404041354.s34Dsgjo013063@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 4 Apr 2014 13:54:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350122 - 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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Apr 2014 13:54:42 -0000

Author: bapt
Date: Fri Apr  4 13:54:41 2014
New Revision: 350122
URL: http://svnweb.freebsd.org/changeset/ports/350122
QAT: https://qat.redports.org/buildarchive/r350122/

Log:
  Support stage
  Simplify a bit

Modified:
  head/security/knock/Makefile

Modified: head/security/knock/Makefile
==============================================================================
--- head/security/knock/Makefile	Fri Apr  4 13:45:36 2014	(r350121)
+++ head/security/knock/Makefile	Fri Apr  4 13:54:41 2014	(r350122)
@@ -25,22 +25,21 @@ OPTIONS_MULTI=	MT1
 OPTIONS_MULTI_MT1=	CLIENT SERVER
 OPTIONS_DEFAULT=	CLIENT SERVER
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 CLIENT_DESC=	Install knock client
 SERVER_DESC=	Install knockd server
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MSERVER}
-MAN1=		knockd.1
 USE_RC_SUBR=	knockd
-PLIST_FILES+=	bin/knockd
-PLIST_FILES+=	etc/knockd.conf.sample
+PLIST_FILES+=	bin/knockd \
+		etc/knockd.conf.sample \
+		man/man1/knockd.1.gz
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT}
-MAN1+=		knock.1
-PLIST_FILES+=	bin/knock
+PLIST_FILES+=	bin/knock \
+		man/man1/knock.1.gz
 .endif
 
 post-patch:
@@ -57,21 +56,13 @@ post-patch:
 
 do-install:
 .if ${PORT_OPTIONS:MSERVER}
-	${INSTALL_PROGRAM} ${WRKSRC}/knockd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/knockd.conf ${PREFIX}/etc/knockd.conf.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/knockd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/knockd.conf ${STAGEDIR}${PREFIX}/etc/knockd.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/doc/knockd.1.in ${STAGEDIR}${MAN1PREFIX}/man/man1/knockd.1
 .endif
-
-.if ${PORT_OPTIONS:MCLIENT}
-	${INSTALL_PROGRAM} ${WRKSRC}/knock ${PREFIX}/bin
-.endif
-
-post-install-script:
-.if ${PORT_OPTIONS:MSERVER}
-	${INSTALL_MAN} ${WRKSRC}/doc/knockd.1.in ${MAN1PREFIX}/man/man1/knockd.1
-.endif
-
 .if ${PORT_OPTIONS:MCLIENT}
-	${INSTALL_MAN} ${WRKSRC}/doc/knock.1.in ${MAN1PREFIX}/man/man1/knock.1
+	${INSTALL_PROGRAM} ${WRKSRC}/knock ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/knock.1.in ${STAGEDIR}${MAN1PREFIX}/man/man1/knock.1
 .endif
 
 .include <bsd.port.mk>