svn commit: r398015 - head/security/shibboleth2-sp

[Antoine Brodin]

Author: antoine
Date: Sat Sep 26 21:02:09 2015
New Revision: 398015
URL: https://svnweb.freebsd.org/changeset/ports/398015

Log:
  - Convert to @sample
  - Cleanup plist

Modified:
  head/security/shibboleth2-sp/pkg-plist

Modified: head/security/shibboleth2-sp/pkg-plist
==============================================================================
--- head/security/shibboleth2-sp/pkg-plist	Sat Sep 26 20:49:14 2015	(r398014)
+++ head/security/shibboleth2-sp/pkg-plist	Sat Sep 26 21:02:09 2015	(r398015)
@@ -1,83 +1,40 @@
 bin/mdquery
 bin/resolvertest
 etc/shibboleth/metagen.sh
- at unexec if cmp -s %D/etc/shibboleth/native.logger.dist %D/etc/shibboleth/native.logger; then rm -f %D/etc/shibboleth/native.logger; fi
-etc/shibboleth/native.logger.dist
- at exec if [ ! -f %D/etc/shibboleth/native.logger ] ; then cp -p %D/etc/shibboleth/native.logger.dist %D/etc/shibboleth/native.logger; fi
- at unexec if cmp -s %D/etc/shibboleth/shibd.logger.dist %D/etc/shibboleth/shibd.logger; then rm -f %D/etc/shibboleth/shibd.logger; fi
-etc/shibboleth/shibd.logger.dist
- at exec if [ ! -f %D/etc/shibboleth/shibd.logger ] ; then cp -p %D/etc/shibboleth/shibd.logger.dist %D/etc/shibboleth/shibd.logger; fi
- at unexec if cmp -s %D/etc/shibboleth/shibboleth2.xml.dist %D/etc/shibboleth/shibboleth2.xml; then rm -f %D/etc/shibboleth/shibboleth2.xml; fi
-etc/shibboleth/shibboleth2.xml.dist
- at exec if [ ! -f %D/etc/shibboleth/shibboleth2.xml ] ; then cp -p %D/etc/shibboleth/shibboleth2.xml.dist %D/etc/shibboleth/shibboleth2.xml; fi
- at unexec if cmp -s %D/etc/shibboleth/attribute-map.xml.dist %D/etc/shibboleth/attribute-map.xml; then rm -f %D/etc/shibboleth/attribute-map.xml; fi
-etc/shibboleth/attribute-map.xml.dist
- at exec if [ ! -f %D/etc/shibboleth/attribute-map.xml ] ; then cp -p %D/etc/shibboleth/attribute-map.xml.dist %D/etc/shibboleth/attribute-map.xml; fi
- at unexec if cmp -s %D/etc/shibboleth/attribute-policy.xml.dist %D/etc/shibboleth/attribute-policy.xml; then rm -f %D/etc/shibboleth/attribute-policy.xml; fi
-etc/shibboleth/attribute-policy.xml.dist
- at exec if [ ! -f %D/etc/shibboleth/attribute-policy.xml ] ; then cp -p %D/etc/shibboleth/attribute-policy.xml.dist %D/etc/shibboleth/attribute-policy.xml; fi
- at unexec if cmp -s %D/etc/shibboleth/example-metadata.xml.dist %D/etc/shibboleth/example-metadata.xml; then rm -f %D/etc/shibboleth/example-metadata.xml; fi
-etc/shibboleth/example-metadata.xml.dist
- at exec if [ ! -f %D/etc/shibboleth/example-metadata.xml ] ; then cp -p %D/etc/shibboleth/example-metadata.xml.dist %D/etc/shibboleth/example-metadata.xml; fi
- at unexec if cmp -s %D/etc/shibboleth/console.logger.dist %D/etc/shibboleth/console.logger; then rm -f %D/etc/shibboleth/console.logger; fi
-etc/shibboleth/console.logger.dist
- at exec if [ ! -f %D/etc/shibboleth/console.logger ] ; then cp -p %D/etc/shibboleth/console.logger.dist %D/etc/shibboleth/console.logger; fi
- at unexec if cmp -s %D/etc/shibboleth/syslog.logger.dist %D/etc/shibboleth/syslog.logger; then rm -f %D/etc/shibboleth/syslog.logger; fi
-etc/shibboleth/syslog.logger.dist
- at exec if [ ! -f %D/etc/shibboleth/syslog.logger ] ; then cp -p %D/etc/shibboleth/syslog.logger.dist %D/etc/shibboleth/syslog.logger; fi
- at unexec if cmp -s %D/etc/shibboleth/accessError.html.dist %D/etc/shibboleth/accessError.html; then rm -f %D/etc/shibboleth/accessError.html; fi
-etc/shibboleth/accessError.html.dist
- at exec if [ ! -f %D/etc/shibboleth/accessError.html ] ; then cp -p %D/etc/shibboleth/accessError.html.dist %D/etc/shibboleth/accessError.html; fi
- at unexec if cmp -s %D/etc/shibboleth/sessionError.html.dist %D/etc/shibboleth/sessionError.html; then rm -f %D/etc/shibboleth/sessionError.html; fi
-etc/shibboleth/sessionError.html.dist
- at exec if [ ! -f %D/etc/shibboleth/sessionError.html ] ; then cp -p %D/etc/shibboleth/sessionError.html.dist %D/etc/shibboleth/sessionError.html; fi
- at unexec if cmp -s %D/etc/shibboleth/metadataError.html.dist %D/etc/shibboleth/metadataError.html; then rm -f %D/etc/shibboleth/metadataError.html; fi
-etc/shibboleth/metadataError.html.dist
- at exec if [ ! -f %D/etc/shibboleth/metadataError.html ] ; then cp -p %D/etc/shibboleth/metadataError.html.dist %D/etc/shibboleth/metadataError.html; fi
- at unexec if cmp -s %D/etc/shibboleth/bindingTemplate.html.dist %D/etc/shibboleth/bindingTemplate.html; then rm -f %D/etc/shibboleth/bindingTemplate.html; fi
-etc/shibboleth/bindingTemplate.html.dist
- at exec if [ ! -f %D/etc/shibboleth/bindingTemplate.html ] ; then cp -p %D/etc/shibboleth/bindingTemplate.html.dist %D/etc/shibboleth/bindingTemplate.html; fi
- at unexec if cmp -s %D/etc/shibboleth/discoveryTemplate.html.dist %D/etc/shibboleth/discoveryTemplate.html; then rm -f %D/etc/shibboleth/discoveryTemplate.html; fi
-etc/shibboleth/discoveryTemplate.html.dist
- at exec if [ ! -f %D/etc/shibboleth/discoveryTemplate.html ] ; then cp -p %D/etc/shibboleth/discoveryTemplate.html.dist %D/etc/shibboleth/discoveryTemplate.html; fi
- at unexec if cmp -s %D/etc/shibboleth/localLogout.html.dist %D/etc/shibboleth/localLogout.html; then rm -f %D/etc/shibboleth/localLogout.html; fi
-etc/shibboleth/localLogout.html.dist
- at exec if [ ! -f %D/etc/shibboleth/localLogout.html ] ; then cp -p %D/etc/shibboleth/localLogout.html.dist %D/etc/shibboleth/localLogout.html; fi
- at unexec if cmp -s %D/etc/shibboleth/globalLogout.html.dist %D/etc/shibboleth/globalLogout.html; then rm -f %D/etc/shibboleth/globalLogout.html; fi
-etc/shibboleth/globalLogout.html.dist
- at exec if [ ! -f %D/etc/shibboleth/globalLogout.html ] ; then cp -p %D/etc/shibboleth/globalLogout.html.dist %D/etc/shibboleth/globalLogout.html; fi
- at unexec if cmp -s %D/etc/shibboleth/sslError.html.dist %D/etc/shibboleth/sslError.html; then rm -f %D/etc/shibboleth/sslError.html; fi
-etc/shibboleth/sslError.html.dist
- at exec if [ ! -f %D/etc/shibboleth/sslError.html ] ; then cp -p %D/etc/shibboleth/sslError.html.dist %D/etc/shibboleth/sslError.html; fi
- at unexec if cmp -s %D/etc/shibboleth/example-shibboleth2.xml.dist %D/etc/shibboleth/example-shibboleth2.xml; then rm -f %D/etc/shibboleth/example-shibboleth2.xml; fi
-etc/shibboleth/example-shibboleth2.xml.dist
- at exec if [ ! -f %D/etc/shibboleth/example-shibboleth2.xml ] ; then cp -p %D/etc/shibboleth/example-shibboleth2.xml.dist %D/etc/shibboleth/example-shibboleth2.xml; fi
- at unexec if cmp -s %D/etc/shibboleth/protocols.xml.dist %D/etc/shibboleth/protocols.xml; then rm -f %D/etc/shibboleth/protocols.xml; fi
-etc/shibboleth/protocols.xml.dist
- at exec if [ ! -f %D/etc/shibboleth/protocols.xml ] ; then cp -p %D/etc/shibboleth/protocols.xml.dist %D/etc/shibboleth/protocols.xml; fi
- at unexec if cmp -s %D/etc/shibboleth/security-policy.xml.dist %D/etc/shibboleth/security-policy.xml; then rm -f %D/etc/shibboleth/security-policy.xml; fi
-etc/shibboleth/security-policy.xml.dist
- at exec if [ ! -f %D/etc/shibboleth/security-policy.xml ] ; then cp -p %D/etc/shibboleth/security-policy.xml.dist %D/etc/shibboleth/security-policy.xml; fi
+ at sample etc/shibboleth/native.logger.dist etc/shibboleth/native.logger
+ at sample etc/shibboleth/shibd.logger.dist etc/shibboleth/shibd.logger
+ at sample etc/shibboleth/shibboleth2.xml.dist etc/shibboleth/shibboleth2.xml
+ at sample etc/shibboleth/attribute-map.xml.dist etc/shibboleth/attribute-map.xml
+ at sample etc/shibboleth/attribute-policy.xml.dist etc/shibboleth/attribute-policy.xml
+ at sample etc/shibboleth/example-metadata.xml.dist etc/shibboleth/example-metadata.xml
+ at sample etc/shibboleth/console.logger.dist etc/shibboleth/console.logger
+ at sample etc/shibboleth/syslog.logger.dist etc/shibboleth/syslog.logger
+ at sample etc/shibboleth/accessError.html.dist etc/shibboleth/accessError.html
+ at sample etc/shibboleth/sessionError.html.dist etc/shibboleth/sessionError.html
+ at sample etc/shibboleth/metadataError.html.dist etc/shibboleth/metadataError.html
+ at sample etc/shibboleth/bindingTemplate.html.dist etc/shibboleth/bindingTemplate.html
+ at sample etc/shibboleth/discoveryTemplate.html.dist etc/shibboleth/discoveryTemplate.html
+ at sample etc/shibboleth/localLogout.html.dist etc/shibboleth/localLogout.html
+ at sample etc/shibboleth/globalLogout.html.dist etc/shibboleth/globalLogout.html
+ at sample etc/shibboleth/sslError.html.dist etc/shibboleth/sslError.html
+ at sample etc/shibboleth/example-shibboleth2.xml.dist etc/shibboleth/example-shibboleth2.xml
+ at sample etc/shibboleth/protocols.xml.dist etc/shibboleth/protocols.xml
+ at sample etc/shibboleth/security-policy.xml.dist etc/shibboleth/security-policy.xml
 etc/shibboleth/shibd-amazon
 etc/shibboleth/shibd-redhat
 etc/shibboleth/shibd-debian
 etc/shibboleth/shibd-suse
+ at comment etc/shibboleth/shibd-systemd
 etc/shibboleth/shibd-osx.plist
 etc/shibboleth/apache.config
 etc/shibboleth/apache2.config
- at unexec if cmp -s %D/etc/shibboleth/attrChecker.html.dist %D/etc/shibboleth/attrChecker.html; then rm -f %D/etc/shibboleth/attrChecker.html; fi
-etc/shibboleth/attrChecker.html.dist
- at exec if [ ! -f %D/etc/shibboleth/attrChecker.html ] ; then cp -p %D/etc/shibboleth/attrChecker.html.dist %D/etc/shibboleth/attrChecker.html; fi
+ at sample etc/shibboleth/attrChecker.html.dist etc/shibboleth/attrChecker.html
 etc/shibboleth/apache22.config
 etc/shibboleth/apache24.config
 etc/shibboleth/keygen.sh
 etc/shibboleth/upgrade.xsl
- at unexec if cmp -s %D/etc/shibboleth/postTemplate.html.dist %D/etc/shibboleth/postTemplate.html; then rm -f %D/etc/shibboleth/postTemplate.html; fi
-etc/shibboleth/postTemplate.html.dist
- at exec if [ ! -f %D/etc/shibboleth/postTemplate.html ] ; then cp -p %D/etc/shibboleth/postTemplate.html.dist %D/etc/shibboleth/postTemplate.html; fi
- at unexec if cmp -s %D/etc/shibboleth/partialLogout.html.dist %D/etc/shibboleth/partialLogout.html; then rm -f %D/etc/shibboleth/partialLogout.html; fi
-etc/shibboleth/partialLogout.html.dist
- at exec if [ ! -f %D/etc/shibboleth/partialLogout.html ] ; then cp -p %D/etc/shibboleth/partialLogout.html.dist %D/etc/shibboleth/partialLogout.html; fi
+ at sample etc/shibboleth/postTemplate.html.dist etc/shibboleth/postTemplate.html
+ at sample etc/shibboleth/partialLogout.html.dist etc/shibboleth/partialLogout.html
 include/shibsp/AbstractSPRequest.h
 include/shibsp/AccessControl.h
 include/shibsp/Application.h
@@ -170,29 +127,7 @@ share/doc/shibboleth/OPENSSL.LICENSE
 share/doc/shibboleth/README.txt
 share/doc/shibboleth/RELEASE.txt
 share/doc/shibboleth/main.css
- at dir share/doc/shibboleth
- at dir lib/shibboleth
- at dir share/xml/shibboleth
- at dir include/shibsp/util
- at dir include/shibsp/security
- at dir include/shibsp/remoting
- at dir include/shibsp/metadata
- at dir include/shibsp/lite
- at dir include/shibsp/handler
- at dir include/shibsp/binding
- at dir include/shibsp/attribute/resolver
- at dir include/shibsp/attribute/filtering
- at dir include/shibsp/attribute
- at dir include/shibsp
- at dir etc/shibboleth
 @dir /var/log/shibboleth-www
- at exec install -d -o %%SHIBD_USER%% -g %%SHIBD_GROUP%% -m 755 /var/log/shibboleth
- at exec install -d -o %%SHIBD_USER%% -g %%SHIBD_GROUP%% -m 755 /var/cache/shibboleth
- at exec install -d -o %%SHIBD_USER%% -g %%WWWGRP%% -m 750 /var/run/shibboleth
- at owner %%SHIBD_USER%%
- at group %%SHIBD_GROUP%%
- at dir /var/log/shibboleth
- at dir /var/cache/shibboleth
- at mode 750
- at group %%WWWGRP%%
- at dir /var/run/shibboleth
+ at dir(%%SHIBD_USER%%,%%SHIBD_GROUP%%,755) /var/log/shibboleth
+ at dir(%%SHIBD_USER%%,%%SHIBD_GROUP%%,755) /var/cache/shibboleth
+ at dir(%%SHIBD_USER%%,%%WWWGRP%%,750) /var/run/shibboleth