svn commit: r335395 - in head/emulators/i386-wine-devel: . files

[David Naylor]

Author: dbn
Date: Sun Dec  1 15:30:42 2013
New Revision: 335395
URL: http://svnweb.freebsd.org/changeset/ports/335395

Log:
  Update emulators/i386-wine-devel to 1.7.7.
  
  Changes:
   - Fix the patch-nvidia.sh script's usage of getopt [1]
   - Fix the patching of the packages for installation on amd64 [2]
   -
  
  Reported by:	[1] Nicole Reid <nicole at cooltrainer.org>
  		[2] Piotr Kubaj <pkubaj at riseup.net>

Modified:
  head/emulators/i386-wine-devel/Makefile.i386
  head/emulators/i386-wine-devel/Makefile.inc
  head/emulators/i386-wine-devel/distinfo
  head/emulators/i386-wine-devel/files/nvidia.sh

Modified: head/emulators/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386	Sun Dec  1 15:11:12 2013	(r335394)
+++ head/emulators/i386-wine-devel/Makefile.i386	Sun Dec  1 15:30:42 2013	(r335395)
@@ -79,7 +79,7 @@ post-install-script:
 post-package-script:
 	if [ -n "${WITH_PKGNG}" -a -z "${PACKAGE_BUILDING}" ]; then \
 		${XZ_CMD} -dc ${PKGFILE} | \
-		${SED} -e "s/^\(arch: freebsd:.*:x86\):32/\1:64/" | \
+		${SED} -e 's/\(freebsd:.*:x86\):32/\1:64/' -e 's/\(freebsd:.*:x86\):32/\1:64/' | \
 		${XZ_CMD} > ${WRKDIR}/${PKGNAME}${PKG_SUFX}; \
 		${MV} ${WRKDIR}/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \
 	fi

Modified: head/emulators/i386-wine-devel/Makefile.inc
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.inc	Sun Dec  1 15:11:12 2013	(r335394)
+++ head/emulators/i386-wine-devel/Makefile.inc	Sun Dec  1 15:30:42 2013	(r335395)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.7.6
+PORTVERSION=	1.7.7
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
@@ -65,7 +65,6 @@ do-install:
 pkg-plist: extract
 	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$' | ${SED} 's|/usr/local/||g' | sort > ${WRKDIR}/pkg-plist
 	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} '/$$' | ${SED} 's|/usr/local/\(.*\)/$$|@dirrm \1|g' | sort -r >> ${WRKDIR}/pkg-plist
-	${REINPLACE_CMD} -e 's|@dirrm share/applications|@dirrmtry share/applications|' -e 's|/$$||g' ${WRKDIR}/pkg-plist
 	${MV} ${WRKDIR}/pkg-plist ${PLIST}
 
 port-update:

Modified: head/emulators/i386-wine-devel/distinfo
==============================================================================
--- head/emulators/i386-wine-devel/distinfo	Sun Dec  1 15:11:12 2013	(r335394)
+++ head/emulators/i386-wine-devel/distinfo	Sun Dec  1 15:30:42 2013	(r335395)
@@ -1,4 +1,4 @@
-SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.6,1.txz) = 4298b8c13286f8a58add67d36d3ca852dd7428b7206e1d8cd1568777050e746e
-SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.6,1.txz) = 23351464
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.6,1.txz) = 5bb0bd3d38aadbff2bd6835f22f59be3f1392a7d24a4a51d1050c7770ae2ee8f
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.6,1.txz) = 23513064
+SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.7,1.txz) = ade3f2443124c7d838351aaf2e9dd3d88e250ca20b8bb235e397678c4a09d34a
+SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.7,1.txz) = 23359144
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.7,1.txz) = e8dba1940f4070a2eef74352bfac1b4d81bef38939d32f2e38966dd5d8e0103f
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.7,1.txz) = 23501308

Modified: head/emulators/i386-wine-devel/files/nvidia.sh
==============================================================================
--- head/emulators/i386-wine-devel/files/nvidia.sh	Sun Dec  1 15:11:12 2013	(r335394)
+++ head/emulators/i386-wine-devel/files/nvidia.sh	Sun Dec  1 15:30:42 2013	(r335395)
@@ -86,7 +86,7 @@ terminate() {
 
 }
 
-args=`getopt -dn $*`
+args=`getopt dn $*`
 if [ $? -ne 0 ]
 then
   echo "Usage: $0 [-n]"