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

Collapse All | Expand All

(-)bsd.port.mk (-4 / +3 lines)
Lines 362-367 Link Here
362
#			  Used only when USE_MOTIF is set.  Implies
362
#			  Used only when USE_MOTIF is set.  Implies
363
#			  NO_OPENMOTIF.
363
#			  NO_OPENMOTIF.
364
# USE_SDL		- Says that the port uses the sdl libraries.
364
# USE_SDL		- Says that the port uses the sdl libraries.
365
#				  See bsd.sdl.mk for more information.
365
# USE_XPM		- Says that the port uses the xpm graphics libraries.
366
# USE_XPM		- Says that the port uses the xpm graphics libraries.
366
##
367
##
367
# USE_OPENSSL	- Says that the port relies on the OpenSSL package.
368
# USE_OPENSSL	- Says that the port relies on the OpenSSL package.
Lines 1214-1219 Link Here
1214
.endif
1215
.endif
1215
1216
1216
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
1217
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
1218
.include "${PORTSDIR}/Mk/bsd.sdl.mk"
1217
1219
1218
# defaults to 4.x for 5.0-CURRENT and 4.5-STABLE; and 3.3.6 for all other branches
1220
# defaults to 4.x for 5.0-CURRENT and 4.5-STABLE; and 3.3.6 for all other branches
1219
.if ${OSVERSION} > 500025 || ( ${OSVERSION} >= 450005 && ${OSVERSION} < 500000 )
1221
.if ${OSVERSION} > 500025 || ( ${OSVERSION} >= 450005 && ${OSVERSION} < 500000 )
Lines 1623-1632 Link Here
1623
RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
1625
RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
1624
.endif
1626
.endif
1625
1627
1626
.if defined(USE_SDL)
1627
.include "${PORTSDIR}/Mk/bsd.sdl.mk"
1628
.endif
1629
1630
.if defined(USE_MOTIF)
1628
.if defined(USE_MOTIF)
1631
USE_XPM=			yes
1629
USE_XPM=			yes
1632
.if defined(WANT_LESSTIF)
1630
.if defined(WANT_LESSTIF)
Lines 1757-1762 Link Here
1757
.endif
1755
.endif
1758
1756
1759
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
1757
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
1758
.include "${PORTSDIR}/Mk/bsd.sdl.mk"
1760
1759
1761
.if defined(USE_PYTHON)
1760
.if defined(USE_PYTHON)
1762
.include "${PORTSDIR}/Mk/bsd.python.mk"
1761
.include "${PORTSDIR}/Mk/bsd.python.mk"
(-)bsd.sdl.mk (-10 / +48 lines)
Lines 16-29 Link Here
16
# the standard SDL and SDL_sound, use "USE_SDL=sdl sound" and the
16
# the standard SDL and SDL_sound, use "USE_SDL=sdl sound" and the
17
# required libraries are included in your LIB_DEPENDS.
17
# required libraries are included in your LIB_DEPENDS.
18
#
18
#
19
# If you want to check for the availability for certain SDL ports, you
20
# can set WANT_SDL and run it through bsd.port.pre.mk:
21
#	WANT_SDL=	yes
22
#	USE_SDL=	sdl
23
#	.include <bsd.port.pre.mk>
24
#	.if ${HAVE_SDL:Mgraphics}
25
#	USE_SDL+=	graphics
26
#	.endif
27
#	.include <bsd.port.post.mk>
28
# Run "make -v USE_SDL" to see which libs are asked for at the end.
29
#
19
30
20
#
31
#
21
# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.2 2004/01/21 10:01:54 krion Exp $
32
# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.2 2004/01/21 10:01:54 krion Exp $
22
#
33
#
23
34
24
.if !defined(SDL_Include)
25
26
SDL_Include=			bsd.sdl.mk
27
SDL_Include_MAINTAINER=		edwin@FreeBSD.org
35
SDL_Include_MAINTAINER=		edwin@FreeBSD.org
28
36
29
#
37
#
Lines 32-44 Link Here
32
_USE_SDL_ALL=	gfx gui image mixer ldbad mm net sdl sound ttf
40
_USE_SDL_ALL=	gfx gui image mixer ldbad mm net sdl sound ttf
33
41
34
#
42
#
35
# Keep some backward compatibility
36
#
37
.if ${USE_SDL}=="yes"
38
USE_SDL=sdl
39
.endif
40
41
#
42
# Variables used to determine what is needed:
43
# Variables used to determine what is needed:
43
# _VERSION_xxx	version of the shared library (required)
44
# _VERSION_xxx	version of the shared library (required)
44
# _SUBDIR_xxx	subdirectory below ${PORTSDIR} (required)
45
# _SUBDIR_xxx	subdirectory below ${PORTSDIR} (required)
Lines 107-112 Link Here
107
.endfor
108
.endfor
108
109
109
#
110
#
111
# If WANT_SDL is defined, check for the available libraries
112
#
113
.if !defined(AFTERPORTMK)
114
.if !defined(SDL_Include_pre)
115
116
SDL_Include_pre=			bsd.sdl.mk
117
118
.if defined(WANT_SDL)
119
.for component in ${_USE_SDL_ALL}
120
.if exists(${LOCALBASE}/lib/lib${_LIB_${component}}.so.${_VERSION_${component}})
121
HAVE_SDL+=	${component}
122
.endif
123
.endfor
124
.endif
125
126
.endif
127
.endif
128
129
#
130
# If USE_SDL is defined, make dependencies for the libraries
131
#
132
.if !defined(BEFOREPORTMK)
133
.if !defined(SDL_Include_post)
134
.if defined(USE_SDL)
135
136
SDL_Include_post=			bsd.sdl.mk
137
138
#
139
# Keep some backward compatibility
140
#
141
.if ${USE_SDL}=="yes"
142
USE_SDL=		sdl
143
.endif
144
145
#
110
# Check if all the values given in USE_SDL are valid.
146
# Check if all the values given in USE_SDL are valid.
111
#
147
#
112
_USE_SDL=
148
_USE_SDL=
Lines 142-145 Link Here
142
CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
178
CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
143
MAKE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
179
MAKE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
144
180
181
.endif
182
.endif
145
.endif
183
.endif

Return to bug 61877