diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2006-12-21 15:13:49 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2006-12-21 15:13:49 +0000 |
| commit | 7acfd05886186d38794cb053fb88a42f2948033a (patch) | |
| tree | eff278adac306eed51a45dfcfb6e47301443af51 | |
| parent | 39a00baf0e2e6f8557900dbe1f71a784b320d335 (diff) | |
| download | ports-7acfd05886186d38794cb053fb88a42f2948033a.tar.gz ports-7acfd05886186d38794cb053fb88a42f2948033a.zip | |
gnupg-devel and gnupg-2.x conflict.
Notes
Notes:
svn path=/head/; revision=180334
| -rw-r--r-- | security/gnupg-devel/Makefile | 2 | ||||
| -rw-r--r-- | security/gnupg/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile index 98a59d25f196..1e27165d8df3 100644 --- a/security/gnupg-devel/Makefile +++ b/security/gnupg-devel/Makefile @@ -24,6 +24,8 @@ LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \ RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 \ dirmngr:${PORTSDIR}/security/dirmngr +CONFLICTS= gnupg-2.* + USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=# empty diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 77aa4f322f89..8279a72fa86e 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -23,6 +23,8 @@ LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \ pth.20:${PORTSDIR}/devel/pth RUN_DEPENDS= dirmngr:${PORTSDIR}/security/dirmngr +CONFLICTS= gnupg-devel-[0-9]* + USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES |