Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Mar 2016 16:41:47 +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: r410058 - head/security/orthrus
Message-ID:  <201603031641.u23GflaO012921@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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