Add USES=desktop-file-utils as suggested by stage-qa. [1][2]

Adjust dependency on emulators/wine-mono-devel to recent update there.
Configure --with-cms, --with-jpeg, and --with-png when X11 is set. [2]
Fix pkg-plist when COMPHOLIO is set. [2]

PR:		195903 [1], 195765 [2]
Submitted by:	amdmi3 [1], Andriy Voskoboinyk <s3erios@gmail.com> [2]
This commit is contained in:
Gerald Pfeifer 2014-12-22 00:18:43 +00:00
parent 11eb2df2af
commit 904c29d3c0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=375204
2 changed files with 26 additions and 3 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= wine
DISTVERSION= 1.7.32
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@ -37,7 +38,7 @@ WINELIBDIR?= ${PREFIX}/lib
USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine
.endif
ONLY_FOR_ARCHS= i386
USES= bison compiler:c11 gmake shebangfix tar:bzip2
USES= bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2
SHEBANG_FILES= tools/winemaker tools/winedump/function_grep.pl
SUB_FILES= pkg-message
@ -73,7 +74,7 @@ LDAP_USE= OPENLDAP=yes
LIBXSLT_CONFIGURE_WITH= xslt
LIBXSLT_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt
MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.5.2.msi:${PORTSDIR}/emulators/wine-mono-devel
MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.5.4.msi:${PORTSDIR}/emulators/wine-mono-devel
MPG123_CONFIGURE_WITH= mpg123
MPG123_LIB_DEPENDS= libmpg123.so:${PORTSDIR}/audio/mpg123
@ -86,7 +87,7 @@ V4L_LIB_DEPENDS= libv4l1.so:${PORTSDIR}/multimedia/libv4l
WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
X11_CONFIGURE_WITH= x fontconfig glu opengl xinput2 xrandr freetype
X11_CONFIGURE_WITH= x cms fontconfig glu jpeg opengl png xinput2 xrandr freetype
X11_USE= GL=glu XORG=xcomposite,xcursor,xi,xpm,xrandr,xrender
X11_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libfreetype.so:${PORTSDIR}/print/freetype2 \

View file

@ -488,6 +488,7 @@ include/wine/windows/ntddndis.h
include/wine/windows/ntddscsi.h
include/wine/windows/ntddstor.h
include/wine/windows/ntdsapi.h
%%COMPHOLIO%%include/wine/windows/ntifs.h
include/wine/windows/ntquery.h
include/wine/windows/ntsecapi.h
include/wine/windows/ntsecpkg.h
@ -773,6 +774,7 @@ include/wine/windows/xmllite.h
include/wine/windows/xmllite.idl
include/wine/windows/zmouse.h
include/wine/windows/ddk/compstui.h
%%COMPHOLIO%%include/wine/windows/ddk/csq.h
include/wine/windows/ddk/hidsdi.h
include/wine/windows/ddk/imm.h
include/wine/windows/ddk/mountmgr.h
@ -801,9 +803,14 @@ lib/wine/advpack.dll.so
lib/wine/amstream.dll.so
lib/wine/api-ms-win-core-com-l1-1-0.dll.so
lib/wine/api-ms-win-core-console-l1-1-0.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so
lib/wine/api-ms-win-core-debug-l1-1-1.dll.so
lib/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-fibers-l1-1-0.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
lib/wine/api-ms-win-core-file-l1-2-0.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-file-l2-1-0.dll.so
lib/wine/api-ms-win-core-handle-l1-1-0.dll.so
lib/wine/api-ms-win-core-heap-l1-2-0.dll.so
lib/wine/api-ms-win-core-heap-obsolete-l1-1-0.dll.so
@ -812,6 +819,7 @@ lib/wine/api-ms-win-core-io-l1-1-1.dll.so
lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
lib/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so
lib/wine/api-ms-win-core-localization-l1-2-0.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-localization-l1-2-1.dll.so
lib/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so
lib/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
lib/wine/api-ms-win-core-memory-l1-1-1.dll.so
@ -832,7 +840,10 @@ lib/wine/api-ms-win-core-timezone-l1-1-0.dll.so
lib/wine/api-ms-win-core-url-l1-1-0.dll.so
lib/wine/api-ms-win-core-util-l1-1-0.dll.so
lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so
lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
%%COMPHOLIO%%lib/wine/api-ms-win-core-xstate-l2-1-0.dll.so
lib/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
lib/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so
lib/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so
@ -1011,9 +1022,14 @@ lib/wine/fakedlls/advpack.dll
lib/wine/fakedlls/amstream.dll
lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
lib/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-heap-l1-2-0.dll
lib/wine/fakedlls/api-ms-win-core-heap-obsolete-l1-1-0.dll
@ -1022,6 +1038,7 @@ lib/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
@ -1042,7 +1059,10 @@ lib/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
%%COMPHOLIO%%lib/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll
lib/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll
@ -2209,6 +2229,8 @@ share/applications/wine.desktop
%%PORTDOCS%%%%DOCSDIR%%/README.winedbg
%%PORTDOCS%%%%DOCSDIR%%/README.winedump
%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/arial.ttf
%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/cour.ttf
%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/msyh.ttf
%%X11%%%%DATADIR%%/fonts/coue1255.fon
%%X11%%%%DATADIR%%/fonts/coue1256.fon
%%X11%%%%DATADIR%%/fonts/coue1257.fon