FreeBSD Bugzilla – Attachment 124256 Details for
Bug 167766
[MAINTAINER-UPDATE][PATCH] net-mgmt/pandorafms_*: Fix pkg-plist errors
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 3.97 KB, created by
KIKUCHI Koichiro
on 2012-05-10 08:40:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
KIKUCHI Koichiro
Created:
2012-05-10 08:40:00 UTC
Size:
3.97 KB
patch
obsolete
>Index: pandorafms_agent/Makefile >=================================================================== >RCS file: /home/ncvs/ports/net-mgmt/pandorafms_agent/Makefile,v >retrieving revision 1.1 >diff -u -r1.1 Makefile >--- pandorafms_agent/Makefile 21 Apr 2012 12:27:39 -0000 1.1 >+++ pandorafms_agent/Makefile 10 May 2012 07:20:43 -0000 >@@ -7,6 +7,7 @@ > > PORTNAME= pandora_agent > PORTVERSION= ${PANDORA_VERSION} >+PORTREVISION= 1 > CATEGORIES= net-mgmt > > MAINTAINER= koichiro@rworks.jp >Index: pandorafms_agent/pkg-plist >=================================================================== >RCS file: /home/ncvs/ports/net-mgmt/pandorafms_agent/pkg-plist,v >retrieving revision 1.1 >diff -u -r1.1 pkg-plist >--- pandorafms_agent/pkg-plist 21 Apr 2012 12:27:39 -0000 1.1 >+++ pandorafms_agent/pkg-plist 10 May 2012 07:20:43 -0000 >@@ -25,4 +25,3 @@ > @dirrmtry %%DATADIR%% > @dirrmtry %%ETCDIR%%/collections > @dirrmtry %%ETCDIR%%/plugins >-@dirrmtry %%ETCDIR%% >Index: pandorafms_console/Makefile >=================================================================== >RCS file: /home/ncvs/ports/net-mgmt/pandorafms_console/Makefile,v >retrieving revision 1.1 >diff -u -r1.1 Makefile >--- pandorafms_console/Makefile 21 Apr 2012 12:27:40 -0000 1.1 >+++ pandorafms_console/Makefile 10 May 2012 07:20:43 -0000 >@@ -7,6 +7,7 @@ > > PORTNAME= pandora_console > PORTVERSION= ${PANDORA_VERSION} >+PORTREVISION= 1 > CATEGORIES= net-mgmt > > MAINTAINER= koichiro@rworks.jp >Index: pandorafms_server/Makefile >=================================================================== >RCS file: /home/ncvs/ports/net-mgmt/pandorafms_server/Makefile,v >retrieving revision 1.1 >diff -u -r1.1 Makefile >--- pandorafms_server/Makefile 21 Apr 2012 12:27:40 -0000 1.1 >+++ pandorafms_server/Makefile 10 May 2012 07:20:43 -0000 >@@ -7,6 +7,7 @@ > > PORTNAME= pandora_server > PORTVERSION= ${PANDORA_VERSION} >+PORTREVISION= 1 > CATEGORIES= net-mgmt > > MAINTAINER= koichiro@rworks.jp >Index: pandorafms_server/bsd.pandora.mk >=================================================================== >RCS file: /home/ncvs/ports/net-mgmt/pandorafms_server/bsd.pandora.mk,v >retrieving revision 1.1 >diff -u -r1.1 bsd.pandora.mk >--- pandorafms_server/bsd.pandora.mk 21 Apr 2012 12:27:40 -0000 1.1 >+++ pandorafms_server/bsd.pandora.mk 10 May 2012 07:20:43 -0000 >@@ -25,6 +25,8 @@ > 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 @@ > 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} >Index: pandorafms_server/pkg-plist >=================================================================== >RCS file: /home/ncvs/ports/net-mgmt/pandorafms_server/pkg-plist,v >retrieving revision 1.1 >diff -u -r1.1 pkg-plist >--- pandorafms_server/pkg-plist 21 Apr 2012 12:27:40 -0000 1.1 >+++ pandorafms_server/pkg-plist 10 May 2012 07:20:43 -0000 >@@ -84,8 +84,9 @@ > %%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 @@ > @dirrmtry %%DATADIR%% > @dirrmtry %%PREFIX%%/etc/periodic/daily > @dirrmtry %%PREFIX%%/etc/periodic >-@dirrmtry %%ETCDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 167766
: 124256