svn commit: r403660 - in head/emulators: i386-wine-devel i386-wine-staging

[David Naylor]

Author: dbn
Date: Sun Dec 13 11:32:44 2015
New Revision: 403660
URL: https://svnweb.freebsd.org/changeset/ports/403660

Log:
  emulators/i386-wine-devel: update to 1.8.r3
  
   - Remove GNUTLS from staging (prevents build on -current).

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

Modified: head/emulators/i386-wine-devel/Makefile.inc
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.inc	Sun Dec 13 09:41:22 2015	(r403659)
+++ head/emulators/i386-wine-devel/Makefile.inc	Sun Dec 13 11:32:44 2015	(r403660)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.8.r2
+PORTVERSION=	1.8.r3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
@@ -74,10 +74,6 @@ IGNORE=		binaries compiled for FreeBSD 9
 DISTFILES=
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100085
-BROKEN=		unable to build binaries due to packaging issues with gnutls
-.endif
-
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}

Modified: head/emulators/i386-wine-devel/distinfo
==============================================================================
--- head/emulators/i386-wine-devel/distinfo	Sun Dec 13 09:41:22 2015	(r403659)
+++ head/emulators/i386-wine-devel/distinfo	Sun Dec 13 11:32:44 2015	(r403660)
@@ -1,8 +1,12 @@
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.8.r2,1.txz) = aa4e493f9a3d8ed2d6c0c08a39763001c5e315ef1177ef840b662a6c6472bdc5
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.8.r2,1.txz) = 38779192
-SHA256 (freebsd:9:x86:64/i386-wine-staging-1.8.r2,1.txz) = fbcd625f3a1823b7303f7ff97897b7bc262903dfd8561de2b1c918cda4cb5e4a
-SIZE (freebsd:9:x86:64/i386-wine-staging-1.8.r2,1.txz) = 42247968
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.8.r2,1.txz) = 555be51e86d9f5914c8d4140f267a8dd333cb6816144bbc09782e2e4cce0987b
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.8.r2,1.txz) = 35656420
-SHA256 (freebsd:10:x86:64/i386-wine-staging-1.8.r2,1.txz) = 552f4e29dce03258120c1092e094d84039254223f3b1e2a9019e49d95c8846ce
-SIZE (freebsd:10:x86:64/i386-wine-staging-1.8.r2,1.txz) = 39087428
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.8.r3,1.txz) = b089800c3cf6fbf3671d8632c28faf4feda6b8e02eed6f364008715be23b077a
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.8.r3,1.txz) = 38778824
+SHA256 (freebsd:9:x86:64/i386-wine-staging-1.8.r3,1.txz) = 1bdf29611f1a1d9fb6b9c8d2a7b9bd5dc303314b19c250ff01e80dd373defe5e
+SIZE (freebsd:9:x86:64/i386-wine-staging-1.8.r3,1.txz) = 41150432
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.8.r3,1.txz) = 6d09efb731e19a83ce38d9430e8c462759a1ed9041c66de37a2e848836e952d2
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.8.r3,1.txz) = 35666628
+SHA256 (freebsd:10:x86:64/i386-wine-staging-1.8.r3,1.txz) = 3275e05dcd0f286972b168dcfeb28813fcb3b36892ee7803770dcf737bd4de85
+SIZE (freebsd:10:x86:64/i386-wine-staging-1.8.r3,1.txz) = 38034756
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.8.r3,1.txz) = 18512a12e4c0c3d5f333a991d7d3bef4da2ad0edf80977ec2547c7cff9dbae7a
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.8.r3,1.txz) = 35086396
+SHA256 (freebsd:11:x86:64/i386-wine-staging-1.8.r3,1.txz) = d6a6a53c158a993f5f44c07e6a2cd922b79030140faa22189f0496d4ff1d44d2
+SIZE (freebsd:11:x86:64/i386-wine-staging-1.8.r3,1.txz) = 37442528

Modified: head/emulators/i386-wine-devel/pkg-plist
==============================================================================
--- head/emulators/i386-wine-devel/pkg-plist	Sun Dec 13 09:41:22 2015	(r403659)
+++ head/emulators/i386-wine-devel/pkg-plist	Sun Dec 13 11:32:44 2015	(r403660)
@@ -905,26 +905,17 @@ lib32/libdrm_intel.so.1
 lib32/libdrm_radeon.so.1
 lib32/libedit.so.0
 lib32/libexpat.so.1
-%%STAGING%%lib32/libffi.so.6
 lib32/libfontconfig.so.1
 lib32/libfreetype.so.6
 %%OSREL9%%lib32/libgcc_s.so.1
 lib32/libglapi.so.0
-%%STAGING%%lib32/libgmp.so.10
-%%STAGING%%lib32/libgnutls.so.28
-%%STAGING%%lib32/libhogweed.so.2
 %%OSREL9%%lib32/libiconv.so.2
-%%STAGING%%lib32/libintl.so.8
 lib32/libjpeg.so.8
 lib32/liblcms2.so.2
-%%STAGING%%lib32/libnettle.so.4
-%%STAGING%%lib32/libp11-kit.so.0
 lib32/libpciaccess.so.0
 lib32/libpng16.so.16
 lib32/libpthread-stubs.so.0
 %%OSREL9%%lib32/libstdc++.so.6
-%%STAGING%%lib32/libtasn1.so.6
-%%STAGING%%lib32/libtspi.so.1
 lib32/libwine.so
 lib32/libwine.so.1
 lib32/libxcb-dri2.so.0

Modified: head/emulators/i386-wine-staging/Makefile
==============================================================================
--- head/emulators/i386-wine-staging/Makefile	Sun Dec 13 09:41:22 2015	(r403659)
+++ head/emulators/i386-wine-staging/Makefile	Sun Dec 13 11:32:44 2015	(r403660)
@@ -7,7 +7,7 @@ SLAVE_PORT=	i386-wine-devel
 
 CONFLICTS_INSTALL=	i386-wine-[0-9]* wine-[0-9]* wine-staging-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
 
-OPTIONS_SET=	LIBXSLT GNUTLS HAL STAGING X11
+OPTIONS_SET=	LIBXSLT HAL STAGING X11
 
 SLAVEDIR=	${.CURDIR}/../i386-wine-devel
 PLIST=		${MASTERDIR}/pkg-plist