ports/159932: [update] devel/libev: Update to 4.04

Sat Aug 20 00:30:10 UTC 2011

>Number:         159932
>Category:       ports
>Synopsis:       [update] devel/libev: Update to 4.04
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 20 00:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Gabor PALI
>Release:        n/a
>Organization:
The FreeBSD Project
>Environment:
n/a
>Description:
Update to 4.04.  It is important to make devel/hs-hlibev work correctly as it
does not link properly with libev 3.x.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/libev/Makefile b/devel/libev/Makefile
index 27c0782..c090eb4 100644
--- a/devel/libev/Makefile
+++ b/devel/libev/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libev
-PORTVERSION=	3.9
-PORTREVISION=	1
+PORTVERSION=	4.04
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://dist.schmorp.de/libev/ \
@@ -21,10 +20,4 @@ USE_LDCONFIG=	yes
 
 MAN3=		ev.3
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/if EV_MINIMAL/if defined(EV_MINIMAL) \&\& EV_MINIMAL/g' \
-		${WRKSRC}/ev.h \
-		${WRKSRC}/ev.c \
-		${WRKSRC}/ev++.h
-
 .include <bsd.port.mk>
diff --git a/devel/libev/distinfo b/devel/libev/distinfo
index 87ebea4..e36a858 100644
--- a/devel/libev/distinfo
+++ b/devel/libev/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libev-3.9.tar.gz) = 0b81cb55a8eb0a2e3d2364a397e244812dd6dd496e860ed7bf143e39e4c21c2e
-SIZE (libev-3.9.tar.gz) = 473062
+SHA256 (libev-4.04.tar.gz) = ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012
+SIZE (libev-4.04.tar.gz) = 471713
diff --git a/devel/libev/files/patch-Makefile.in b/devel/libev/files/patch-Makefile.in
deleted file mode 100644
index e553af7..0000000
--- a/devel/libev/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-08-09 16:33:08.000000000 +0400
-+++ Makefile.in	2009-08-17 18:56:33.497493279 +0400
-@@ -213,7 +213,7 @@
- 	     ev.3 ev.pod
- 
- man_MANS = ev.3
--include_HEADERS = ev.h ev++.h event.h
-+include_HEADERS = ev.h ev++.h
- lib_LTLIBRARIES = libev.la
- libev_la_SOURCES = ev.c event.c
- libev_la_LDFLAGS = -version-info $(VERSION_INFO)
diff --git a/devel/libev/files/patch-configure b/devel/libev/files/patch-configure
index 947059b..985565c 100644
--- a/devel/libev/files/patch-configure
+++ b/devel/libev/files/patch-configure
@@ -1,50 +1,16 @@
---- configure.orig	2008-01-21 14:41:04.171283374 +0300
-+++ configure	2008-01-21 14:42:41.856789774 +0300
-@@ -3458,18 +3458,6 @@
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
- fi
- { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
- echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-@@ -5473,18 +5461,6 @@
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
- fi
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -19140,9 +19116,6 @@
- 
+--- ./configure.orig	2011-02-16 09:03:29.000000000 +0100
++++ ./configure	2011-08-19 16:59:46.000000000 +0200
+@@ -10433,13 +10433,6 @@
  
+ # Only expand once:
  
+-
+-
 -if test "x$GCC" = xyes ; then
--  CFLAGS="$CFLAGS -O3"
+-  CFLAGS="-O3 $CFLAGS"
 -fi
- 
- 
- 
+-
+-
+ for ac_header in sys/inotify.h sys/epoll.h sys/event.h port.h poll.h sys/select.h sys/eventfd.h sys/signalfd.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/devel/libev/files/patch-ev++.h b/devel/libev/files/patch-ev++.h
deleted file mode 100644
index da46ef2..0000000
--- a/devel/libev/files/patch-ev++.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- ev++.h.orig	2009-08-17 19:12:04.000000000 +0400
-+++ ev++.h	2009-08-17 19:20:40.000000000 +0400
-@@ -76,7 +76,7 @@
-     ASYNC    = EV_ASYNC,
-     EMBED    = EV_EMBED,
- #   undef ERROR // some systems stupidly #define ERROR
--    ERROR    = EV_ERROR,
-+    ERROR    = EV_ERROR
-   };
- 
-   enum
-@@ -464,7 +464,7 @@
-     }
- 
-     template<class K, void (K::*method)(watcher &w, int)>
--    static void method_thunk (EV_P_ ev_watcher *w, int revents)
-+    static void method_thunk (struct ev_loop *, ev_watcher *w, int revents)
-     {
-       (static_cast<K *>(w->data)->*method)
-         (*static_cast<watcher *>(w), revents);
-@@ -478,9 +478,9 @@
-     }
- 
-     template<class K, void (K::*method)()>
--    static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents)
-+    static void method_noargs_thunk (struct ev_loop *, ev_watcher *w, int /*revents*/)
-     {
--      static_cast<K *>(w->data)->*method
-+      (static_cast<K *>(w->data)->*method)
-         ();
-     }
- 
diff --git a/devel/libev/files/patch-ev.c b/devel/libev/files/patch-ev.c
index 945cf98..1821cc6 100644
--- a/devel/libev/files/patch-ev.c
+++ b/devel/libev/files/patch-ev.c
@@ -1,8 +1,8 @@
---- ev.c.orig  2010-08-16 08:33:48.667681306 +0200
-+++ ev.c       2010-08-16 08:33:51.449982136 +0200
-@@ -1470,10 +1470,12 @@
+--- ./ev.c.orig	2011-02-09 00:17:37.000000000 +0100
++++ ./ev.c	2011-08-19 17:01:35.000000000 +0200
+@@ -1591,10 +1591,12 @@
    unsigned int flags = ev_supported_backends ();
-
+ 
  #ifndef __NetBSD__
 +#ifndef __FreeBSD__
    /* kqueue is borked on everything but netbsd apparently */
diff --git a/devel/libev/pkg-plist b/devel/libev/pkg-plist
index f968530..82856be 100644
--- a/devel/libev/pkg-plist
+++ b/devel/libev/pkg-plist
@@ -1,6 +1,7 @@
 lib/libev.a
 lib/libev.la
 lib/libev.so
-lib/libev.so.3
+lib/libev.so.4
 include/ev.h
 include/ev++.h
+include/event.h


>Release-Note:
>Audit-Trail:
>Unformatted:

