Index: head/security/orthrus/Makefile
===================================================================
--- head/security/orthrus/Makefile	(revision 410057)
+++ head/security/orthrus/Makefile	(revision 410058)
@@ -1,40 +1,39 @@
 # Created by: Gavin McDonald <gavin@16degrees.com.au>
 # $FreeBSD$
 
 PORTNAME=	orthrus
 PORTVERSION=	0.8.0
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	GOOGLE_CODE  \
 		http://16degrees.com.au/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	One-Time Password System (OTP) alternative to OPIE or S/Key
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1
 
 USES=		iconv scons tar:bzip2
 MAKE_ARGS=	DEBUG=False --install-sandbox=${STAGEDIR}
 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>
Index: head/security/orthrus/pkg-plist
===================================================================
--- head/security/orthrus/pkg-plist	(revision 410057)
+++ head/security/orthrus/pkg-plist	(revision 410058)
@@ -1,14 +1,12 @@
 bin/ortcalc
-@mode 4555
-bin/ortpasswd
-@mode
+@(,,4555) bin/ortpasswd
 etc/orthruskeys
 include/orthrus-0/context.h
 include/orthrus-0/orthrus.h
 include/orthrus-0/orthrus_error.h
 include/orthrus-0/orthrus_version.h
 lib/liborthrus-0.so
 lib/security/pam_orthrus.so
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO