diff options
author | David Naylor <dbn@FreeBSD.org> | 2013-12-01 15:30:42 +0000 |
---|---|---|
committer | David Naylor <dbn@FreeBSD.org> | 2013-12-01 15:30:42 +0000 |
commit | 10ac0e1be22e64428d5fc7c44e8609a46d0f453f (patch) | |
tree | 47652632f4059e7a023ed41352f009034289f516 | |
parent | 10ed3f609debac7615948d42b06503f35f0c3c88 (diff) | |
download | ports-10ac0e1be22e64428d5fc7c44e8609a46d0f453f.tar.gz ports-10ac0e1be22e64428d5fc7c44e8609a46d0f453f.zip |
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@cooltrainer.org>
[2] Piotr Kubaj <pkubaj@riseup.net>
Notes
Notes:
svn path=/head/; revision=335395
-rw-r--r-- | emulators/i386-wine-devel/Makefile.i386 | 2 | ||||
-rw-r--r-- | emulators/i386-wine-devel/Makefile.inc | 3 | ||||
-rw-r--r-- | emulators/i386-wine-devel/distinfo | 8 | ||||
-rw-r--r-- | emulators/i386-wine-devel/files/nvidia.sh | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386 index f24d79bdd2c2..227280768d02 100644 --- a/emulators/i386-wine-devel/Makefile.i386 +++ b/emulators/i386-wine-devel/Makefile.i386 @@ -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 diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index b7f8ec57fe09..00acf569a095 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -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: diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo index 311881adafa2..3e6d0de758d2 100644 --- a/emulators/i386-wine-devel/distinfo +++ b/emulators/i386-wine-devel/distinfo @@ -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 diff --git a/emulators/i386-wine-devel/files/nvidia.sh b/emulators/i386-wine-devel/files/nvidia.sh index 46f2729ef4a1..0f5c572f735f 100644 --- a/emulators/i386-wine-devel/files/nvidia.sh +++ b/emulators/i386-wine-devel/files/nvidia.sh @@ -86,7 +86,7 @@ terminate() { } -args=`getopt -dn $*` +args=`getopt dn $*` if [ $? -ne 0 ] then echo "Usage: $0 [-n]" |