diff options
| author | David Naylor <dbn@FreeBSD.org> | 2013-08-12 06:07:05 +0000 |
|---|---|---|
| committer | David Naylor <dbn@FreeBSD.org> | 2013-08-12 06:07:05 +0000 |
| commit | 563811c9b280d5c56d2764c869ea6b09b56ae934 (patch) | |
| tree | f153dd269814bb27b662cbf3a483d5e39a647137 /emulators | |
| parent | 895150cd137cc5a4b6d3184458bdf38495bbded2 (diff) | |
| download | ports-563811c9b280d5c56d2764c869ea6b09b56ae934.tar.gz ports-563811c9b280d5c56d2764c869ea6b09b56ae934.zip | |
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
Notes
Notes:
svn path=/head/; revision=324612
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/i386-wine-devel/Makefile.i386 | 2 | ||||
| -rw-r--r-- | emulators/i386-wine-devel/Makefile.inc | 12 | ||||
| -rw-r--r-- | emulators/i386-wine-devel/pkg-plist | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386 index 9c9b4c281054..db8b6a0c9d21 100644 --- a/emulators/i386-wine-devel/Makefile.i386 +++ b/emulators/i386-wine-devel/Makefile.i386 @@ -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} diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 42827ebd9d02..acae7289e6ee 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -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} diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist index 5d8585a1ab89..82f1ba05705c 100644 --- a/emulators/i386-wine-devel/pkg-plist +++ b/emulators/i386-wine-devel/pkg-plist @@ -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 |