pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/parallel/ganglia-monitor-core - uses GNU_CONFIGURE, ch...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb859151dd70
branches:  trunk
changeset: 512079:eb859151dd70
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Apr 30 22:28:44 2006 +0000

description:
- uses GNU_CONFIGURE, change overrides to handle all subdirectories.
- uses libtool
- add DragonFly support
- use pkgsrc expat and apr
- bump revision

diffstat:

 parallel/ganglia-monitor-core/Makefile               |    20 +-
 parallel/ganglia-monitor-core/distinfo               |    15 +-
 parallel/ganglia-monitor-core/files/dfly-Makefile.am |     5 +
 parallel/ganglia-monitor-core/files/dfly-Makefile.in |   335 +++++
 parallel/ganglia-monitor-core/files/dfly-metrics.c   |  1149 ++++++++++++++++++
 parallel/ganglia-monitor-core/patches/patch-aa       |    16 +-
 parallel/ganglia-monitor-core/patches/patch-am       |     4 +-
 parallel/ganglia-monitor-core/patches/patch-an       |     4 +-
 parallel/ganglia-monitor-core/patches/patch-ao       |    13 +
 parallel/ganglia-monitor-core/patches/patch-ap       |    30 +
 parallel/ganglia-monitor-core/patches/patch-aq       |    30 +
 parallel/ganglia-monitor-core/patches/patch-ar       |    32 +
 parallel/ganglia-monitor-core/patches/patch-as       |    45 +
 parallel/ganglia-monitor-core/patches/patch-at       |    13 +
 parallel/ganglia-monitor-core/patches/patch-au       |    23 +
 15 files changed, 1718 insertions(+), 16 deletions(-)

diffs (truncated from 1874 to 300 lines):

diff -r b39626082de2 -r eb859151dd70 parallel/ganglia-monitor-core/Makefile
--- a/parallel/ganglia-monitor-core/Makefile    Sun Apr 30 22:04:36 2006 +0000
+++ b/parallel/ganglia-monitor-core/Makefile    Sun Apr 30 22:28:44 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/04/17 13:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/30 22:28:44 joerg Exp $
 #
 
 DISTNAME=              ganglia-3.0.1
 PKGNAME=               ganglia-monitor-core-3.0.1
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            net parallel
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ganglia/}
 EXTRACT_SUFX=          .tar.bz2
@@ -12,10 +12,14 @@
 HOMEPAGE=              http://ganglia.sourceforge.net/
 COMMENT=               Ganglia cluster monitor, monitoring daemon
 
-HAS_CONFIGURE=         YES
+GNU_CONFIGURE=         YES
 
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=       --with-gmetad
+USE_LIBTOOL=           yes
+CONFIG_GUESS_OVERRIDE?=                \
+       config.guess */config.guess */*/config.guess */*/*/config.guess
+CONFIG_SUB_OVERRIDE?=          \
+       config.sub */config.sub */*/config.sub */*/*/config.sub
 
 PATCH_ETC=             mans/gmetad.1 mans/gmond.1                      \
                        gmetad/cmdline.c gmetad/conf.c                  \
@@ -32,6 +36,10 @@
 
 pre-patch:
        ${MKDIR} ${WRKSRC}/srclib/libmetrics/netbsd
+       ${MKDIR} ${WRKSRC}/srclib/libmetrics/dragonfly
+       ${CP} ${FILESDIR}/dfly-metrics.c ${WRKSRC}/srclib/libmetrics/dragonfly/metrics.c
+       ${CP} ${FILESDIR}/dfly-Makefile.am ${WRKSRC}/srclib/libmetrics/dragonfly/Makefile.am
+       ${CP} ${FILESDIR}/dfly-Makefile.in ${WRKSRC}/srclib/libmetrics/dragonfly/Makefile.in
 
 post-patch:
 .for pfile in ${PATCH_ETC}
@@ -58,6 +66,10 @@
        ${INSTALL_DATA} ${WRKSRC}/gmond.sh ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/gmond
        ${INSTALL_DATA} ${WRKSRC}/gmetad.sh ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/gmetad
 
+BUILDLINK_DEPENDS.apr+=        apr>=0.9.7.2.0.55nb3
+
+.include "../../devel/apr/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../databases/rrdtool/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff -r b39626082de2 -r eb859151dd70 parallel/ganglia-monitor-core/distinfo
--- a/parallel/ganglia-monitor-core/distinfo    Sun Apr 30 22:04:36 2006 +0000
+++ b/parallel/ganglia-monitor-core/distinfo    Sun Apr 30 22:28:44 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/06/17 15:46:46 hira Exp $
+$NetBSD: distinfo,v 1.8 2006/04/30 22:28:44 joerg Exp $
 
 SHA1 (ganglia-3.0.1.tar.bz2) = 3e5c4ec4a509713974dd1e8d516127f6aa2c5a20
 RMD160 (ganglia-3.0.1.tar.bz2) = 1f0ecc7388f1058d64df9ab98734810a983e6d26
 Size (ganglia-3.0.1.tar.bz2) = 2649342 bytes
-SHA1 (patch-aa) = 88972d2268ebc76d72d8f2197bb272c6553f7098
+SHA1 (patch-aa) = 4e5bb79a395f1b34062bc62fce80c809d45ae60d
 SHA1 (patch-ab) = 6b349e90cdbf1a988aceb6222b5d67cacffe0a61
 SHA1 (patch-ac) = 23ad60ea06080a6763b21256e20549868110cf54
 SHA1 (patch-ad) = 4f03c665800827e1d89d7d76b81b667f0cf82ca6
@@ -15,5 +15,12 @@
 SHA1 (patch-aj) = d73aa994a2a6c9441d0b1cbcc9247bdf522b37c4
 SHA1 (patch-ak) = 6d84043aaf005e319517e8df61097dc00067ed10
 SHA1 (patch-al) = fbcf90d61ab6a160cbce7b90d0cdfcab44a1429c
-SHA1 (patch-am) = 89cc8fe1f4da758c5c0c46135e4a4310de75cc32
-SHA1 (patch-an) = f6e2d97fd474b5b00b68c575e0c3e376d772b2c0
+SHA1 (patch-am) = 719f293496f648cd5829ef35edd046120764312f
+SHA1 (patch-an) = 5b6c7002ead98dec9c45643be6dc6b69e1133355
+SHA1 (patch-ao) = a25381b4c8858112a46e9b61ff0af317f2472d5e
+SHA1 (patch-ap) = 649940b694afd7f10c58f84d323f7b755759f84f
+SHA1 (patch-aq) = 22fe789c666df1f4934046f1aa62d3629257c775
+SHA1 (patch-ar) = f652c74bf48528762e06801760753036651f874e
+SHA1 (patch-as) = 710abfd3dc6e5836818a0de2ce93d873b4b9b259
+SHA1 (patch-at) = aeb83adbcb798099d6c4cf4da58b164e7cb22c06
+SHA1 (patch-au) = ff58e4e0bcd631e8358c1e7cd7824597e32c5b01
diff -r b39626082de2 -r eb859151dd70 parallel/ganglia-monitor-core/files/dfly-Makefile.am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/ganglia-monitor-core/files/dfly-Makefile.am      Sun Apr 30 22:28:44 2006 +0000
@@ -0,0 +1,5 @@
+AM_CFLAGS=-I.. -I$(top_builddir)/lib
+
+noinst_LTLIBRARIES     = libmetric25.la
+libmetric25_la_SOURCES = metrics.c 
+libmetrics25_LIBS      = -lkinfo
diff -r b39626082de2 -r eb859151dd70 parallel/ganglia-monitor-core/files/dfly-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/ganglia-monitor-core/files/dfly-Makefile.in      Sun Apr 30 22:28:44 2006 +0000
@@ -0,0 +1,335 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AWK = @AWK@
+CC = @CC@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EGREP = @EGREP@
+F77 = @F77@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+OBJDUMP = @OBJDUMP@
+OS = @OS@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+RC = @RC@
+STRIP = @STRIP@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+AM_CFLAGS = -I.. -I$(top_builddir)/lib
+
+noinst_LTLIBRARIES = libmetric25.la
+libmetric25_la_SOURCES = metrics.c 
+subdir = freebsd
+mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+
+libmetric25_la_LDFLAGS =
+libmetric25_la_LIBADD = -lkinfo
+am_libmetric25_la_OBJECTS = metrics.lo
+libmetric25_la_OBJECTS = $(am_libmetric25_la_OBJECTS)
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/build/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/metrics.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+       $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(libmetric25_la_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(libmetric25_la_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  freebsd/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test -z "$dir" && dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libmetric25.la: $(libmetric25_la_OBJECTS) $(libmetric25_la_DEPENDENCIES) 
+       $(LINK)  $(libmetric25_la_LDFLAGS) $(libmetric25_la_OBJECTS) $(libmetric25_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metrics.Plo@am__quote@
+
+distclean-depend:
+       -rm -rf ./$(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `cygpath -w $<`
+
+.c.lo:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CCDEPMODE = @CCDEPMODE@
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique



Home | Main Index | Thread Index | Old Index