[32777] trunk/dports/net/nefu
ryandesign at macports.org
ryandesign at macports.org
Sun Jan 13 03:01:12 PST 2008
Revision: 32777
http://trac.macosforge.org/projects/macports/changeset/32777
Author: ryandesign at macports.org
Date: 2008-01-13 03:01:11 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
nefu: fix names of patchfiles to match recommendations
Modified Paths:
--------------
trunk/dports/net/nefu/Portfile
Added Paths:
-----------
trunk/dports/net/nefu/files/patch-Makefile.in.diff
trunk/dports/net/nefu/files/patch-aclocal.m4.diff
trunk/dports/net/nefu/files/patch-configure.ac.diff
trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4.diff
trunk/dports/net/nefu/files/patch-libtest-ping.c.diff
Removed Paths:
-------------
trunk/dports/net/nefu/files/patch-Makefile.in
trunk/dports/net/nefu/files/patch-aclocal.m4
trunk/dports/net/nefu/files/patch-configure.ac
trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4
trunk/dports/net/nefu/files/patch-libtest-ping.c
Modified: trunk/dports/net/nefu/Portfile
===================================================================
--- trunk/dports/net/nefu/Portfile 2008-01-13 10:58:38 UTC (rev 32776)
+++ trunk/dports/net/nefu/Portfile 2008-01-13 11:01:11 UTC (rev 32777)
@@ -23,10 +23,10 @@
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
+patchfiles patch-Makefile.in.diff \
+ patch-aclocal.m4.diff \
+ patch-libsnet-aclocal.m4.diff \
+ patch-configure.ac.diff
use_autoconf yes
# This really should be in a post-autoconf hook, but we don't have one yet.
@@ -104,7 +104,7 @@
}
platform darwin {
- patchfiles-append patch-libtest-ping.c
+ patchfiles-append patch-libtest-ping.c.diff
post-destroot {
system "ln -s public_html ${destroot}${prefix}/share/${name}/Sites"
}
Deleted: trunk/dports/net/nefu/files/patch-Makefile.in
===================================================================
--- trunk/dports/net/nefu/files/patch-Makefile.in 2008-01-13 10:58:38 UTC (rev 32776)
+++ trunk/dports/net/nefu/files/patch-Makefile.in 2008-01-13 11:01:11 UTC (rev 32777)
@@ -1,39 +0,0 @@
---- 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 @@
-
- TARGETS= nefu
-
--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
-
-@@ -46,17 +50,17 @@
- for i in ${CREATE_DIRS}; do \
- mkdir -p $$i; \
- done
-- ${INSTALL} -m 0444 -c small_nefu_logo.png ${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}/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 -p ${mandir}/man4
-+ -mkdir -p $(DESTDIR)${mandir}/man4
- for i in ${MAN4TARGETS}; do \
-- ${INSTALL} -m 0644 -c $$i ${mandir}/man4/; \
-+ ${INSTALL} -m 0644 -c $$i $(DESTDIR)${mandir}/man4/; \
- done
-
- nefu : ${OBJ} libtest/libtest.a libsnet/libsnet.la
Copied: trunk/dports/net/nefu/files/patch-Makefile.in.diff (from rev 32740, trunk/dports/net/nefu/files/patch-Makefile.in)
===================================================================
--- trunk/dports/net/nefu/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/net/nefu/files/patch-Makefile.in.diff 2008-01-13 11:01:11 UTC (rev 32777)
@@ -0,0 +1,39 @@
+--- 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 @@
+
+ TARGETS= nefu
+
+-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
+
+@@ -46,17 +50,17 @@
+ for i in ${CREATE_DIRS}; do \
+ mkdir -p $$i; \
+ done
+- ${INSTALL} -m 0444 -c small_nefu_logo.png ${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}/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 -p ${mandir}/man4
++ -mkdir -p $(DESTDIR)${mandir}/man4
+ for i in ${MAN4TARGETS}; do \
+- ${INSTALL} -m 0644 -c $$i ${mandir}/man4/; \
++ ${INSTALL} -m 0644 -c $$i $(DESTDIR)${mandir}/man4/; \
+ done
+
+ nefu : ${OBJ} libtest/libtest.a libsnet/libsnet.la
Deleted: trunk/dports/net/nefu/files/patch-aclocal.m4
===================================================================
--- trunk/dports/net/nefu/files/patch-aclocal.m4 2008-01-13 10:58:38 UTC (rev 32776)
+++ trunk/dports/net/nefu/files/patch-aclocal.m4 2008-01-13 11:01:11 UTC (rev 32777)
@@ -1,58 +0,0 @@
---- 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
- if test x_$ldapdirs = x_yes; then
-- ldapdirs="/usr /usr/local /usr/local/ldap /usr/local/openldap"
-+ ldapdirs="$prefix /usr /usr/local /usr/local/ldap /usr/local/openldap"
- 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
-+])
Copied: trunk/dports/net/nefu/files/patch-aclocal.m4.diff (from rev 32740, trunk/dports/net/nefu/files/patch-aclocal.m4)
===================================================================
--- trunk/dports/net/nefu/files/patch-aclocal.m4.diff (rev 0)
+++ trunk/dports/net/nefu/files/patch-aclocal.m4.diff 2008-01-13 11:01:11 UTC (rev 32777)
@@ -0,0 +1,58 @@
+--- 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
+ if test x_$ldapdirs = x_yes; then
+- ldapdirs="/usr /usr/local /usr/local/ldap /usr/local/openldap"
++ ldapdirs="$prefix /usr /usr/local /usr/local/ldap /usr/local/openldap"
+ 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
++])
Deleted: trunk/dports/net/nefu/files/patch-configure.ac
===================================================================
--- trunk/dports/net/nefu/files/patch-configure.ac 2008-01-13 10:58:38 UTC (rev 32776)
+++ trunk/dports/net/nefu/files/patch-configure.ac 2008-01-13 11:01:11 UTC (rev 32777)
@@ -1,12 +0,0 @@
---- 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
-
-+# Part of ugly hack for zlib inclusion
-+CHECK_ZLIB
-+
- # Checks for libraries.
- # Note: no "d" library exists and we do not actually use the yacc library
- #AC_CHECK_LIB([l], [yywrap])
Copied: trunk/dports/net/nefu/files/patch-configure.ac.diff (from rev 32740, trunk/dports/net/nefu/files/patch-configure.ac)
===================================================================
--- trunk/dports/net/nefu/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/net/nefu/files/patch-configure.ac.diff 2008-01-13 11:01:11 UTC (rev 32777)
@@ -0,0 +1,12 @@
+--- 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
+
++# Part of ugly hack for zlib inclusion
++CHECK_ZLIB
++
+ # Checks for libraries.
+ # Note: no "d" library exists and we do not actually use the yacc library
+ #AC_CHECK_LIB([l], [yywrap])
Deleted: trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4
===================================================================
--- trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4 2008-01-13 10:58:38 UTC (rev 32776)
+++ trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4 2008-01-13 11:01:11 UTC (rev 32777)
@@ -1,11 +0,0 @@
---- 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)
Copied: trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4.diff (from rev 32740, trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4)
===================================================================
--- trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4.diff (rev 0)
+++ trunk/dports/net/nefu/files/patch-libsnet-aclocal.m4.diff 2008-01-13 11:01:11 UTC (rev 32777)
@@ -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)
Deleted: trunk/dports/net/nefu/files/patch-libtest-ping.c
===================================================================
--- trunk/dports/net/nefu/files/patch-libtest-ping.c 2008-01-13 10:58:38 UTC (rev 32776)
+++ trunk/dports/net/nefu/files/patch-libtest-ping.c 2008-01-13 11:01:11 UTC (rev 32777)
@@ -1,15 +0,0 @@
---- libtest/ping.c.orig Wed Dec 22 10:00:09 2004
-+++ libtest/ping.c Sun Jan 30 18:15:14 2005
-@@ -166,9 +166,10 @@
- icmp_send->icmp_cksum = in_cksum((u_short *)icmp_send,
- SEND_PACKET_SIZE );
-
-- if (( send_wrote = sendto( nefu_raw_socket, (char *)icmp_send,
-+ if ((( send_wrote = sendto( nefu_raw_socket, (char *)icmp_send,
- SEND_PACKET_SIZE, 0, (struct sockaddr *)&t->t_sin,
-- sizeof( struct sockaddr_in ))) < 0 ) {
-+ sizeof( struct sockaddr_in ))) < 0 ) &&
-+ ( errno != EHOSTDOWN )) {
- report_printf( r, "sendto: %m" );
- return( T_MAYBE_DOWN );
- }
Copied: trunk/dports/net/nefu/files/patch-libtest-ping.c.diff (from rev 32740, trunk/dports/net/nefu/files/patch-libtest-ping.c)
===================================================================
--- trunk/dports/net/nefu/files/patch-libtest-ping.c.diff (rev 0)
+++ trunk/dports/net/nefu/files/patch-libtest-ping.c.diff 2008-01-13 11:01:11 UTC (rev 32777)
@@ -0,0 +1,15 @@
+--- libtest/ping.c.orig Wed Dec 22 10:00:09 2004
++++ libtest/ping.c Sun Jan 30 18:15:14 2005
+@@ -166,9 +166,10 @@
+ icmp_send->icmp_cksum = in_cksum((u_short *)icmp_send,
+ SEND_PACKET_SIZE );
+
+- if (( send_wrote = sendto( nefu_raw_socket, (char *)icmp_send,
++ if ((( send_wrote = sendto( nefu_raw_socket, (char *)icmp_send,
+ SEND_PACKET_SIZE, 0, (struct sockaddr *)&t->t_sin,
+- sizeof( struct sockaddr_in ))) < 0 ) {
++ sizeof( struct sockaddr_in ))) < 0 ) &&
++ ( errno != EHOSTDOWN )) {
+ report_printf( r, "sendto: %m" );
+ return( T_MAYBE_DOWN );
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080113/4f5ceab7/attachment-0001.html
More information about the macports-changes
mailing list