diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2014-03-18 07:59:46 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2014-03-18 07:59:46 +0000 |
| commit | f0b26e7b11a24247596d4d5f0429c6d5f904c1ea (patch) | |
| tree | 4dcdf90ce399a5f140f94cccd65c53e1243fd0a5 /misc/ossp-uuid | |
| parent | be2a15a9580d1fc6b2ddae23515c140d4ec4be61 (diff) | |
| download | ports-f0b26e7b11a24247596d4d5f0429c6d5f904c1ea.tar.gz ports-f0b26e7b11a24247596d4d5f0429c6d5f904c1ea.zip | |
Followup to r347563: revert a change that sneaked in.
Notes
Notes:
svn path=/head/; revision=348522
Diffstat (limited to 'misc/ossp-uuid')
| -rw-r--r-- | misc/ossp-uuid/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile index aebb16d25047..c663b5b97d08 100644 --- a/misc/ossp-uuid/Makefile +++ b/misc/ossp-uuid/Makefile @@ -12,8 +12,6 @@ PKGNAMEPREFIX= ossp- MAINTAINER= vd@FreeBSD.org COMMENT= ISO-C API and CLI for generating Universally Unique Identifiers -#CONFLICTS= e2fsprogs-libuuid-[0-9]* - GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-shared --enable-static --with-cxx \ @@ -21,6 +19,8 @@ CONFIGURE_ARGS= --disable-shared --enable-static --with-cxx \ .if defined(SLAVEPORT) && ${SLAVEPORT}=="perl" PKGNAMEPREFIX= p5-OSSP- +.else +CONFLICTS= e2fsprogs-libuuid-[0-9]* .endif .include <bsd.port.pre.mk> |