diff options
| author | matthew <matthew@FreeBSD.org> | 2017-07-26 05:45:58 +0800 |
|---|---|---|
| committer | matthew <matthew@FreeBSD.org> | 2017-07-26 05:45:58 +0800 |
| commit | 89a207dcdea271c08e3cc4cd3f90b9d00f33279a (patch) | |
| tree | 0eb7d9eab07021d7de82036a884bf0454a80ca57 /devel | |
| parent | efb249189c4c5c1a95b459a30f8dfc51b27529e1 (diff) | |
| download | freebsd-ports-gnome-89a207dcdea271c08e3cc4cd3f90b9d00f33279a.tar.gz freebsd-ports-gnome-89a207dcdea271c08e3cc4cd3f90b9d00f33279a.tar.zst freebsd-ports-gnome-89a207dcdea271c08e3cc4cd3f90b9d00f33279a.zip | |
Partially revert r446612 -- remove the CONFLICTS_INSTALL lines,
because these ports do not actually conflict.
PointyHat to: me
Reported by: jonc@chen.org.nz
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/maven/Makefile | 2 | ||||
| -rw-r--r-- | devel/maven3/Makefile | 2 | ||||
| -rw-r--r-- | devel/maven31/Makefile | 2 | ||||
| -rw-r--r-- | devel/maven33/Makefile | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/devel/maven/Makefile b/devel/maven/Makefile index e83715ecfe4c..52e74283d9b6 100644 --- a/devel/maven/Makefile +++ b/devel/maven/Makefile @@ -14,8 +14,6 @@ LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper -CONFLICTS_INSTALL= maven3-* maven31-* maven33-* - USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile index 68b73ccaab54..78d8043c6630 100644 --- a/devel/maven3/Makefile +++ b/devel/maven3/Makefile @@ -14,8 +14,6 @@ LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper -CONFLICTS_INSTALL= maven-* maven33-* maven31-* - USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile index 8046eac901b1..c6765da4982d 100644 --- a/devel/maven31/Makefile +++ b/devel/maven31/Makefile @@ -15,8 +15,6 @@ LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper -CONFLICTS_INSTALL= maven-* maven3-* maven33-* - USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache diff --git a/devel/maven33/Makefile b/devel/maven33/Makefile index 8185a6825bdb..92e45f1fe849 100644 --- a/devel/maven33/Makefile +++ b/devel/maven33/Makefile @@ -13,8 +13,6 @@ LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper -CONFLICTS_INSTALL= maven-* maven3-* maven31-* - USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache |