[79500] trunk/dports/net/wol
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jun 15 18:33:22 PDT 2011
Revision: 79500
http://trac.macports.org/changeset/79500
Author: jeremyhu at macports.org
Date: 2011-06-15 18:33:21 -0700 (Wed, 15 Jun 2011)
Log Message:
-----------
wol: Build fixes
Modified Paths:
--------------
trunk/dports/net/wol/Portfile
Added Paths:
-----------
trunk/dports/net/wol/files/
trunk/dports/net/wol/files/getline.patch
trunk/dports/net/wol/files/upstream.fail.patch
Modified: trunk/dports/net/wol/Portfile
===================================================================
--- trunk/dports/net/wol/Portfile 2011-06-16 01:30:10 UTC (rev 79499)
+++ trunk/dports/net/wol/Portfile 2011-06-16 01:33:21 UTC (rev 79500)
@@ -16,3 +16,11 @@
homepage http://wake-on-lan.sourceforge.net
master_sites sourceforge:wake-on-lan
+
+patchfiles \
+ getline.patch \
+ upstream.fail.patch
+patch.pre_args -p1
+
+use_autoreconf yes
+autoreconf.args -fvi
Added: trunk/dports/net/wol/files/getline.patch
===================================================================
--- trunk/dports/net/wol/files/getline.patch (rev 0)
+++ trunk/dports/net/wol/files/getline.patch 2011-06-16 01:33:21 UTC (rev 79500)
@@ -0,0 +1,76 @@
+diff -Naurp wol-0.7.1.orig/configure.ac wol-0.7.1/configure.ac
+--- wol-0.7.1.orig/configure.ac 2004-04-28 19:21:23.000000000 -0700
++++ wol-0.7.1/configure.ac 2011-06-15 15:47:32.000000000 -0700
+@@ -193,6 +193,7 @@ gl_MD5 dnl for GNU md5
+ AM_FUNC_GETLINE dnl for GNU getline
+ AC_CHECK_FUNCS(usleep)
+ AC_CHECK_FUNCS(getopt_long) dnl for GNU getopt
++AC_CHECK_FUNCS(getline)
+ AC_CHECK_FUNCS(getdelim)
+ AC_CHECK_FUNC(inet_aton, [], [
+ dnl check libresolv for inet_aton() as seen on solaris
+diff -Naurp wol-0.7.1.orig/lib/getline.c wol-0.7.1/lib/getline.c
+--- wol-0.7.1.orig/lib/getline.c 2003-08-23 08:59:52.000000000 -0700
++++ wol-0.7.1/lib/getline.c 2011-06-15 15:51:14.000000000 -0700
+@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <stdio.h>
+ #include <sys/types.h>
+
+-#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
++#if !defined(HAVE_GETLINE) && defined(HAVE_GETDELIM)
+
+ ssize_t
+ getline (char **lineptr, size_t *n, FILE *stream)
+@@ -41,19 +41,23 @@ getline (char **lineptr, size_t *n, FILE
+ return getdelim (lineptr, n, '\n', stream);
+ }
+
+-#else /* ! have getdelim */
++#else
+
+ # include "getstr.h"
+
++# ifndef HAVE_GETLINE
+ ssize_t
+ getline (char **lineptr, size_t *n, FILE *stream)
+ {
+ return getstr (lineptr, n, stream, '\n', 0, 0);
+ }
++# endif
+
++# ifndef HAVE_GETDELIM
+ ssize_t
+ getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
+ {
+ return getstr (lineptr, n, stream, delimiter, 0, 0);
+ }
++# endif
+ #endif
+diff -Naurp wol-0.7.1.orig/lib/getline.h wol-0.7.1/lib/getline.h
+--- wol-0.7.1.orig/lib/getline.h 2002-03-11 09:55:36.000000000 -0800
++++ wol-0.7.1/lib/getline.h 2011-06-15 15:49:06.000000000 -0700
+@@ -27,10 +27,12 @@ Foundation, Inc., 59 Temple Place - Suit
+ # endif
+ # endif
+
+-# if __GLIBC__ < 2
++# ifndef HAVE_GETLINE
+ int
+ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
++# endif
+
++# ifndef HAVE_GETDELIM
+ int
+ getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+ # endif
+diff -Naurp wol-0.7.1.orig/lib/getline.h wol-0.7.1/lib/getline.h
+--- wol-0.7.1.orig/lib/getpass4.c 2011-06-15 15:56:55.000000000 -0700
++++ wol-0.7.1/lib/getpass4.c 2011-06-15 15:57:26.000000000 -0700
+@@ -1,4 +1,6 @@
+-#define _GNU_SOURCE
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif /* HAVE_CONFIG_H */
+
+ #include <stdio.h>
+ #include <termios.h>
Added: trunk/dports/net/wol/files/upstream.fail.patch
===================================================================
--- trunk/dports/net/wol/files/upstream.fail.patch (rev 0)
+++ trunk/dports/net/wol/files/upstream.fail.patch 2011-06-16 01:33:21 UTC (rev 79500)
@@ -0,0 +1,68 @@
+diff -Naurp wol-0.7.1.orig/configure.ac wol-0.7.1/configure.ac
+--- wol-0.7.1.orig/configure.ac 2011-06-15 18:31:34.000000000 -0700
++++ wol-0.7.1/configure.ac 2011-06-15 18:31:52.000000000 -0700
+@@ -63,12 +63,12 @@ AC_CHECK_SIZEOF(unsigned char, 1)
+ ether_includes=""
+ AC_CHECK_TYPE([struct ether_addr], , , [#include <netinet/ether.h>]) dnl Linux
+ if test "$ac_cv_type_struct_ether_addr" = "yes"; then
+- AC_DEFINE_UNQUOTED(HAVE_STRUCT_ETHER_ADDR, 1)
++ AC_DEFINE(HAVE_STRUCT_ETHER_ADDR, 1, [struct ether_addr])
+ ether_includes="#include <netinet/ether.h>"
+ else dnl BSD
+ AC_CHECK_TYPE([struct ether_addr], , , [#include <net/ethernet.h>])
+ if test "$ac_cv_type_struct_ether_addr" = "yes"; then
+- AC_DEFINE_UNQUOTED(HAVE_STRUCT_ETHER_ADDR, 1)
++ AC_DEFINE(HAVE_STRUCT_ETHER_ADDR, 1, [struct ether_addr])
+ ether_includes="#include <net/ethernet.h>"
+ else dnl Solaris
+ ac_cv_type_struct_ether_addr="no"
+@@ -83,7 +83,7 @@ else dnl BSD
+ [ac_cv_type_struct_ether_addr="yes"], [])
+ AC_MSG_RESULT($ac_cv_type_struct_ether_addr)
+ if test "$ac_cv_type_struct_ether_addr" = "yes"; then
+- AC_DEFINE_UNQUOTED(HAVE_STRUCT_ETHER_ADDR, 1)
++ AC_DEFINE(HAVE_STRUCT_ETHER_ADDR, 1, [struct ether_addr])
+ ether_includes="#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <net/if.h>
+@@ -99,11 +99,11 @@ dnl check struct members
+ if test "$ac_cv_type_struct_ether_addr" = "yes"; then
+ AC_CHECK_MEMBER([struct ether_addr.octet], , , [$ether_includes])
+ if test "$ac_cv_member_struct_ether_addr_octet" = "yes"; then
+- AC_DEFINE_UNQUOTED(HAVE_STRUCT_ETHER_ADDR_OCTET, 1)
++ AC_DEFINE(HAVE_STRUCT_ETHER_ADDR_OCTET, 1, [struct ether_addr.octet])
+ else
+ AC_CHECK_MEMBER([struct ether_addr.ether_addr_octet], , , [$ether_includes])
+ if test "$ac_cv_member_struct_ether_addr_ether_addr_octet" = "yes"; then
+- AC_DEFINE_UNQUOTED(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET, 1)
++ AC_DEFINE(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET, 1, [struct ether_addr.ether_addr_octet])
+ else
+ AC_MSG_ERROR([*** Found struct ether_addr, but no usable octet member... ***])
+ fi
+@@ -221,7 +221,7 @@ AC_CHECK_FUNC(ether_hostton, [ether_host
+ ])
+ AC_SUBST(EXTRA_LIBS)
+ if test x$ether_hostton = xyes; then
+- AC_DEFINE_UNQUOTED(HAVE_ETHER_HOSTTON, 1)
++ AC_DEFINE_UNQUOTED(HAVE_ETHER_HOSTTON, 1, [ether_hostton])
+ fi
+
+
+@@ -242,17 +242,6 @@ dnl *** Because of that, you won't be ab
+ dnl fi
+
+
+-dnl config.h.in defines
+-AC_DEFINE([HAVE_STRUCT_ETHER_ADDR], 0, [struct ether_addr])
+-AC_DEFINE([HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET], 0, [struct ether_addr.ether_addr_octet])
+-AC_DEFINE([HAVE_STRUCT_ETHER_ADDR_OCTET], 0, [struct ether_addr.octet])
+-AC_DEFINE([HAVE_ETHER_HOSTTON], 0, [ether_hostton])
+-
+-
+-dnl full featured warnings
+-CFLAGS="$CFLAGS -W -Wall -Wpointer-arith -Wimplicit-function-declaration"
+-
+-
+ dnl create the Makefiles
+ AC_OUTPUT([intl/Makefile po/Makefile.in
+ Makefile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110615/07ba0034/attachment-0001.html>
More information about the macports-changes
mailing list