Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sysutils/monit/Makefile
View File

@@ -1,20 +1,20 @@
# $NetBSD: Makefile,v 1.11 2013/03/03 01:09:55 joerg Exp $
# $NetBSD: Makefile,v 1.14 2014/02/12 23:18:40 tron Exp $
#
DISTNAME= monit-4.10.1
PKGREVISION= 3
DISTNAME= monit-5.6
PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.tildeslash.com/monit/dist/
MASTER_SITES= http://mmonit.com/monit/dist/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tildeslash.com/monit/
HOMEPAGE= http://mmonit.com/monit/
COMMENT= Utility for monitoring processes, files, directories and devices
LICENSE= gnu-gpl-v3
LICENSE= gnu-agpl-v3
# no platform specific code yet
NOT_FOR_PLATFORM+= BSDOS-*-* DragonFly-*-* Interix-*-* IRIX-*-* OSF1-*-*
USE_TOOLS+= gmake gzcat flex yacc pax
USE_TOOLS+= gmake gzcat flex yacc
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -46,8 +46,8 @@ DOCDIR= ${PREFIX}/${DOC_SUBDIR}
EG_SUBDIR= share/examples/monit
EGDIR= ${PREFIX}/${EG_SUBDIR}
M_DOCFILES= CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE
M_DOCFILES+= PACKAGES PLATFORMS README README.SSL STATUS UPGRADE.txt
M_DOCFILES= CHANGES COPYING README
M_DOCFILES+= doc/PLATFORMS
SUBST_CLASSES+= monit
SUBST_STAGE.monit= pre-configure
@@ -56,11 +56,6 @@ SUBST_FILES.monit= monitrc
SUBST_SED.monit= -e "s|^\# *set *daemon|set daemon|"
SUBST_SED.monit+= -e "s|include */etc/monit.d|include ${PKG_SYSCONFDIR}/monit.d|"
CPPFLAGS.NetBSD+= -D_KMEMUSER
post-extract:
cd ${WRKSRC}/contrib && gzcat monit-OSX-startup.tar.gz | pax -r
# Perform configure substitutions on monit.1
post-configure:
cd ${WRKSRC} && mv monit.1 monit.1.in && ./config.status --file=monit.1
@@ -71,14 +66,11 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
.endfor
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/MacOSX
${INSTALL_DATA} ${WRKSRC}/monitrc ${DESTDIR}${EGDIR}/monitrc.sample
${INSTALL_DATA} ${WRKSRC}/contrib/monit.php ${DESTDIR}${EGDIR}/
${INSTALL_DATA} ${WRKSRC}/contrib/monit.service ${DESTDIR}${EGDIR}/
${INSTALL_DATA} ${WRKSRC}/contrib/monit.upstart ${DESTDIR}${EGDIR}/
${INSTALL_DATA} ${WRKSRC}/contrib/monitrc-gentoo ${DESTDIR}${EGDIR}/
${INSTALL_DATA} ${WRKSRC}/contrib/wap.php ${DESTDIR}${EGDIR}/
.for f in README StartupParameters.plist monit monit.plist monitrc
${INSTALL_DATA} ${WRKSRC}/contrib/monit/${f} ${DESTDIR}${EGDIR}/MacOSX
.endfor
${INSTALL_DATA} ${WRKSRC}/contrib/rc.monit ${DESTDIR}${EGDIR}/
.include "../../mk/pthread.buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"

22
sysutils/monit/PLIST
View File

@@ -1,24 +1,12 @@
@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:10 joerg Exp $
@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:15 jperkin Exp $
bin/monit
man/man1/monit.1
share/docs/monit/CHANGES.txt
share/docs/monit/CONTRIBUTORS
share/docs/monit/CHANGES
share/docs/monit/COPYING
share/docs/monit/FAQ.txt
share/docs/monit/LICENSE
share/docs/monit/PACKAGES
share/docs/monit/PLATFORMS
share/docs/monit/README
share/docs/monit/README.SSL
share/docs/monit/STATUS
share/docs/monit/UPGRADE.txt
share/examples/monit/MacOSX/README
share/examples/monit/MacOSX/StartupParameters.plist
share/examples/monit/MacOSX/monit
share/examples/monit/MacOSX/monit.plist
share/examples/monit/MacOSX/monitrc
share/examples/monit/monit.php
share/examples/monit/monit.service
share/examples/monit/monit.upstart
share/examples/monit/monitrc-gentoo
share/examples/monit/monitrc.sample
share/examples/monit/wap.php
share/examples/rc.d/monit
share/examples/monit/rc.monit

11
sysutils/monit/distinfo
View File

@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.4 2008/12/28 22:38:08 seb Exp $
$NetBSD: distinfo,v 1.5 2014/02/06 09:09:17 obache Exp $
SHA1 (monit-4.10.1.tar.gz) = c87aa0c6e0b1d13f46b7e9d84937191e25a907a6
RMD160 (monit-4.10.1.tar.gz) = 6c517b19bc43f4023dfca4de1df09272b41af02d
Size (monit-4.10.1.tar.gz) = 606273 bytes
SHA1 (patch-aa) = b51792edf22fb9867d45a4adb2aadd03dbe5467c
SHA1 (patch-ab) = f691fd49a7c8150096a0a3fb4fb8ae72bf38d547
SHA1 (monit-5.6.tar.gz) = cc59780deea208312690e6c05d27fb947bae3789
RMD160 (monit-5.6.tar.gz) = b53becbc8859d97f4379d4befd070a937ea78e74
Size (monit-5.6.tar.gz) = 1263370 bytes
SHA1 (patch-aa) = 047783cbefb65cd89e3a398f2fb826b7ad0b3612

8
sysutils/monit/patches/patch-aa
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-aa,v 1.2 2007/12/15 16:41:51 seb Exp $
$NetBSD: patch-aa,v 1.3 2014/02/06 09:09:17 obache Exp $
Fix for LP64 big-endian platforms.
--- http/engine.c.orig 2007-07-29 20:23:26.000000000 +0000
+++ http/engine.c
@@ -246,7 +246,7 @@ int add_host_allow(char *name) {
--- src/http/engine.c.orig 2012-05-10 20:52:38.000000000 +0000
+++ src/http/engine.c
@@ -245,7 +245,7 @@ int add_host_allow(char *name) {
struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
NEW(h);

29
sysutils/monit/patches/patch-ab
View File

@@ -1,29 +0,0 @@
$NetBSD: patch-ab,v 1.4 2008/12/28 22:38:08 seb Exp $
--- process/sysdep_NETBSD.c.orig 2007-07-29 20:23:26.000000000 +0000
+++ process/sysdep_NETBSD.c
@@ -55,6 +55,8 @@
#include <sys/dkstat.h>
#endif
+#include <sys/param.h>
+
#include "monitor.h"
#include "process.h"
#include "process_sysdep.h"
@@ -171,9 +173,15 @@ int initprocesstree_sysdep(ProcessTree_T
{
pt[i].pid = pinfo[i].kp_proc.p_pid;
pt[i].ppid = pinfo[i].kp_eproc.e_ppid;
+#if defined(__NetBSD_Prereq__) && (499004400 <= __NetBSD_Version__)
+ pt[i].cputime = (long)((pinfo[i].kp_proc.p_rtime.sec << 4) +
+ (pinfo[i].kp_proc.p_rtime.frac >> 60)
+ );
+#else
pt[i].cputime = (long)((pinfo[i].kp_proc.p_rtime.tv_sec * 10) +
(pinfo[i].kp_proc.p_rtime.tv_usec / 100000)
);
+#endif
pt[i].mem_kbyte = (unsigned long)(pinfo[i].kp_eproc.e_vm.vm_rssize * pagesize_kbyte);
if(pinfo[i].kp_proc.p_stat == SZOMB)
{