From owner-svn-ports-all@freebsd.org  Thu Mar  3 16:41:48 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 525EDA935C3;
 Thu,  3 Mar 2016 16:41:48 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 200AB264;
 Thu,  3 Mar 2016 16:41:48 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u23Gfl4g012923;
 Thu, 3 Mar 2016 16:41:47 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u23GflaO012921;
 Thu, 3 Mar 2016 16:41:47 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201603031641.u23GflaO012921@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 3 Mar 2016 16:41:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r410058 - head/security/orthrus
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.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Mar 2016 16:41:48 -0000

Author: amdmi3
Date: Thu Mar  3 16:41:46 2016
New Revision: 410058
URL: https://svnweb.freebsd.org/changeset/ports/410058

Log:
  - Simplify stripping
  - Switch to options helpers

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

Modified: head/security/orthrus/Makefile
==============================================================================
--- head/security/orthrus/Makefile	Thu Mar  3 16:37:01 2016	(r410057)
+++ head/security/orthrus/Makefile	Thu Mar  3 16:41:46 2016	(r410058)
@@ -23,18 +23,17 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-O[0-9]|| ; \
-		 /chmod/d' ${WRKSRC}/SConstruct
+	@${REINPLACE_CMD} -e 's|-O[0-9]||; /chmod/d' ${WRKSRC}/SConstruct
 
 post-install:
+	@${TOUCH} ${STAGEDIR}${PREFIX}/etc/orthruskeys
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liborthrus-0.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_orthrus.so
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} NOTICE README TODO \
 		${STAGEDIR}${DOCSDIR})
-	@${ECHO_CMD} -n > ${STAGEDIR}${PREFIX}/etc/orthruskeys
-.for i in bin/ortcalc bin/ortpasswd lib/liborthrus-0.so \
-	lib/security/pam_orthrus.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${i}
-.endfor
 
 .include <bsd.port.mk>

Modified: head/security/orthrus/pkg-plist
==============================================================================
--- head/security/orthrus/pkg-plist	Thu Mar  3 16:37:01 2016	(r410057)
+++ head/security/orthrus/pkg-plist	Thu Mar  3 16:41:46 2016	(r410058)
@@ -1,7 +1,5 @@
 bin/ortcalc
-@mode 4555
-bin/ortpasswd
-@mode
+@(,,4555) bin/ortpasswd
 etc/orthruskeys
 include/orthrus-0/context.h
 include/orthrus-0/orthrus.h