diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2012-06-10 18:10:08 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2012-06-10 18:10:08 +0000 |
| commit | f1263022a12c74c2db2633ec01b9ca80d0da0716 (patch) | |
| tree | 04e660f5c46b09df7a0fba350ef78e881faadd48 | |
| parent | - Add OPTIONS to allow the selective installation of backends. [1] (diff) | |
Install misc/ossp-uuid header files into PREFIX/include/ossp instead
of PREFIX/include because they conflict with system /usr/include/uuid.h
PR: ports/146321
Notes
Notes:
svn path=/head/; revision=298968
| -rw-r--r-- | misc/ossp-uuid/Makefile | 5 | ||||
| -rw-r--r-- | misc/ossp-uuid/files/patch-uuid.pc.in | 11 | ||||
| -rw-r--r-- | misc/ossp-uuid/pkg-plist | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile index 2198a92a981e..3161e8b80748 100644 --- a/misc/ossp-uuid/Makefile +++ b/misc/ossp-uuid/Makefile @@ -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 @@ CONFLICTS= e2fsprogs-libuuid-[0-9]* 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 diff --git a/misc/ossp-uuid/files/patch-uuid.pc.in b/misc/ossp-uuid/files/patch-uuid.pc.in new file mode 100644 index 000000000000..b1bd5027a2df --- /dev/null +++ b/misc/ossp-uuid/files/patch-uuid.pc.in @@ -0,0 +1,11 @@ +--- uuid.pc.in.orig 2012-06-10 21:06:03.000000000 +0300 ++++ uuid.pc.in 2012-06-10 21:06:18.000000000 +0300 +@@ -29,7 +29,7 @@ + + prefix=@prefix@ + exec_prefix=${prefix} +-includedir=${prefix}/include ++includedir=@includedir@ + libdir=${exec_prefix}/lib + + Name: OSSP uuid diff --git a/misc/ossp-uuid/pkg-plist b/misc/ossp-uuid/pkg-plist index 70ddeb9ac67a..f6c8757a901e 100644 --- a/misc/ossp-uuid/pkg-plist +++ b/misc/ossp-uuid/pkg-plist @@ -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 @@ -14,3 +14,4 @@ libdata/pkgconfig/uuid.pc %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OSSP +@dirrmtry include/ossp |