diff options
| author | David Naylor <dbn@FreeBSD.org> | 2013-08-11 18:13:10 +0000 |
|---|---|---|
| committer | David Naylor <dbn@FreeBSD.org> | 2013-08-11 18:13:10 +0000 |
| commit | 0c322f344efbf5d50e67d881b2a74f1fb1e8de87 (patch) | |
| tree | 767491d0781212554a0e56caae60468ed383bf11 /emulators/wine-devel | |
| parent | 5ac48d4ed44360f8ee3f6f29be6f7a85b4d20fa3 (diff) | |
| download | ports-0c322f344efbf5d50e67d881b2a74f1fb1e8de87.tar.gz ports-0c322f344efbf5d50e67d881b2a74f1fb1e8de87.zip | |
Backport changes from emulators/wine-devel and add CONFLICTS_INSTALL.
The backported changes allow the i386-wine(-devel) ports to install wine
in such a manor that it can run on FreeBSD/amd64.
The CONFLICTS_INSTALL conflict with the i386-wine packages and the correct
stable/devel packages (including the upcoming stable wine).
Approved by: gerald@ (implicit)
Notes
Notes:
svn path=/head/; revision=324603
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 507c43202d1a..b3a93f78e232 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ png15:${PORTSDIR}/graphics/png \ xml2:${PORTSDIR}/textproc/libxml2 -CONFLICTS_INSTALL= wine-1.4* +CONFLICTS_INSTALL= i386-wine-* wine-1.4* wine-1.6* LATEST_LINK?= wine-devel CPPFLAGS+= -I${LOCALBASE}/include |