ports/146321: [patch] misc/ossp-uuid headers conflicts with system

[vd at FreeBSD.org]

Synopsis: [patch] misc/ossp-uuid headers conflicts with system

Responsible-Changed-From-To: vd->x11
Responsible-Changed-By: vd
Responsible-Changed-When: Wed Jun 2 08:10:36 UTC 2010
Responsible-Changed-Why: 
Hello,

Here is an equivalent but simpler than the submitted patch for
misc/ossp-uuid:

--- cut ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/ossp-uuid/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile	29 Jul 2009 07:34:44 -0000	1.34
+++ Makefile	2 Jun 2010 08:09:15 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	uuid
 PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc devel
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
@@ -20,7 +20,8 @@
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-shared --enable-static --with-cxx
+CONFIGURE_ARGS=	--disable-shared --enable-static --with-cxx \
+		--includedir=${PREFIX}/include/ossp
 
 MAN1=	uuid-config.1 uuid.1
 MAN3=	uuid.3 uuid++.3
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/misc/ossp-uuid/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	12 Dec 2007 15:06:11 -0000	1.5
+++ pkg-plist	2 Jun 2010 08:09:15 -0000
@@ -1,7 +1,7 @@
 bin/uuid
 bin/uuid-config
-include/uuid.h
-include/uuid++.hh
+include/ossp/uuid.h
+include/ossp/uuid++.hh
 lib/libuuid.a
 lib/libuuid++.a
 lib/libuuid++.la
--- cut ---

but I believe the problem is in x11/libSM itself. If it does include
-I/usr/include before -I/usr/local/include then it will pick the right
uuid.h.

Assigning to the x11/libSM maintainer.

Thanks!


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