Ignore:
Timestamp:
Jul 20, 2007, 5:34:01 AM (12 years ago)
Author:
boeyms@…
Message:

net/nefu: Make a lot of patches to update it and get it close to working:

  • Apply patches from Elias Pipping in #9439, 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.

Location:
trunk/dports/net/nefu
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/net/nefu/Portfile

    r20416 r27125  
    33
    44name                    nefu
    5 version                 0.9.7
    6 revision                2
     5version                 1.4.0
    76categories              net
    87maintainers             nomaintainer@macports.org
     
    1514homepage                http://rsug.itd.umich.edu/software/${name}
    1615master_sites    ${homepage}/files/
    17 checksums               md5 41827023db2d909309a99e4c10619cb4
     16checksums               md5 f0953b21cdb5eb327e40d4b215110b71 \
     17                                sha1 799d5573ab6d30f32cdc36bfee09a04de0f33bf8 \
     18                                rmd160 712b637b3c9126c2a218f5ec0eb74497f7e6ea59
     19extract.suffix  .tgz
    1820platforms               darwin
    1921
    20 depends_build   bin:bison:bison \
    21                                 bin:flex:flex
    22 depends_lib             lib:libssl.0.9:openssl
     22depends_build   bin:bison:bison
     23depends_lib             port:openssl port:zlib
    2324
    2425patchfiles              patch-Makefile.in \
    2526                                patch-aclocal.m4 \
     27                                patch-libsnet-aclocal.m4 \
    2628                                patch-configure.ac
    2729
    2830use_autoconf    yes
    29 configure.args  --mandir='\${prefix}/share/man' \
    30                                 --with-htmldir='\${prefix}/share/${name}/public_html' \
    31                                 --with-scriptdir='\${prefix}/share/${name}/shelltests'
     31# This really should be in a post-autoconf hook, but we don't have one yet.
     32pre-configure {
     33    cd ${worksrcpath}/libsnet
     34    system "autoconf"
     35}
     36configure.args  --mandir=${prefix}/share/man \
     37                                --with-html=${prefix}/share/${name}/public_html \
     38                                --with-shelltests=${prefix}/share/${name}/shelltests
    3239
    33 build.args              DEFS=-DBIND_8_COMPAT
     40build.args              DEFS="-DBIND_8_COMPAT -DLDAP_DEPRECATED"
    3441post-build {
    35         build.dir       ${worksrcpath}/TDK
    36         system "[command build]"
    37         build.dir       ${worksrcpath}
     42        cd ${worksrcpath}/TDK
     43        system "${build.cmd}"
    3844}
    3945
     
    4248        set gid [existsgroup nefu]
    4349        adduser nefu gid=${gid} realname=Nefu\ Monitor home=${prefix}/share/${name}
     50        xinstall -d -m 0755 ${destroot}${prefix}/share/${name}/public_html
    4451}
    4552destroot.keepdirs       ${destroot}${prefix}/share/${name}/shelltests
  • trunk/dports/net/nefu/files/patch-Makefile.in

    r21491 r27125  
    1 --- Makefile.in.orig    Sat Dec 18 14:08:43 2004
    2 +++ Makefile.in Sat Dec 18 14:12:10 2004
    3 @@ -9,7 +9,7 @@
    4  bindir=                @bindir@
     1--- Makefile.in.2       2007-03-22 02:40:10.000000000 +0100
     2+++ Makefile.in 2007-03-22 02:47:19.000000000 +0100
     3@@ -20,7 +20,11 @@
    54 
    6  html_dir=      @html_dir@
    7 -script_dir=    ${prefix}/shelltests
    8 +script_dir=    @script_dir@
     5 TARGETS=       nefu
    96 
    10  SRC=           main.c parse.c token.c machine.c ll.c test.c report.c \
    11                 order.c depmap.c schedule.c time.c ttable.c monitor.c \
    12 @@ -48,21 +48,21 @@
    13                 -c main.c
     7-CREATE_DIRS=   ${bindir} ${html_dir} ${script_dir}
     8+CREATE_DIRS_OLD=${bindir} ${html_dir} ${script_dir}
     9+CREATE_DIRS=   
     10+for i in ${CREATE_DIRS_OLD}; do \
     11+       CREATE_DIRS=${CREATE_DIRS} $(DESTDIR)$$i; \
     12+done
     13 MAN1TARGETS=   nefu.1
     14 MAN4TARGETS=   nefu.conf.4
    1415 
    15  install : all FRC
    16 -       -mkdir -p ${bindir}
    17 -       -mkdir -p ${script_dir}
    18 -       -mkdir -p ${html_dir}
     16@@ -46,17 +50,17 @@
     17        for i in ${CREATE_DIRS}; do \
     18            mkdir -p $$i; \
     19        done
    1920-       ${INSTALL} -m 0444 -c small_nefu_logo.png ${html_dir}
    20 +       -mkdir -p $(DESTDIR)${bindir}
    21 +       -mkdir -p $(DESTDIR)${script_dir}
    22 +       -mkdir -p $(DESTDIR)${html_dir}
    2321+       ${INSTALL} -m 0444 -c small_nefu_logo.png $(DESTDIR)${html_dir}
    2422        for i in ${TARGETS}; do \
     
    2624+           ${INSTALL} -m 0755 -c $$i $(DESTDIR)${bindir}/; \
    2725        done
    28 -       -mkdir -p ${mandir}
    29 -       -mkdir ${mandir}/man1
    30 +       -mkdir -p $(DESTDIR)${mandir}
     26-       -mkdir -p ${mandir}/man1
    3127+       -mkdir -p $(DESTDIR)${mandir}/man1
    3228        for i in ${MAN1TARGETS}; do \
     
    3430+           ${INSTALL} -m 0644 -c $$i $(DESTDIR)${mandir}/man1/; \
    3531        done
    36 -       -mkdir ${mandir}/man4
     32-       -mkdir -p ${mandir}/man4
    3733+       -mkdir -p $(DESTDIR)${mandir}/man4
    3834        for i in ${MAN4TARGETS}; do \
  • trunk/dports/net/nefu/files/patch-aclocal.m4

    r21491 r27125  
    1 ===================================================================
    2 RCS file: /usr/local/src/cvsroot/nefu/aclocal.m4,v
    3 retrieving revision 1.12
    4 retrieving revision 1.13
    5 diff -u -r1.12 -r1.13
    6 --- aclocal.m4  2002/11/21 16:34:27     1.12
    7 +++ aclocal.m4  2003/11/20 18:34:51     1.13
     1--- aclocal.m4  2007-06-16 03:56:22.000000000 +0000
     2+++ aclocal.m4.new      2007-06-16 04:56:59.000000000 +0000
    83@@ -11,7 +11,7 @@
    94     # ldapdirs will be "yes", "no", or a user defined path
     
    1510 
    1611        for dir in $ldapdirs; do
     12@@ -187,10 +187,45 @@
     13     else
     14        TLSDEFS=-DTLS;
     15        AC_SUBST(TLSDEFS)
     16-       LIBS="$LIBS -lssl -lcrypt";
     17+       LIBS="$LIBS -lssl -lcrypto";
     18        LDFLAGS="$LDFLAGS -L$ssldir/lib";
     19        HAVE_SSL=yes
     20     fi
     21     AC_SUBST(HAVE_SSL)
     22     AC_MSG_RESULT(yes)
     23 ])
     24+
     25+AC_DEFUN([CHECK_ZLIB],
     26+[
     27+    AC_MSG_CHECKING(for zlib)
     28+    zlibdirs="/usr /usr/local"
     29+       withval=""
     30+    AC_ARG_WITH(zlib,
     31+            [AC_HELP_STRING([--with-zlib=DIR], [path to zlib])],
     32+            [])
     33+    if test x_$withval != x_no; then
     34+       if test x_$withval != x_yes -a \! -z "$withval"; then
     35+               zlibdirs="$answer"
     36+       fi
     37+       for dir in $zlibdirs; do
     38+           zlibdir="$dir"
     39+           if test -f "$dir/include/zlib.h"; then
     40+                       found_zlib="yes";
     41+                       break;
     42+               fi
     43+       done
     44+       if test x_$found_zlib == x_yes; then
     45+               if test "$dir" != "/usr"; then
     46+                       CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
     47+           fi
     48+           AC_DEFINE(HAVE_ZLIB)
     49+           LIBS="$LIBS -lz";
     50+           LDFLAGS="$LDFLAGS -L$zlibdir/lib";
     51+           AC_MSG_RESULT(yes)
     52+       else
     53+           AC_MSG_RESULT(no)
     54+       fi
     55+    else
     56+       AC_MSG_RESULT(no)
     57+    fi
     58+])
  • trunk/dports/net/nefu/files/patch-configure.ac

    r21491 r27125  
    1 --- configure.ac        2002/12/09 23:43:15     1.14
    2 +++ configure.ac        2003/11/20 18:34:51     1.15
    3 @@ -10,7 +10,17 @@
     1--- configure.ac        2006-02-01 18:38:58.000000000 +0000
     2+++ configure.ac.new    2007-06-16 04:58:35.000000000 +0000
     3@@ -30,6 +30,9 @@
     4 CHECK_LIBKRB
     5 CHECK_SSL
    46 
    5  # Local Stuff
    6  AC_PREFIX_DEFAULT(/usr/local/nefu)
    7 -AC_SUBST(html_dir, [\${prefix}/public_html])
    8 +AC_ARG_WITH(htmldir,
    9 +    [  --with-htmldir[=PATH] directory where HTML will be written],
    10 +    html_dir=$with_htmldir,
    11 +    html_dir=[\${prefix}/public_html])
    12 +AC_ARG_WITH(scriptdir,
    13 +    [  --with-scriptdir[=PATH] directory where shell tests are stored],
    14 +    script_dir=$with_scriptdir,
    15 +    script_dir=[\${prefix}/shelltests])
     7+# Part of ugly hack for zlib inclusion
     8+CHECK_ZLIB
    169+
    17 +AC_SUBST(html_dir, [${html_dir}])
    18 +AC_SUBST(script_dir, [${script_dir}])
    19  AC_ARG_ENABLE(html,
    20         [AC_HELP_STRING([--disable-html],
    21                 [do not output html or install html files])],
     10 # Checks for libraries.
     11 # Note: no "d" library exists and we do not actually use the yacc library
     12 #AC_CHECK_LIB([l], [yywrap])
Note: See TracChangeset for help on using the changeset viewer.