Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Dec 2015 14:54:07 +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: r404523 - head/security/osiris
Message-ID:  <201512261454.tBQEs7Oe060572@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Dec 26 14:54:07 2015
New Revision: 404523
URL: https://svnweb.freebsd.org/changeset/ports/404523

Log:
  - Switch to options helpers
  - Drop @dirrm* from plist

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

Modified: head/security/osiris/Makefile
==============================================================================
--- head/security/osiris/Makefile	Sat Dec 26 14:49:30 2015	(r404522)
+++ head/security/osiris/Makefile	Sat Dec 26 14:54:07 2015	(r404523)
@@ -29,20 +29,19 @@ CLI_DESC=	Management CLI
 LIB_DEPENDS+=	libreadline.so.6:${PORTSDIR}/devel/readline
 .endif
 
-post-build:
-.if ${PORT_OPTIONS:MPRINTDB}
+post-build-PRINTDB-on:
 	cd ${WRKSRC}/src/tools && ${MAKE}
-.endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/osiris
-.if ${PORT_OPTIONS:MCLI}
+
+do-install-CLI-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${STAGEDIR}${PREFIX}/sbin
-.endif
-.if ${PORT_OPTIONS:MPRINTDB}
+
+do-install-PRINTDB-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/tools/printdb ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MOSIRISD}
+
+do-install-OSIRISD-on:
 	${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
 		-e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
 		${WRKSRC}/src/install/freebsd/osirisd.in > \
@@ -50,8 +49,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/osirisd/osirisd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh \
 		${STAGEDIR}${PREFIX}/etc/rc.d
-.endif
-.if ${PORT_OPTIONS:MOSIRISMD}
+
+do-install-OSIRISMD-on:
 	${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
 		-e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
 		${WRKSRC}/src/install/freebsd/osirismd.in > \
@@ -67,6 +66,5 @@ do-install:
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirismd.sh \
 		${STAGEDIR}${PREFIX}/etc/rc.d
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/security/osiris/pkg-plist
==============================================================================
--- head/security/osiris/pkg-plist	Sat Dec 26 14:49:30 2015	(r404522)
+++ head/security/osiris/pkg-plist	Sat Dec 26 14:54:07 2015	(r404523)
@@ -28,4 +28,3 @@
 %%OSIRISMD%%osiris/configs/default.wrt54g
 %%OSIRISMD%%@owner
 %%OSIRISMD%%@group
-%%OSIRISMD%%@dirrm osiris/configs



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