summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorPhilippe Audeoud <jadawin@FreeBSD.org>2013-12-27 14:47:58 +0000
committerPhilippe Audeoud <jadawin@FreeBSD.org>2013-12-27 14:47:58 +0000
commit1288c1a14fee86b964c14fc1028379ff78a2ddcb (patch)
treebbcf6de766afc8fd3b581fcb6942c9857e76f292 /misc
parent- Actually make nagios work with staging (diff)
- support STAGE
Notes
Notes: svn path=/head/; revision=337733
Diffstat (limited to 'misc')
-rw-r--r--misc/mirmon/Makefile24
-rw-r--r--misc/yaunc/Makefile16
2 files changed, 18 insertions, 22 deletions
diff --git a/misc/mirmon/Makefile b/misc/mirmon/Makefile
index 12e01d7cb61a..fb1045d444a6 100644
--- a/misc/mirmon/Makefile
+++ b/misc/mirmon/Makefile
@@ -14,12 +14,11 @@ USES= perl5
USE_PERL5= run
SUB_FILES= pkg-message
-SUB_LIST= PREFIX=${PREFIX}
+SUB_LIST= PREFIX=${STAGEDIR}${PREFIX}
PLIST_FILES= bin/mirmon bin/probe
MAN1= mirmon.1
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ! ${PORT_OPTIONS:MDOCS}
@@ -33,18 +32,17 @@ post-patch:
-e "s,/usr/bin/rsync,${LOCALBASE}/bin/rsync," ${WRKSRC}/probe
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/mirmon ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/probe ${PREFIX}/bin
- @${MKDIR} ${DATADIR}
- ${CP} -R ${WRKSRC}/countries.list ${WRKSRC}/icons ${DATADIR}
- @${FIND} ${DATADIR} ! -type d | \
- ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
- @${FIND} ${DATADIR} -type d | ${SORT} -r | \
- ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
- ${INSTALL_MAN} ${WRKSRC}/mirmon.1 ${MANPREFIX}/man/man1
+ ${INSTALL_SCRIPT} ${WRKSRC}/mirmon ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/probe ${STAGEDIR}${PREFIX}/bin
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ ${CP} -R ${WRKSRC}/countries.list ${WRKSRC}/icons ${STAGEDIR}${DATADIR}
+ @${FIND} ${STAGEDIR}${DATADIR} ! -type d | \
+ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+ @${FIND} ${STAGEDIR}${DATADIR} -type d | ${SORT} -r | \
+ ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.if ! ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${CP} ${WRKSRC}/mirmon.html ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${CP} ${WRKSRC}/mirmon.html ${STAGEDIR}${DOCSDIR}
.endif
post-install:
diff --git a/misc/yaunc/Makefile b/misc/yaunc/Makefile
index 1bfef440d298..7e661056296e 100644
--- a/misc/yaunc/Makefile
+++ b/misc/yaunc/Makefile
@@ -10,22 +10,20 @@ MAINTAINER= jadawin@FreeBSD.org
COMMENT= Yet another uptimes.net client
ALL_TARGET= bsd
-CFLAGS+= -DCONFFILE=\\\"${PREFIX}/etc/yaunc.conf\\\"
+CFLAGS+= -DCONFFILE=\\\"${STAGEDIR}${PREFIX}/etc/yaunc.conf\\\"
PLIST_FILES= bin/yaunc \
- etc/yaunc.conf.sample
+ etc/yaunc.conf.sample \
+ man/man1/yaunc.1.gz
USE_RC_SUBR= yaunc
-MAN1= yaunc.1
-
-NO_STAGE= yes
post-patch:
- @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/yaunc.1
+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${STAGEDIR}${PREFIX}|g" ${WRKSRC}/yaunc.1
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/yaunc ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/yaunc.1 ${MANPREFIX}/man/man1
- ${INSTALL_DATA} -m 600 ${WRKSRC}/yaunc.conf ${PREFIX}/etc/yaunc.conf.sample
+ ${INSTALL_PROGRAM} ${WRKSRC}/yaunc ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/yaunc.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_DATA} -m 600 ${WRKSRC}/yaunc.conf ${STAGEDIR}${PREFIX}/etc/yaunc.conf.sample
.include <bsd.port.mk>