diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-08-26 14:14:27 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-08-26 14:14:27 +0000 |
| commit | cca860d712ed622a35eb3dfc2e430fd543afb671 (patch) | |
| tree | cac3e6c309e960c8c09717560f4ecdeb87adac3f /devel/imake | |
| parent | e6462e847f741304b4e32e9124e12d315601c7f1 (diff) | |
| download | ports-cca860d712ed622a35eb3dfc2e430fd543afb671.tar.gz ports-cca860d712ed622a35eb3dfc2e430fd543afb671.zip | |
- Remove CONFLICT with XFree86-4
PR: 125992
Submitted by: Carlos Santos <unixmania@gmail.com>
Approved by: x11 (flz)
Notes
Notes:
svn path=/head/; revision=219224
Diffstat (limited to 'devel/imake')
| -rw-r--r-- | devel/imake/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/devel/imake/Makefile b/devel/imake/Makefile index aab6ab2584bd..26ed348acec4 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -18,8 +18,6 @@ RUN_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep \ makedepend:${PORTSDIR}/devel/makedepend \ ${PREFIX}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files -CONFLICTS= imake-4* - USE_PERL5= yes XORG_CAT= util @@ -29,7 +27,7 @@ USE_XORG= xproto .error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -MAN1= ccmakedep.1 \ +MAN1= ccmakedep.1 \ cleanlinks.1 \ imake.1 \ makeg.1 \ |