svn commit: r368846 - in head/sysutils: downtimed fcron heartbeat

Baptiste Daroussin bapt at FreeBSD.org
Mon Sep 22 10:40:07 UTC 2014 

Author: bapt
Date: Mon Sep 22 10:40:05 2014
New Revision: 368846
URL: http://svnweb.freebsd.org/changeset/ports/368846
QAT: https://qat.redports.org/buildarchive/r368846/

Log:
  Simplify plist

Modified:
  head/sysutils/downtimed/pkg-plist
  head/sysutils/fcron/pkg-plist
  head/sysutils/heartbeat/Makefile
  head/sysutils/heartbeat/pkg-plist

Modified: head/sysutils/downtimed/pkg-plist
==============================================================================
--- head/sysutils/downtimed/pkg-plist	Mon Sep 22 10:40:00 2014	(r368845)
+++ head/sysutils/downtimed/pkg-plist	Mon Sep 22 10:40:05 2014	(r368846)
@@ -2,6 +2,4 @@ bin/downtimes
 man/man1/downtimes.1.gz
 man/man8/downtimed.8.gz
 sbin/downtimed
- at cwd /
- at exec mkdir -p /var/db/downtimed
- at dirrmtry /var/db/downtimed
+ at dir /var/db/downtimed

Modified: head/sysutils/fcron/pkg-plist
==============================================================================
--- head/sysutils/fcron/pkg-plist	Mon Sep 22 10:40:00 2014	(r368845)
+++ head/sysutils/fcron/pkg-plist	Mon Sep 22 10:40:05 2014	(r368846)
@@ -1,18 +1,15 @@
 %%PAMDIR%%/fcron
 %%PAMDIR%%/fcrontab
- at mode 6111
 @owner fcron
 @group fcron
-bin/fcrondyn
-bin/fcrontab
- at mode 4110
-bin/fcronsighup
- at mode
+@(,,6111) bin/fcrondyn
+@(,,6111) bin/fcrontab
+@(,,4110) bin/fcronsighup
 @sample etc/fcron.allow.sample
 @sample etc/fcron.conf.sample
 @sample etc/fcron.deny.sample
- at owner root
- at group wheel
+ at owner
+ at group
 man/man1/fcrondyn.1.gz
 man/man1/fcrontab.1.gz
 man/man5/fcron.conf.5.gz
@@ -23,11 +20,4 @@ sbin/fcron
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab-operator
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab-root
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab.pam
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
- at cwd /
- at exec install -d -o fcron -g fcron -m 770 /var/spool/fcron
- at owner fcron
- at group fcron
- at dirrmtry /var/spool/fcron
- at owner root
- at group wheel
+ at dir(fcron,fcron,770) /var/spool/fcron

Modified: head/sysutils/heartbeat/Makefile
==============================================================================
--- head/sysutils/heartbeat/Makefile	Mon Sep 22 10:40:00 2014	(r368845)
+++ head/sysutils/heartbeat/Makefile	Mon Sep 22 10:40:05 2014	(r368846)
@@ -27,11 +27,10 @@ BUILD_DEPENDS=	bison:${PORTSDIR}/devel/b
 USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtoolize
 AUTOMAKE_ARGS=	--add-missing --include-deps --copy
 
-USES=		gettext gmake libtool pkgconfig tar:bzip2 shebangfix
+USES=		gettext gmake libtool pkgconfig python tar:bzip2 shebangfix
 SHEBANG_FILES=	ldirectord/ldirectord.in
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip

Modified: head/sysutils/heartbeat/pkg-plist
==============================================================================
--- head/sysutils/heartbeat/pkg-plist	Mon Sep 22 10:40:00 2014	(r368845)
+++ head/sysutils/heartbeat/pkg-plist	Mon Sep 22 10:40:05 2014	(r368846)
@@ -1,26 +1,12 @@
 bin/cl_respawn
- at group %%GROUP%%
- at mode 2555
-bin/cl_status
- at group
- at mode
+@(,%%GROUP%%,2555) bin/cl_status
 %%MGMT%%bin/hb_gui
 etc/ha.d/README.config
-%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/authkeys.sample %D/etc/ha.d/authkeys; then rm -f %D/etc/ha.d/authkeys; fi
- at mode 0600
-%%PORTDOCS%%etc/ha.d/authkeys.sample
- at mode
-%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/authkeys ]; then cp -p %D/%F %B/authkeys; fi
-%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/ha.cf.sample %D/etc/ha.d/ha.cf; then rm -f %D/etc/ha.d/ha.cf; fi
-%%PORTDOCS%%etc/ha.d/ha.cf.sample
-%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/ha.cf ]; then cp -p %D/%F %B/ha.cf; fi
+%%PORTDOCS%%@sample(,,0600) etc/ha.d/authkeys.sample
+%%PORTDOCS%%@sample etc/ha.d/ha.cf.sample
 etc/ha.d/harc
-%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/logd.cf.sample %D/etc/ha.d/logd.cf; then rm -f %D/etc/ha.d/logd.cf; fi
-%%PORTDOCS%%etc/ha.d/logd.cf.sample
-%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/logd.cf ]; then cp -p %D/%F %B/logd.cf; fi
-%%LDIRECTORD%%@unexec if cmp -s %D/etc/ha.d/ldirectord.cf.sample %D/etc/ha.d/ldirectord.cf; then rm -f %D/etc/ha.d/ldirectord.cf; fi
-%%LDIRECTORD%%etc/ha.d/ldirectord.cf.sample
-%%LDIRECTORD%%@exec if [ ! -f %D/etc/ha.d/ldirectord.cf ]; then cp -p %D/%F %B/ldirectord.cf; fi
+%%PORTDOCS%%@sample etc/ha.d/logd.cf.sample
+%%LDIRECTORD%%@sample etc/ha.d/ldirectord.cf.sample
 etc/ha.d/rc.d/ask_resources
 etc/ha.d/rc.d/hb_takeover
 etc/ha.d/rc.d/ip-request
@@ -606,78 +592,19 @@ sbin/stonith
 %%DATADIR%%/stonithdtest/STONITHDBasicSanityCheck
 %%MGMT%%share/locale/zh_CN/LC_MESSAGES/haclient.mo
 %%DATADIR%%/utillib.sh
- at dirrm %%DATADIR%%/stonithdtest
- at dirrm %%DATADIR%%/lrmtest/testcases
- at dirrm %%DATADIR%%/lrmtest
- at dirrm %%DATADIR%%/cts
-%%MGMT%%@dirrm share/heartbeat-gui
- at dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm lib/stonith/plugins/stonith2
- at dirrm lib/stonith/plugins/external
- at dirrm lib/stonith/plugins
- at dirrm lib/stonith
- at dirrm lib/pils/plugins/InterfaceMgr
- at dirrm lib/pils/plugins
- at dirrm lib/pils
- at dirrm lib/heartbeat/stonithdtest
- at dirrm lib/heartbeat/plugins/tiebreaker
- at dirrm lib/heartbeat/plugins/test
- at dirrm lib/heartbeat/plugins/quorumd
- at dirrm lib/heartbeat/plugins/quorum
- at dirrm lib/heartbeat/plugins/RAExec
- at dirrm lib/heartbeat/plugins/HBcompress
- at dirrm lib/heartbeat/plugins/HBcomm
- at dirrm lib/heartbeat/plugins/HBauth
- at dirrm lib/heartbeat/plugins/AppHBNotification
- at dirrm lib/heartbeat/plugins
-%%MGMT%%@dirrm lib/heartbeat-gui
- at dirrm lib/heartbeat
- at dirrm include/stonith
- at dirrm include/saf
- at dirrm include/pils
- at dirrm include/ocf
-%%MGMT%%@dirrm include/heartbeat/mgmt
- at dirrm include/heartbeat/lrm
- at dirrm include/heartbeat/fencing
- at dirrm include/heartbeat/crm/pengine
- at dirrm include/heartbeat/crm/common
- at dirrm include/heartbeat/crm
- at dirrm include/heartbeat
- at dirrm include/clplumbing
- at dirrmtry etc/ocf/resource.d/heartbeat
- at dirrmtry etc/ocf/resource.d
- at dirrmtry etc/ocf
- at dirrmtry etc/logrotate.d
- at dirrmtry etc/ha.d/resource.d
- at dirrmtry etc/ha.d/rc.d
- at dirrmtry etc/ha.d
- at unexec rmdir "/var/lib/heartbeat/cores/%%USER%%" >/dev/null 2>&1 || :
- at exec install -d -m 700 -o %%USER%% /var/lib/heartbeat/cores/%%USER%%
- at unexec rmdir "/var/lib/heartbeat/cores/nobody" >/dev/null 2>&1 || :
- at exec install -d -m 700 -o nobody /var/lib/heartbeat/cores/nobody
- at unexec rmdir "/var/lib/heartbeat/cores/root" >/dev/null 2>&1 || :
- at exec install -d -m 700 /var/lib/heartbeat/cores/root
- at unexec rmdir "/var/lib/heartbeat/cores" >/dev/null 2>&1 || :
- at exec install -d -m 755 /var/lib/heartbeat/cores
- at unexec rmdir "/var/lib/heartbeat/crm" >/dev/null 2>&1 || :
- at exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/lib/heartbeat/crm
- at unexec rmdir "/var/lib/heartbeat/fencing" >/dev/null 2>&1 || :
- at exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/fencing
- at unexec rmdir "/var/lib/heartbeat/lrm" >/dev/null 2>&1 || :
- at exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/lrm
-%%MGMT%%@unexec rmdir "/var/lib/heartbeat/mgmt" >/dev/null 2>&1 || :
-%%MGMT%%@exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/mgmt
- at unexec rmdir "/var/lib/heartbeat/pengine" >/dev/null 2>&1 || :
- at unexec rmdir "/var/lib/heartbeat" >/dev/null 2>&1 || :
- at unexec rmdir "/var/lib" >/dev/null 2>&1 || :
- at unexec rmdir "/var/run/heartbeat/pengine" >/dev/null 2>&1 || :
- at exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/pengine
- at unexec rmdir "/var/run/heartbeat/ccm" >/dev/null 2>&1 || :
- at exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/ccm
- at unexec rmdir "/var/run/heartbeat/crm" >/dev/null 2>&1 || :
- at exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/crm
- at unexec rmdir "/var/run/heartbeat" >/dev/null 2>&1 || :
- at exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat
- at cwd /
-var/run/heartbeat.pid
+ at dir(%%USER%%,,700) /var/lib/heartbeat/cores/%%USER%%
+ at dir(nobody,,700) /var/lib/heartbeat/cores/nobody
+ at dir(,,700) /var/lib/heartbeat/core/root
+ at dir /var/lib/heartbeat/cores/
+ at dir(%%USER%%,,750) /var/lib/heartbeat/crm/
+ at dir(,%%GROUP%%,770) /var/lib/heartbeat/fencing/
+ at dir(,%%GROUP%%,770) /var/lib/heartbeat/lrm/
+ at dir(,%%GROUP%%,770) /var/lib/heartbeat/mgmt/
+ at dir /var/lib/heartbeat/pengine
+ at dir /var/lib/heartbeat/
+ at dir /var/lib/
+ at dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat/pengine
+ at dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat/ccm
+ at dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat/crm
+ at dir(%%USER%%,%%GROUP%%,750) /var/run/heartbeat
+/var/run/heartbeat.pid

More information about the svn-ports-head mailing list