summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-12-21 09:03:31 +0000
committerClement Laforet <clement@FreeBSD.org>2004-12-21 09:03:31 +0000
commitba7018e2ac320d58e798739853471059087ba968 (patch)
tree2eae3295d21896b785522f966b18df5114ae663f
parent- Rework gpgme03 port to avoid conflict with gpgme 1.0 (diff)
- gpgme et gpgme03 are no longer in conflict
Notes
Notes: svn path=/head/; revision=124667
-rw-r--r--security/gpgme/Makefile2
-rw-r--r--security/gpgme03/Makefile2
2 files changed, 0 insertions, 4 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 99ead95e3d52..b48efa81eb33 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -19,8 +19,6 @@ BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
gpgsm:${PORTSDIR}/security/gnupg-devel
LIB_DEPENDS= gpg-error:${PORTSDIR}/security/libgpg-error
-CONFLICTS= gpgme-0.*
-
USE_LIBTOOL_VER=15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 8a7aa1b4512d..7c99911c4275 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -18,8 +18,6 @@ COMMENT= A library to make access to GnuPG easier
BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
-CONFLICTS= gpgme-1.*
-
LATEST_LINK= gpgme03
USE_INC_LIBTOOL_VER=13