[27125] trunk/dports/net/nefu
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 19 22:34:02 PDT 2007
Revision: 27125
http://trac.macosforge.org/projects/macports/changeset/27125
Author: boeyms at macports.org
Date: 2007-07-19 22:34:01 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
net/nefu: Make a lot of patches to update it and get it close to working:
* Apply patches from Elias Pipping in #....., including:
* update to latest version (1.4);
* fix extract suffix for latest version;
* update Makefile.in patch to suit latest version;
* remove obsoleted patch to configure.ac;
* remove unnecessary dependence on flex;
* change dependence on openssl to port:... style; and
* tidy up syntax in configure.args;
* Add -DLDAP_DEPRECATED to symbols defined in build.args since nefu uses APIs
that have since been deprecated in OpenLDAP;
* Fix typo in aclocal.m4 that leads to attempt to link against libcrypt instead
of libcrypto (requires autoconf to be run);
* Fix omission in libsnet/aclocal.m4 that leads to -lz being omitted from
LDFLAGS (requires autoconf to be run);
* Create a required directory in the pre-destroot stage; and
* Fix post-build step so that it actually runs.
Note that this port could probably still do with more work, but as I don't know
how to use this and have no need to, I feel more comfortable at this point
leaving it to someone else.
Modified Paths:
--------------
trunk/dports/net/nefu/Portfile
trunk/dports/net/nefu/files/patch-Makefile.in
trunk/dports/net/nefu/files/patch-aclocal.m4
trunk/dports/net/nefu/files/patch-configure.ac
Added Paths:
-----------
trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4
Modified: trunk/dports/net/nefu/Portfile
===================================================================
--- trunk/dports/net/nefu/Portfile 2007-07-20 05:26:12 UTC (rev 27124)
+++ trunk/dports/net/nefu/Portfile 2007-07-20 05:34:01 UTC (rev 27125)
@@ -2,8 +2,7 @@
PortSystem 1.0
name nefu
-version 0.9.7
-revision 2
+version 1.4.0
categories net
maintainers nomaintainer at macports.org
description A network monitoring daemon.
@@ -14,33 +13,41 @@
failure.
homepage http://rsug.itd.umich.edu/software/${name}
master_sites ${homepage}/files/
-checksums md5 41827023db2d909309a99e4c10619cb4
+checksums md5 f0953b21cdb5eb327e40d4b215110b71 \
+ sha1 799d5573ab6d30f32cdc36bfee09a04de0f33bf8 \
+ rmd160 712b637b3c9126c2a218f5ec0eb74497f7e6ea59
+extract.suffix .tgz
platforms darwin
-depends_build bin:bison:bison \
- bin:flex:flex
-depends_lib lib:libssl.0.9:openssl
+depends_build bin:bison:bison
+depends_lib port:openssl port:zlib
patchfiles patch-Makefile.in \
patch-aclocal.m4 \
+ patch-libsnet-aclocal.m4 \
patch-configure.ac
use_autoconf yes
-configure.args --mandir='\${prefix}/share/man' \
- --with-htmldir='\${prefix}/share/${name}/public_html' \
- --with-scriptdir='\${prefix}/share/${name}/shelltests'
+# This really should be in a post-autoconf hook, but we don't have one yet.
+pre-configure {
+ cd ${worksrcpath}/libsnet
+ system "autoconf"
+}
+configure.args --mandir=${prefix}/share/man \
+ --with-html=${prefix}/share/${name}/public_html \
+ --with-shelltests=${prefix}/share/${name}/shelltests
-build.args DEFS=-DBIND_8_COMPAT
+build.args DEFS="-DBIND_8_COMPAT -DLDAP_DEPRECATED"
post-build {
- build.dir ${worksrcpath}/TDK
- system "[command build]"
- build.dir ${worksrcpath}
+ cd ${worksrcpath}/TDK
+ system "${build.cmd}"
}
pre-destroot {
addgroup nefu
set gid [existsgroup nefu]
adduser nefu gid=${gid} realname=Nefu\ Monitor home=${prefix}/share/${name}
+ xinstall -d -m 0755 ${destroot}${prefix}/share/${name}/public_html
}
destroot.keepdirs ${destroot}${prefix}/share/${name}/shelltests
post-destroot {
Modified: trunk/dports/net/nefu/files/patch-Makefile.in
===================================================================
--- trunk/dports/net/nefu/files/patch-Makefile.in 2007-07-20 05:26:12 UTC (rev 27124)
+++ trunk/dports/net/nefu/files/patch-Makefile.in 2007-07-20 05:34:01 UTC (rev 27125)
@@ -1,39 +1,35 @@
---- Makefile.in.orig Sat Dec 18 14:08:43 2004
-+++ Makefile.in Sat Dec 18 14:12:10 2004
-@@ -9,7 +9,7 @@
- bindir= @bindir@
+--- Makefile.in.2 2007-03-22 02:40:10.000000000 +0100
++++ Makefile.in 2007-03-22 02:47:19.000000000 +0100
+@@ -20,7 +20,11 @@
- html_dir= @html_dir@
--script_dir= ${prefix}/shelltests
-+script_dir= @script_dir@
+ TARGETS= nefu
- SRC= main.c parse.c token.c machine.c ll.c test.c report.c \
- order.c depmap.c schedule.c time.c ttable.c monitor.c \
-@@ -48,21 +48,21 @@
- -c main.c
+-CREATE_DIRS= ${bindir} ${html_dir} ${script_dir}
++CREATE_DIRS_OLD=${bindir} ${html_dir} ${script_dir}
++CREATE_DIRS=
++for i in ${CREATE_DIRS_OLD}; do \
++ CREATE_DIRS=${CREATE_DIRS} $(DESTDIR)$$i; \
++done
+ MAN1TARGETS= nefu.1
+ MAN4TARGETS= nefu.conf.4
- install : all FRC
-- -mkdir -p ${bindir}
-- -mkdir -p ${script_dir}
-- -mkdir -p ${html_dir}
+@@ -46,17 +50,17 @@
+ for i in ${CREATE_DIRS}; do \
+ mkdir -p $$i; \
+ done
- ${INSTALL} -m 0444 -c small_nefu_logo.png ${html_dir}
-+ -mkdir -p $(DESTDIR)${bindir}
-+ -mkdir -p $(DESTDIR)${script_dir}
-+ -mkdir -p $(DESTDIR)${html_dir}
+ ${INSTALL} -m 0444 -c small_nefu_logo.png $(DESTDIR)${html_dir}
for i in ${TARGETS}; do \
- ${INSTALL} -m 0755 -c $$i ${bindir}/; \
+ ${INSTALL} -m 0755 -c $$i $(DESTDIR)${bindir}/; \
done
-- -mkdir -p ${mandir}
-- -mkdir ${mandir}/man1
-+ -mkdir -p $(DESTDIR)${mandir}
+- -mkdir -p ${mandir}/man1
+ -mkdir -p $(DESTDIR)${mandir}/man1
for i in ${MAN1TARGETS}; do \
- ${INSTALL} -m 0644 -c $$i ${mandir}/man1/; \
+ ${INSTALL} -m 0644 -c $$i $(DESTDIR)${mandir}/man1/; \
done
-- -mkdir ${mandir}/man4
+- -mkdir -p ${mandir}/man4
+ -mkdir -p $(DESTDIR)${mandir}/man4
for i in ${MAN4TARGETS}; do \
- ${INSTALL} -m 0644 -c $$i ${mandir}/man4/; \
Modified: trunk/dports/net/nefu/files/patch-aclocal.m4
===================================================================
--- trunk/dports/net/nefu/files/patch-aclocal.m4 2007-07-20 05:26:12 UTC (rev 27124)
+++ trunk/dports/net/nefu/files/patch-aclocal.m4 2007-07-20 05:34:01 UTC (rev 27125)
@@ -1,10 +1,5 @@
-===================================================================
-RCS file: /usr/local/src/cvsroot/nefu/aclocal.m4,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
---- aclocal.m4 2002/11/21 16:34:27 1.12
-+++ aclocal.m4 2003/11/20 18:34:51 1.13
+--- aclocal.m4 2007-06-16 03:56:22.000000000 +0000
++++ aclocal.m4.new 2007-06-16 04:56:59.000000000 +0000
@@ -11,7 +11,7 @@
# ldapdirs will be "yes", "no", or a user defined path
if test x_$ldapdirs != x_no; then
@@ -14,3 +9,50 @@
fi
for dir in $ldapdirs; do
+@@ -187,10 +187,45 @@
+ else
+ TLSDEFS=-DTLS;
+ AC_SUBST(TLSDEFS)
+- LIBS="$LIBS -lssl -lcrypt";
++ LIBS="$LIBS -lssl -lcrypto";
+ LDFLAGS="$LDFLAGS -L$ssldir/lib";
+ HAVE_SSL=yes
+ fi
+ AC_SUBST(HAVE_SSL)
+ AC_MSG_RESULT(yes)
+ ])
++
++AC_DEFUN([CHECK_ZLIB],
++[
++ AC_MSG_CHECKING(for zlib)
++ zlibdirs="/usr /usr/local"
++ withval=""
++ AC_ARG_WITH(zlib,
++ [AC_HELP_STRING([--with-zlib=DIR], [path to zlib])],
++ [])
++ if test x_$withval != x_no; then
++ if test x_$withval != x_yes -a \! -z "$withval"; then
++ zlibdirs="$answer"
++ fi
++ for dir in $zlibdirs; do
++ zlibdir="$dir"
++ if test -f "$dir/include/zlib.h"; then
++ found_zlib="yes";
++ break;
++ fi
++ done
++ if test x_$found_zlib == x_yes; then
++ if test "$dir" != "/usr"; then
++ CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
++ fi
++ AC_DEFINE(HAVE_ZLIB)
++ LIBS="$LIBS -lz";
++ LDFLAGS="$LDFLAGS -L$zlibdir/lib";
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ fi
++ else
++ AC_MSG_RESULT(no)
++ fi
++])
Modified: trunk/dports/net/nefu/files/patch-configure.ac
===================================================================
--- trunk/dports/net/nefu/files/patch-configure.ac 2007-07-20 05:26:12 UTC (rev 27124)
+++ trunk/dports/net/nefu/files/patch-configure.ac 2007-07-20 05:34:01 UTC (rev 27125)
@@ -1,21 +1,12 @@
---- configure.ac 2002/12/09 23:43:15 1.14
-+++ configure.ac 2003/11/20 18:34:51 1.15
-@@ -10,7 +10,17 @@
+--- configure.ac 2006-02-01 18:38:58.000000000 +0000
++++ configure.ac.new 2007-06-16 04:58:35.000000000 +0000
+@@ -30,6 +30,9 @@
+ CHECK_LIBKRB
+ CHECK_SSL
- # Local Stuff
- AC_PREFIX_DEFAULT(/usr/local/nefu)
--AC_SUBST(html_dir, [\${prefix}/public_html])
-+AC_ARG_WITH(htmldir,
-+ [ --with-htmldir[=PATH] directory where HTML will be written],
-+ html_dir=$with_htmldir,
-+ html_dir=[\${prefix}/public_html])
-+AC_ARG_WITH(scriptdir,
-+ [ --with-scriptdir[=PATH] directory where shell tests are stored],
-+ script_dir=$with_scriptdir,
-+ script_dir=[\${prefix}/shelltests])
++# Part of ugly hack for zlib inclusion
++CHECK_ZLIB
+
-+AC_SUBST(html_dir, [${html_dir}])
-+AC_SUBST(script_dir, [${script_dir}])
- AC_ARG_ENABLE(html,
- [AC_HELP_STRING([--disable-html],
- [do not output html or install html files])],
+ # Checks for libraries.
+ # Note: no "d" library exists and we do not actually use the yacc library
+ #AC_CHECK_LIB([l], [yywrap])
Added: trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4
===================================================================
--- trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4 (rev 0)
+++ trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4 2007-07-20 05:34:01 UTC (rev 27125)
@@ -0,0 +1,11 @@
+--- libsnet/aclocal.m4 2006-03-10 14:52:53.000000000 +0000
++++ libsnet/aclocal.m4.new 2007-06-16 02:26:11.000000000 +0000
+@@ -99,6 +99,8 @@
+ CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
+ fi
+ AC_DEFINE(HAVE_ZLIB)
++ LIBS="$LIBS -lz";
++ LDFLAGS="$LDFLAGS -L$zlibdir/lib";
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
Property changes on: trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4
___________________________________________________________________
Name: svn:eol-style
+ native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070719/a6f5d4ad/attachment.html
More information about the macports-changes
mailing list