From nobody@FreeBSD.org  Sat Aug 20 00:25:27 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11913106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 20 Aug 2011 00:25:27 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 035AD8FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 20 Aug 2011 00:25:27 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7K0PQv2080506
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 20 Aug 2011 00:25:26 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7K0PQY2080475;
	Sat, 20 Aug 2011 00:25:26 GMT
	(envelope-from nobody)
Message-Id: <201108200025.p7K0PQY2080475@red.freebsd.org>
Date: Sat, 20 Aug 2011 00:25:26 GMT
From: Gabor PALI <pgj@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update] devel/libev: Update to 4.04
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         159932
>Category:       ports
>Synopsis:       [update] devel/libev: Update to 4.04
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vsevolod
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 20 00:30:09 UTC 2011
>Closed-Date:    Fri Sep 16 16:18:55 UTC 2011
>Last-Modified:  Fri Sep 16 16:20:05 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->vsevolod 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Aug 20 00:30:20 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159932 

From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
To: bug-followup@FreeBSD.org, pgj@FreeBSD.org
Cc:  
Subject: Re: ports/159932: [update] devel/libev: Update to 4.04
Date: Fri, 26 Aug 2011 16:58:52 +0400

 There is a problem in your patch. It install event.h header that would 
 conflict with devel/libevent port. So I have to add CONFLICTS with 
 libevent. The other option is to exclude event.h from install (that was 
 the option that I've used before). So what's your opinion on that?

From: Gabor PALI <pgj@FreeBSD.org>
To: Vsevolod Stakhov <vsevolod@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/159932: [update] devel/libev: Update to 4.04
Date: Mon, 29 Aug 2011 01:28:15 +0200

  Hi,
 
 On 08/26/11 14:58, Vsevolod Stakhov wrote:
 > what's your opinion [...]?
 
 I would prefer installing the event.h header too as it may be surprising
 for the user to have it discarded.  And with devel/libevent installed,
 it may be misleading since she may think that header is installed by
 devel/libev.
 
 In my humble opinion, the ultimate solution would be to ask both libev
 and libevent upstream to move their headers under something like
 $includedir/libev and $includedir/libevent, respectively.
 
 I have not really tested whether devel/hs-hlibev requires event.h to be
 present at all so not installing that file may cause breakage for it.
 
 
 Thanks,
 Gabor
 

From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
To: Gabor PALI <pgj@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/159932: [update] devel/libev: Update to 4.04
Date: Mon, 29 Aug 2011 14:30:36 +0400

 On 08/29/2011 04:10 AM, Gabor PALI wrote:
 > The following reply was made to PR ports/159932; it has been noted by GNATS.
 >
 > From: Gabor PALI<pgj@FreeBSD.org>
 > To: Vsevolod Stakhov<vsevolod@FreeBSD.org>
 > Cc: bug-followup@FreeBSD.org
 > Subject: Re: ports/159932: [update] devel/libev: Update to 4.04
 > Date: Mon, 29 Aug 2011 01:28:15 +0200
 >
 >    Hi,
 >
 >   On 08/26/11 14:58, Vsevolod Stakhov wrote:
 >   >  what's your opinion [...]?
 >
 >   I would prefer installing the event.h header too as it may be surprising
 >   for the user to have it discarded.  And with devel/libevent installed,
 >   it may be misleading since she may think that header is installed by
 >   devel/libev.
 
 Well, here are my points when I've decided NOT to install event.h in 
 libev port.
 
 First of all libev install event.h for those applications that are using 
 libevent interface but via emulating libevent API by libev. So ports 
 that depends on libev MUST NOT use event.h header in any way (they 
 should definitely use ev.h header). And ports that are depending on 
 libevent MUST use event.h header and MUST depend on devel/libevent and 
 on devel/libev. So installing event.h header by libev is a confusing 
 action. If devel/libevent would be made as a conflict for devel/libev 
 ports depending libevent still would be broken without it. And ports 
 depending on libev are not using event.h header. So from my point of 
 view this file is useless.
 
 >   In my humble opinion, the ultimate solution would be to ask both libev
 >   and libevent upstream to move their headers under something like
 >   $includedir/libev and $includedir/libevent, respectively.
 
 Yes, but this requires review of all ports depending on libev or 
 libevent and maybe adding some knobs to portmk like
 USE_EVENT= libevent
 or
 USE_EVENT= libev
 or even
 USE_EVENT= any
 
 >   I have not really tested whether devel/hs-hlibev requires event.h to be
 >   present at all so not installing that file may cause breakage for it.
 
 Well, libev community grows rather fast, so it is definitely required to 
 solve conflicts between these two libraries.
 
 -- 
 Vsevolod Stakhov

From: Gabor PALI <pgj@FreeBSD.org>
To: Vsevolod Stakhov <vsevolod@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/159932: [update] devel/libev: Update to 4.04
Date: Mon, 29 Aug 2011 21:22:07 +0200

  On 08/29/11 12:30, Vsevolod Stakhov wrote:
 > First of all libev install event.h for those applications that are
 > using libevent interface but via emulating libevent API by libev.
 
 Right.  Now I understand your point.  I will test devel/hs-hlibev
 without event.h installed (by devel/libev) and get back to you with the
 results.  I expect it to work but better safe than sorry.
 
 
 > Well, libev community grows rather fast, so it is definitely required
 > to solve conflicts between these two libraries.
 
 I do not really want to make a problem out of this issue, but it is
 indeed need to be taken care of in the long run.
 
State-Changed-From-To: open->closed 
State-Changed-By: vsevolod 
State-Changed-When: Fri Sep 16 16:18:40 UTC 2011 
State-Changed-Why:  
Committed with some modifications, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159932 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/159932: commit references a PR
Date: Fri, 16 Sep 2011 16:17:56 +0000 (UTC)

 vsevolod    2011-09-16 16:17:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/libev          Makefile distinfo pkg-plist 
     devel/libev/files    patch-configure patch-ev.c 
   Added files:
     devel/libev/files    libev.pc.in 
   Removed files:
     devel/libev/files    patch-ev++.h 
   Log:
   - Update to 4.04 [1]
   - Add libev.pc [2]
   
   PR:             159932 [1], 160030 [2]
   Submitted by:   pgj [1], Aldis Berjoza <aldis at bsdroot.lv> [2]
   
   Revision  Changes    Path
   1.11      +9 -6      ports/devel/libev/Makefile
   1.10      +2 -2      ports/devel/libev/distinfo
   1.1       +10 -0     ports/devel/libev/files/libev.pc.in (new)
   1.2       +12 -46    ports/devel/libev/files/patch-configure
   1.2       +0 -32     ports/devel/libev/files/patch-ev++.h (dead)
   1.2       +4 -4      ports/devel/libev/files/patch-ev.c
   1.4       +2 -1      ports/devel/libev/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
