diff options
| author | dbn <dbn@FreeBSD.org> | 2014-12-29 04:39:48 +0800 |
|---|---|---|
| committer | dbn <dbn@FreeBSD.org> | 2014-12-29 04:39:48 +0800 |
| commit | 932cedc474ef679e035abbb00b0579408d466f9d (patch) | |
| tree | 6669e177b253f20e1b53b822b5e571ab184d52fd /emulators/wine-devel | |
| parent | 7db558fabb573a00000c115ab8850aa5879914c9 (diff) | |
| download | freebsd-ports-gnome-932cedc474ef679e035abbb00b0579408d466f9d.tar.gz freebsd-ports-gnome-932cedc474ef679e035abbb00b0579408d466f9d.tar.zst freebsd-ports-gnome-932cedc474ef679e035abbb00b0579408d466f9d.zip | |
Fix CONFLICTS_INSTALL for wine-devel and related ports.
Changes:
- Fix install conflicts [1] (for the "newly" added compholio port)
- nvidia.sh: Gracefully handle a corrupt nVidia tarball
- nvidia.sh: Provide checksum and size information for nVidia tarball
- Bump master port [1] due to changes to nvidia.sh and conflicts
Approved by: gerald@ [1]
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 3985f2cb27fc..0e924151b492 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= wine DISTVERSION= 1.7.33 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -22,7 +22,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ prelink:${PORTSDIR}/sysutils/prelink LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 -CONFLICTS_INSTALL= i386-wine-[0-9]* i386-wine-devel-[0-9]* wine-[0-9]* +CONFLICTS_INSTALL= wine-[0-9]* wine-compholio-[0-9]* i386-wine-[0-9]* \ + i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib |