View | Details | Raw Unified | Return to bug 226396 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-7 / +11 lines)
Lines 27-42 Link Here
27
CONFLICTS_INSTALL=	wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \
27
CONFLICTS_INSTALL=	wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \
28
			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
28
			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
29
29
30
CPPFLAGS+=	-I${LOCALBASE}/include
31
LDFLAGS+=	-L${LOCALBASE}/lib
32
GNU_CONFIGURE=	yes
30
GNU_CONFIGURE=	yes
33
CONFIGURE_ARGS+=--verbose \
31
CONFIGURE_ARGS+=--verbose \
34
		--disable-kerberos \
35
		--disable-tests \
32
		--disable-tests \
36
		--without-alsa --without-capi --without-dbus \
33
		--without-alsa --without-capi --without-dbus \
37
		--without-gettext --without-gettextpo \
34
		--without-gettext --without-gettextpo \
38
		--without-gphoto --without-gsm --without-gstreamer \
35
		--without-gphoto --without-gsm --without-gstreamer \
39
		--without-krb5 \
40
		--without-opencl \
36
		--without-opencl \
41
		--without-osmesa \
37
		--without-osmesa \
42
		--with-oss \
38
		--with-oss \
Lines 46-52 Link Here
46
		--without-udev
42
		--without-udev
47
CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
43
CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
48
WINELIBDIR?=	${PREFIX}/lib
44
WINELIBDIR?=	${PREFIX}/lib
49
USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:xz
45
USES=		bison compiler:c11 desktop-file-utils gmake pkgconfig shebangfix tar:xz
50
.if !defined(USE_LDCONFIG32)
46
.if !defined(USE_LDCONFIG32)
51
USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
47
USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
52
.endif
48
.endif
Lines 58-64 Link Here
58
54
59
PORTDATA=	l_intl.nls wine.inf
55
PORTDATA=	l_intl.nls wine.inf
60
56
61
OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO
57
OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS GSSAPI HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO
62
OPTIONS_DEFAULT=GNUTLS X11
58
OPTIONS_DEFAULT=GNUTLS X11
63
OPTIONS_SUB=	yes
59
OPTIONS_SUB=	yes
64
60
Lines 70-75 Link Here
70
66
71
CUPS_CONFIGURE_WITH=	cups
67
CUPS_CONFIGURE_WITH=	cups
72
CUPS_LIB_DEPENDS=	libcups.so:print/cups
68
CUPS_LIB_DEPENDS=	libcups.so:print/cups
69
CUPS_USES=		localbase
73
70
74
DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
71
DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
75
72
Lines 78-88 Link Here
78
GNUTLS_CONFIGURE_WITH=	gnutls
75
GNUTLS_CONFIGURE_WITH=	gnutls
79
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
76
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
80
77
78
GSSAPI_CONFIGURE_ON=	KRB5CONFIG="${KRB5CONFIG}" --with-gssapi
79
GSSAPI_CONFIGURE_OFF=	--disable-kerberos
80
GSSAPI_USES=		gssapi:mit
81
81
HAL_CONFIGURE_WITH=	hal
82
HAL_CONFIGURE_WITH=	hal
82
HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
83
HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
83
84
84
LDAP_CONFIGURE_WITH=	ldap
85
LDAP_CONFIGURE_WITH=	ldap
85
LDAP_USE=		OPENLDAP=yes
86
LDAP_USE=		OPENLDAP=yes
87
LDAP_USES=		localbase
86
88
87
LIBXSLT_CONFIGURE_WITH=	xslt
89
LIBXSLT_CONFIGURE_WITH=	xslt
88
LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
90
LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
Lines 91-103 Link Here
91
93
92
MPG123_CONFIGURE_WITH=	mpg123
94
MPG123_CONFIGURE_WITH=	mpg123
93
MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
95
MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
96
MPG123_USES=		localbase
94
97
95
OPENAL_CONFIGURE_WITH=	openal
98
OPENAL_CONFIGURE_WITH=	openal
96
OPENAL_USES=		openal
99
OPENAL_USES=		localbase openal
97
100
98
V4L_CONFIGURE_WITH=	v4l
101
V4L_CONFIGURE_WITH=	v4l
99
V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
102
V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
100
V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
103
V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
104
V4L_USES=		localbase
101
105
102
WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
106
WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
103
107
(-)pkg-plist (+2 lines)
Lines 1868-1873 Link Here
1868
lib/wine/fakedlls/joy.cpl
1868
lib/wine/fakedlls/joy.cpl
1869
lib/wine/fakedlls/jscript.dll
1869
lib/wine/fakedlls/jscript.dll
1870
lib/wine/fakedlls/jsproxy.dll
1870
lib/wine/fakedlls/jsproxy.dll
1871
%%GSSAPI%%lib/wine/fakedlls/kerberos.dll
1871
lib/wine/fakedlls/kernel32.dll
1872
lib/wine/fakedlls/kernel32.dll
1872
lib/wine/fakedlls/kernelbase.dll
1873
lib/wine/fakedlls/kernelbase.dll
1873
%%WINE32%%lib/wine/fakedlls/keyboard.drv16
1874
%%WINE32%%lib/wine/fakedlls/keyboard.drv16
Lines 2346-2351 Link Here
2346
lib/wine/joy.cpl.so
2347
lib/wine/joy.cpl.so
2347
lib/wine/jscript.dll.so
2348
lib/wine/jscript.dll.so
2348
lib/wine/jsproxy.dll.so
2349
lib/wine/jsproxy.dll.so
2350
%%GSSAPI%%lib/wine/kerberos.dll.so
2349
lib/wine/kernel32.dll.so
2351
lib/wine/kernel32.dll.so
2350
lib/wine/kernelbase.dll.so
2352
lib/wine/kernelbase.dll.so
2351
%%WINE32%%lib/wine/keyboard.drv16.so
2353
%%WINE32%%lib/wine/keyboard.drv16.so

Return to bug 226396