On Sat, Sep 12, 2009 at 07:43:37PM +0100, Stuart Henderson wrote:
> On 2009/09/12 15:51, Christian Weisgerber wrote:
> > Landry Breuil <lan...@rhaalovely.net> wrote:
> >
> > > for libev:
> >
> > (Imported as devel/libev.)
> > This installs an event.h include file that shadows /usr/include/event.h.
>
> What's the right thing to do here, move it to a subdirectory e.g.
> /usr/local/include/libev?
Yeah, iirc that's the usual fix - renaming the header will only make
things harder imo. Diffs attached.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libev/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 2 Sep 2009 19:19:43 -0000 1.1.1.1
+++ Makefile 13 Sep 2009 09:18:24 -0000
@@ -4,6 +4,7 @@
DISTNAME = libev-3.8
CATEGORIES = devel
+PKGNAME = ${DISTNAME}p0
MAINTAINER = Bapt <baptiste.darous...@gmail.com>
@@ -22,5 +23,7 @@
USE_LIBTOOL = Yes
CONFIGURE_STYLE = gnu
+
+FAKE_FLAGS = includedir='${PREFIX}/include/libev'
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libev/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 2 Sep 2009 19:19:43 -0000 1.1.1.1
+++ pkg/PLIST 13 Sep 2009 09:18:24 -0000
@@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/09/02 19:19:43 landry Exp $
%%SHARED%%
-include/ev++.h
-include/ev.h
-include/event.h
+include/libev/
+include/libev/ev++.h
+include/libev/ev.h
+include/libev/event.h
lib/libev.a
lib/libev.la
@man man/man3/ev.3
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 2 Sep 2009 19:26:17 -0000 1.1.1.1
+++ Makefile 13 Sep 2009 11:43:24 -0000
@@ -3,7 +3,7 @@
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-3.c
-PKGNAME = i3-3.3
+PKGNAME = i3-3.3p0
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
Index: patches/patch-common_mk
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-common_mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-common_mk
--- patches/patch-common_mk 2 Sep 2009 19:26:17 -0000 1.1.1.1
+++ patches/patch-common_mk 13 Sep 2009 11:43:24 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-common_mk,v 1.1.1.1 2009/09/02 19:26:17 landry Exp $
--- common.mk.orig Wed Aug 19 14:39:09 2009
-+++ common.mk Wed Sep 2 21:23:04 2009
-@@ -9,7 +9,7 @@ CFLAGS += -pipe
++++ common.mk Sun Sep 13 13:35:41 2009
+@@ -9,7 +9,8 @@ CFLAGS += -pipe
CFLAGS += -Wall
CFLAGS += -Wunused
CFLAGS += -Iinclude
-CFLAGS += -I/usr/local/include
+CFLAGS += -I${LOCALBASE}/include
++CFLAGS += -I${LOCALBASE}/include/libev
CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
# Check if pkg-config is installed, because without pkg-config, the following
-@@ -38,7 +38,7 @@ LDFLAGS += -lxcb-icccm
+@@ -38,7 +39,7 @@ LDFLAGS += -lxcb-icccm
LDFLAGS += -lxcb-xinerama
LDFLAGS += -lX11
LDFLAGS += -lev
@@ -19,7 +20,7 @@
ifeq ($(UNAME),NetBSD)
# We need -idirafter instead of -I to prefer the systemâs iconv over GNU
libiconv
-@@ -50,6 +50,13 @@ ifeq ($(UNAME),FreeBSD)
+@@ -50,6 +51,13 @@ ifeq ($(UNAME),FreeBSD)
LDFLAGS += -liconv
endif
@@ -33,7 +34,7 @@
ifeq ($(UNAME),Linux)
CFLAGS += -D_GNU_SOURCE
endif
-@@ -61,9 +68,6 @@ CFLAGS += -g3
+@@ -61,9 +69,6 @@ CFLAGS += -g3
else
CFLAGS += -O2
endif
