diff options
author | tnn <tnn> | 2010-01-29 15:05:00 +0000 |
---|---|---|
committer | tnn <tnn> | 2010-01-29 15:05:00 +0000 |
commit | 60a0553e3f7f775543692b40b6e67f3f353dddfa (patch) | |
tree | 2ae226e2696ce4fc1aeb595c5b122d0e6564e50e | |
parent | 7a3f4de160f986e61dab64ad09737e870ebebd16 (diff) | |
download | pkgsrc-60a0553e3f7f775543692b40b6e67f3f353dddfa.tar.gz |
avoid conflicts with libevent
-rw-r--r-- | devel/libev/Makefile | 8 | ||||
-rw-r--r-- | devel/libev/PLIST | 10 | ||||
-rw-r--r-- | devel/libev/buildlink3.mk | 11 |
3 files changed, 18 insertions, 11 deletions
diff --git a/devel/libev/Makefile b/devel/libev/Makefile index 04c38189a99..0961d795cb2 100644 --- a/devel/libev/Makefile +++ b/devel/libev/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2010/01/20 14:06:55 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/01/29 15:05:00 tnn Exp $ DISTNAME= libev-3.9 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://dist.schmorp.de/libev/ @@ -9,13 +10,14 @@ HOMEPAGE= http://software.schmorp.de/pkg/libev.html COMMENT= Full-featured and high-performance event loop LICENSE= modified-bsd OR gnu-gpl-v2 # NOTE: 2-clause BSD -CONFLICTS+= libevent-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_LIBTOOL= yes #TEST_TARGET= verify -PKG_DESTDIR_SUPPORT= user-destdir +CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ev +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ev .include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libev/PLIST b/devel/libev/PLIST index cd7c304f278..a3b52d5a7d3 100644 --- a/devel/libev/PLIST +++ b/devel/libev/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/08 19:40:37 sno Exp $ -include/ev++.h -include/ev.h -include/event.h -lib/libev.la +@comment $NetBSD: PLIST,v 1.2 2010/01/29 15:05:00 tnn Exp $ +include/ev/ev++.h +include/ev/ev.h +include/ev/event.h +lib/ev/libev.la man/man3/ev.3 diff --git a/devel/libev/buildlink3.mk b/devel/libev/buildlink3.mk index a1a6e580b57..7f67c45b7c3 100644 --- a/devel/libev/buildlink3.mk +++ b/devel/libev/buildlink3.mk @@ -1,13 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/08/18 14:10:53 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2010/01/29 15:05:00 tnn Exp $ BUILDLINK_TREE+= libev .if !defined(LIBEV_BUILDLINK3_MK) LIBEV_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libev+=libev>=3.8 -BUILDLINK_ABI_DEPENDS.libev+=libev>=3.8 +BUILDLINK_API_DEPENDS.libev+=libev>=3.9nb1 +BUILDLINK_ABI_DEPENDS.libev+=libev>=3.9nb1 BUILDLINK_PKGSRCDIR.libev?= ../../devel/libev + +BUILDLINK_LIBDIRS.libev+= lib/ev +BUILDLINK_RPATHDIRS.libev+= lib/ev +BUILDLINK_INCDIRS.libev+= include/ev + .endif # LIBEV_BUILDLINK3_MK BUILDLINK_TREE+= -libev |