diff options
| author | vd <vd@FreeBSD.org> | 2014-03-18 15:59:46 +0800 |
|---|---|---|
| committer | vd <vd@FreeBSD.org> | 2014-03-18 15:59:46 +0800 |
| commit | 4e0b24eb0c348c4055dbbe3e556f3884a1ede87f (patch) | |
| tree | 4dcdf90ce399a5f140f94cccd65c53e1243fd0a5 /misc | |
| parent | 7434dc445c27daba8c9bb49b5f2a4f2d927263a7 (diff) | |
| download | freebsd-ports-gnome-4e0b24eb0c348c4055dbbe3e556f3884a1ede87f.tar.gz freebsd-ports-gnome-4e0b24eb0c348c4055dbbe3e556f3884a1ede87f.tar.zst freebsd-ports-gnome-4e0b24eb0c348c4055dbbe3e556f3884a1ede87f.zip | |
Followup to r347563: revert a change that sneaked in.
Diffstat (limited to 'misc')
| -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> |