From 60440986b82e1e81a8b6cf3858138527fedb5f6a Mon Sep 17 00:00:00 2001 From: dcoppa Date: Tue, 23 Apr 2013 18:59:53 +0000 Subject: [PATCH] Update to libev-4.15. While here, merge PFRAG.shared into PLIST. OK sthen@ --- devel/libev/Makefile | 7 ++--- devel/libev/distinfo | 4 +-- devel/libev/patches/patch-Makefile_in | 8 +++--- devel/libev/patches/patch-configure | 8 +++--- devel/libev/patches/patch-ev_c | 41 --------------------------- devel/libev/pkg/PFRAG.shared | 2 -- devel/libev/pkg/PLIST | 4 +-- 7 files changed, 15 insertions(+), 59 deletions(-) delete mode 100644 devel/libev/patches/patch-ev_c delete mode 100644 devel/libev/pkg/PFRAG.shared diff --git a/devel/libev/Makefile b/devel/libev/Makefile index 08c62e4c75e..f2133ae78b5 100644 --- a/devel/libev/Makefile +++ b/devel/libev/Makefile @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.12 2013/03/21 08:45:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2013/04/23 18:59:53 dcoppa Exp $ COMMENT = high-performance event loop library -DISTNAME = libev-4.11 -REVISION = 0 +DISTNAME = libev-4.15 CATEGORIES = devel MAINTAINER = David Coppa -SHARED_LIBS= ev 3.0 # 4.0 +SHARED_LIBS= ev 3.1 # 4.0 HOMEPAGE = http://software.schmorp.de/pkg/libev.html MASTER_SITES = http://dist.schmorp.de/libev/ \ diff --git a/devel/libev/distinfo b/devel/libev/distinfo index e7e4d30c84e..e63b0720670 100644 --- a/devel/libev/distinfo +++ b/devel/libev/distinfo @@ -1,2 +1,2 @@ -SHA256 (libev-4.11.tar.gz) = n1Xxb/bk1gobH6f0lir2l2hGjw18NiqrY4f1ICCTjN8= -SIZE (libev-4.11.tar.gz) = 484766 +SHA256 (libev-4.15.tar.gz) = st1DoHNVb1NQy+0Ftu9ETcxLVj9OCxAJ179EgmFgb+s= +SIZE (libev-4.15.tar.gz) = 513919 diff --git a/devel/libev/patches/patch-Makefile_in b/devel/libev/patches/patch-Makefile_in index daf8c463537..0e5770a9eb1 100644 --- a/devel/libev/patches/patch-Makefile_in +++ b/devel/libev/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2012/02/22 10:50:47 dcoppa Exp $ ---- Makefile.in.orig Sat Feb 4 20:09:41 2012 -+++ Makefile.in Wed Feb 22 10:49:15 2012 -@@ -233,9 +233,9 @@ EXTRA_DIST = LICENSE Changes libev.m4 autogen.sh \ +$OpenBSD: patch-Makefile_in,v 1.4 2013/04/23 18:59:53 dcoppa Exp $ +--- Makefile.in.orig Fri Mar 1 12:10:35 2013 ++++ Makefile.in Tue Apr 23 08:54:04 2013 +@@ -267,9 +267,9 @@ EXTRA_DIST = LICENSE Changes libev.m4 autogen.sh \ ev.3 ev.pod Symbols.ev Symbols.event man_MANS = ev.3 diff --git a/devel/libev/patches/patch-configure b/devel/libev/patches/patch-configure index b8a5da3ffe5..e7f5b971f60 100644 --- a/devel/libev/patches/patch-configure +++ b/devel/libev/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2012/02/22 10:50:47 dcoppa Exp $ ---- configure.orig Wed Feb 22 10:49:46 2012 -+++ configure Wed Feb 22 10:50:17 2012 -@@ -3811,11 +3811,6 @@ fi +$OpenBSD: patch-configure,v 1.4 2013/04/23 18:59:53 dcoppa Exp $ +--- configure.orig Fri Mar 1 12:10:34 2013 ++++ configure Tue Apr 23 08:54:04 2013 +@@ -3708,11 +3708,6 @@ fi diff --git a/devel/libev/patches/patch-ev_c b/devel/libev/patches/patch-ev_c deleted file mode 100644 index 39e6d8c14e1..00000000000 --- a/devel/libev/patches/patch-ev_c +++ /dev/null @@ -1,41 +0,0 @@ -$OpenBSD: patch-ev_c,v 1.4 2012/12/28 18:27:23 dcoppa Exp $ - -Add support for OpenBSD/alpha and OpenBSD/mips64 (latter from ev.c -r1.412). - -Add support for OpenBSD/hppa - ---- ev.c.orig Sat Feb 4 20:09:52 2012 -+++ ev.c Fri Dec 28 19:16:35 2012 -@@ -559,12 +559,12 @@ struct signalfd_siginfo - #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 - #if __i386 || __i386__ - #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") -- #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ -- #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ -+ #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") -+ #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") - #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ - #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") -- #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") -- #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ -+ #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") -+ #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") - #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ - #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") - #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \ -@@ -579,6 +579,15 @@ struct signalfd_siginfo - #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") - #elif defined(__s390__) || defined(__s390x__) - #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") -+ #elif defined(__mips__) -+ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") -+ #elif defined(__alpha__) -+ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") -+ #elif defined(__hppa__) -+ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") -+ #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") -+ #elif defined(__ia64__) -+ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") - #endif - #endif - #endif diff --git a/devel/libev/pkg/PFRAG.shared b/devel/libev/pkg/PFRAG.shared deleted file mode 100644 index eaead7bddb8..00000000000 --- a/devel/libev/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/09/02 19:19:43 landry Exp $ -@lib lib/libev.so.${LIBev_VERSION} diff --git a/devel/libev/pkg/PLIST b/devel/libev/pkg/PLIST index 0ef9ec4ed84..95783cfdc33 100644 --- a/devel/libev/pkg/PLIST +++ b/devel/libev/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/09/14 15:53:09 landry Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.3 2013/04/23 18:59:53 dcoppa Exp $ include/ev++.h include/ev.h lib/libev.a lib/libev.la +@lib lib/libev.so.${LIBev_VERSION} @man man/man3/ev.3