diff options
| author | erwin <erwin@FreeBSD.org> | 2012-05-11 20:12:49 +0800 |
|---|---|---|
| committer | erwin <erwin@FreeBSD.org> | 2012-05-11 20:12:49 +0800 |
| commit | 06e6dc87cbcb565eec39430bf267a67d40136133 (patch) | |
| tree | 5f80e3078633f100ec73bfcd613189fa0c5d5569 /net-mgmt | |
| parent | 3ddbe289d2897a33c46babf2e3bfdd8fad866577 (diff) | |
| download | freebsd-ports-gnome-06e6dc87cbcb565eec39430bf267a67d40136133.tar.gz freebsd-ports-gnome-06e6dc87cbcb565eec39430bf267a67d40136133.tar.zst freebsd-ports-gnome-06e6dc87cbcb565eec39430bf267a67d40136133.zip | |
Fix plist
PR: 167766
Submitted by: KIKUCHI Koichiro <koichiro@rworks.jp> (maintainer)
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/pandorafms_agent/Makefile | 1 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_agent/pkg-plist | 1 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_console/Makefile | 1 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_server/Makefile | 1 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_server/bsd.pandora.mk | 6 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_server/pkg-plist | 4 |
6 files changed, 11 insertions, 3 deletions
diff --git a/net-mgmt/pandorafms_agent/Makefile b/net-mgmt/pandorafms_agent/Makefile index 54fb48795987..4561095a37c1 100644 --- a/net-mgmt/pandorafms_agent/Makefile +++ b/net-mgmt/pandorafms_agent/Makefile @@ -7,6 +7,7 @@ PORTNAME= pandora_agent PORTVERSION= ${PANDORA_VERSION} +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp diff --git a/net-mgmt/pandorafms_agent/pkg-plist b/net-mgmt/pandorafms_agent/pkg-plist index 4599d9d5fff1..f653b5159cd4 100644 --- a/net-mgmt/pandorafms_agent/pkg-plist +++ b/net-mgmt/pandorafms_agent/pkg-plist @@ -25,4 +25,3 @@ bin/tentacle_client @dirrmtry %%DATADIR%% @dirrmtry %%ETCDIR%%/collections @dirrmtry %%ETCDIR%%/plugins -@dirrmtry %%ETCDIR%% diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile index fc6abcd49742..539acb5fdeec 100644 --- a/net-mgmt/pandorafms_console/Makefile +++ b/net-mgmt/pandorafms_console/Makefile @@ -7,6 +7,7 @@ PORTNAME= pandora_console PORTVERSION= ${PANDORA_VERSION} +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile index a34a6e8c2052..5eda00996fc4 100644 --- a/net-mgmt/pandorafms_server/Makefile +++ b/net-mgmt/pandorafms_server/Makefile @@ -7,6 +7,7 @@ PORTNAME= pandora_server PORTVERSION= ${PANDORA_VERSION} +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= koichiro@rworks.jp diff --git a/net-mgmt/pandorafms_server/bsd.pandora.mk b/net-mgmt/pandorafms_server/bsd.pandora.mk index d8469e9604a4..2e0dc1760c3e 100644 --- a/net-mgmt/pandorafms_server/bsd.pandora.mk +++ b/net-mgmt/pandorafms_server/bsd.pandora.mk @@ -25,6 +25,8 @@ GROUPS= pandora ETCDIR?= ${PANDORA_ETCDIR} SPOOLDIR?= ${PANDORA_SPOOLDIR} LOGDIR?= ${PANDORA_LOGDIR} +HOMEDIR?= ${PANDORA_HOMEDIR} +HOMEDIR_REL= ${HOMEDIR:S,^${PREFIX}/,,} PLIST_SUB+= SPOOLDIR="${PANDORA_SPOOLDIR}" LOGDIR="${PANDORA_LOGDIR}" \ USE_SPOOL_IN=${USE_SPOOL_IN} USE_SPOOL_OUT=${USE_SPOOL_OUT} \ @@ -58,3 +60,7 @@ post-extract: pre-install: @${CAT} ${PKGDIR}/../pandorafms_server/pkg-plist.spool > ${PLIST} @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} + @${ECHO_MSG} '@exec [ -e "%D/${ETCDIR_REL}" ] || ${MKDIR} "%D/${ETCDIR_REL}"' >> ${PLIST} + @${ECHO_MSG} '@exec if [ -e "%D/${HOMEDIR_REL}" ];then ${TRUE}; else ${MKDIR} "%D/${HOMEDIR_REL}"; ${CHOWN} ${USER}:${GROUP} "%D/${HOMEDIR_REL}";fi' >> ${PLIST} + @${ECHO_MSG} '@unexec ${RMDIR} "%D/${HOMEDIR_REL}" 2>/dev/null || ${TRUE}' >> ${PLIST} + @${ECHO_MSG} '@unexec ${RMDIR} "%D/${ETCDIR_REL}" 2>/dev/null || ${TRUE}' >> ${PLIST} diff --git a/net-mgmt/pandorafms_server/pkg-plist b/net-mgmt/pandorafms_server/pkg-plist index d7fcdf01f856..57cb0e471c97 100644 --- a/net-mgmt/pandorafms_server/pkg-plist +++ b/net-mgmt/pandorafms_server/pkg-plist @@ -84,8 +84,9 @@ bin/pandora_server %%DATADIR%%/util/udp_client.pl %%DATADIR%%/util/windows.README etc/periodic/daily/199.clean-pandoradb +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PandoraFMS @dirrm %%SITE_PERL%%/PandoraFMS/Traceroute -@dirrm %%SITE_PERL%%/PandoraFMS +@dirrmtry %%SITE_PERL%%/PandoraFMS @dirrm %%DATADIR%%/util/plugin/babel_plugin @dirrm %%DATADIR%%/util/plugin/integria_plugin @dirrm %%DATADIR%%/util/pandora2ast @@ -95,4 +96,3 @@ etc/periodic/daily/199.clean-pandoradb @dirrmtry %%DATADIR%% @dirrmtry %%PREFIX%%/etc/periodic/daily @dirrmtry %%PREFIX%%/etc/periodic -@dirrmtry %%ETCDIR%% |