svn commit: r330263 - head/emulators/wine-devel

[Gerald Pfeifer]

Author: gerald
Date: Sun Oct 13 22:42:30 2013
New Revision: 330263
URL: http://svnweb.freebsd.org/changeset/ports/330263

Log:
  Update to Wine 1.7.4.  This includes the following changes:
   - More preparation work for the Direct3D command stream.
   - A number of Winsock improvements.
   - Various bug fixes.
  
  Move PKGNAMESUFFIX to where it belongs.
  
  Convert LIB_DEPENDS to the new standard.
  
  Replace USE_GMAKE by USES=gmake.

Modified:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/distinfo

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Sun Oct 13 22:33:48 2013	(r330262)
+++ head/emulators/wine-devel/Makefile	Sun Oct 13 22:42:30 2013	(r330263)
@@ -2,11 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.7.3
+DISTVERSION=	1.7.4
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER?=	gerald at FreeBSD.org
 COMMENT?=	Microsoft Windows compatibility environment
@@ -16,16 +17,15 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype:${PORTSDIR}/print/freetype2 \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		lcms2:${PORTSDIR}/graphics/lcms2 \
-		png15:${PORTSDIR}/graphics/png \
-		xml2:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 CONFLICTS_INSTALL=	i386-wine-* wine-1.4* wine-1.6*
 
-PKGNAMESUFFIX=	-devel
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GCC=	any
@@ -50,9 +50,8 @@ MAN1=		msiexec.1 notepad.1 regedit.1 reg
 MLINKS=		winegcc.1 winecpp.1 \
 		winegcc.1 wineg++.1
 ONLY_FOR_ARCHS=	i386
-USES=		bison
+USES=		bison gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GL=		glu
 USE_XORG=	xcursor xi xpm xrandr xrender
 
@@ -74,7 +73,7 @@ NO_STAGE=	yes
 
 .if ${PORT_OPTIONS:MCUPS}
 CONFIGURE_ARGS+=	--with-cups
-LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
 .else
 CONFIGURE_ARGS+=	--without-cups
 .endif
@@ -85,14 +84,14 @@ RUN_DEPENDS+=	dosbox:${PORTSDIR}/emulato
 
 .if ${PORT_OPTIONS:MGNUTLS}
 CONFIGURE_ARGS+=	--with-gnutls
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
 CONFIGURE_ARGS+=	--with-hal
-LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
 .else
 CONFIGURE_ARGS+=	--without-hal
 .endif
@@ -106,7 +105,7 @@ CONFIGURE_ARGS+=	--without-ldap
 
 .if ${PORT_OPTIONS:MLIBXSLT}
 CONFIGURE_ARGS+=	--with-xslt
-LIB_DEPENDS+=	xslt:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS+=	libxslt.so:${PORTSDIR}/textproc/libxslt
 .else
 CONFIGURE_ARGS+=	--without-xslt
 .endif

Modified: head/emulators/wine-devel/distinfo
==============================================================================
--- head/emulators/wine-devel/distinfo	Sun Oct 13 22:33:48 2013	(r330262)
+++ head/emulators/wine-devel/distinfo	Sun Oct 13 22:42:30 2013	(r330263)
@@ -1,2 +1,2 @@
-SHA256 (wine-1.7.3.tar.bz2) = c66c93c2ffec8d1d9922fbaa226b169d62deb77fcbfd0fbd7379b77dbd97d47f
-SIZE (wine-1.7.3.tar.bz2) = 21489049
+SHA256 (wine-1.7.4.tar.bz2) = 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969
+SIZE (wine-1.7.4.tar.bz2) = 21500746