svn commit: r324612 - head/emulators/i386-wine-devel

[David Naylor]

Author: dbn
Date: Mon Aug 12 06:07:05 2013
New Revision: 324612
URL: http://svnweb.freebsd.org/changeset/ports/324612

Log:
  Fix emulators/i386-wine-devel when installing on -current.
  
  Correct version detection to complain when installing outside the
  supported range (8.3+ and 9.1+).
  
  Also, exclude ldconfig data from pkg-plist.
  
  Reported by:	Sergey V. Dyatko

Modified:
  head/emulators/i386-wine-devel/Makefile.i386
  head/emulators/i386-wine-devel/Makefile.inc
  head/emulators/i386-wine-devel/pkg-plist

Modified: head/emulators/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386	Mon Aug 12 05:05:45 2013	(r324611)
+++ head/emulators/i386-wine-devel/Makefile.i386	Mon Aug 12 06:07:05 2013	(r324612)
@@ -13,7 +13,7 @@ PKGDEINSTALL=	${PKGINSTALL}
 
 RUN_DEPENDS=	dri>0:${PORTSDIR}/graphics/dri
 
-CONFLICTS_INSTALL=	i386-wine-1.6* wine-[0-9]*
+CONFLICTS_INSTALL=	i386-wine-1.4* i386-wine-1.6* wine-[0-9]*
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}-devel
 
 ACTUAL-PACKAGE-DEPENDS=	${DO_NADA}

Modified: head/emulators/i386-wine-devel/Makefile.inc
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.inc	Mon Aug 12 05:05:45 2013	(r324611)
+++ head/emulators/i386-wine-devel/Makefile.inc	Mon Aug 12 06:07:05 2013	(r324612)
@@ -22,11 +22,12 @@ OPTIONS_DEFINE=	GECKO MONO
 GECKO_DESC=     Bundle Gecko MSI package for Wine
 MONO_DESC=      Bundle Mono MSI package for Wine
 
-EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
-				--exclude +MTREE_DIRS --exclude share/licenses/'*'
-CONFLICTS_INSTALL=	i386-wine-1.6* wine-[0-9]*
+CONFLICTS_INSTALL=	i386-wine-1.4* i386-wine-1.6* wine-[0-9]*
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}-devel
 
+EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
+				--exclude +MTREE_DIRS --exclude share/licenses/'*' \
+				--exclude libdata/ldconfig32/${LATEST_LINK}
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	wine only runs on x86 architecture
@@ -39,8 +40,9 @@ USE_XZ=		yes
 
 .include <bsd.port.pre.mk>
 
-.if (${OSVERSION} >= 80300 && ${OSVERSION} < 90000) && (${OSVERSION} >= 90100 && ${OSVERSION} < 100000)
-IGNORE=		binaries compiled for FreeBSD 8.3+ and 9.1+
+.if !(${OSVERSION} >= 803000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000)
+IGNORE=		binaries compiled for FreeBSD 8.3+ and 9.1+ only
+DISTFILES=
 .endif
 
 .if ${PORT_OPTIONS:MGECKO}

Modified: head/emulators/i386-wine-devel/pkg-plist
==============================================================================
--- head/emulators/i386-wine-devel/pkg-plist	Mon Aug 12 05:05:45 2013	(r324611)
+++ head/emulators/i386-wine-devel/pkg-plist	Mon Aug 12 06:07:05 2013	(r324612)
@@ -2040,7 +2040,6 @@ lib32/wine/xmllite.dll.so
 lib32/wine/xolehlp.dll.so
 lib32/wine/xpsprint.dll.so
 lib32/wine/xpssvcs.dll.so
-libdata/ldconfig32/i386-wine-devel
 man/man1/msiexec.1.gz
 man/man1/notepad.1.gz
 man/man1/regedit.1.gz