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

Collapse All | Expand All

(-)Mk/bsd.linux-apps.mk (-3 / +11 lines)
Lines 60-66 WEB_AUTH= nvu Link Here
60
# Non-version specific components
60
# Non-version specific components
61
_LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
61
_LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
62
					arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
62
					arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
63
					flac fontconfig freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \
63
					flac fontconfig freealut gdkpixbuf gdkpixbuf2 gnutls gtk2 hicontheme imlib jpeg libaudiofile \
64
					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
64
					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
65
					libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
65
					libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
66
					naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
66
					naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
Lines 202-211 freealut_PORT= ${PORTSDIR}/audio/linux${LINUX_DIS Link Here
202
freealut_DEPENDS=	openal
202
freealut_DEPENDS=	openal
203
203
204
gdkpixbuf_f10_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
204
gdkpixbuf_f10_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
205
gdkpixbuf_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
206
gdkpixbuf_DETECT=	${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
205
gdkpixbuf_DETECT=	${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
207
gdkpixbuf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
206
gdkpixbuf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
208
207
208
gdkpixbuf2_f10_FILE=${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
209
gdkpixbuf2_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
210
gdkpixbuf2_DETECT=	${gdkpixbuf2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
211
.if ${USE_LINUX} == "c6"
212
gdkpixbuf2_PORT=	${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf2
213
.else
214
gdkpixbuf2_PORT=	${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
215
.endif
216
209
gnutls_f10_FILE=	${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
217
gnutls_f10_FILE=	${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
210
gnutls_c6_FILE=		${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
218
gnutls_c6_FILE=		${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
211
gnutls_DETECT=		${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
219
gnutls_DETECT=		${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
Lines 225-231 gtk2_f10_FILE= ${LINUXBASE}/usr/lib/lib Link Here
225
gtk2_c6_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
225
gtk2_c6_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
226
gtk2_DETECT=		${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
226
gtk2_DETECT=		${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
227
gtk2_PORT=			${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
227
gtk2_PORT=			${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
228
gtk2_DEPENDS=		atk gdkpixbuf jpeg png pango tiff xorglibs
228
gtk2_DEPENDS=		atk gdkpixbuf2 jpeg png pango tiff xorglibs
229
229
230
hicontheme_f10_FILE=	${LINUXBASE}/usr/share/icons/hicolor
230
hicontheme_f10_FILE=	${LINUXBASE}/usr/share/icons/hicolor
231
hicontheme_c6_FILE=	${LINUXBASE}/usr/share/icons/hicolor
231
hicontheme_c6_FILE=	${LINUXBASE}/usr/share/icons/hicolor
(-)x11-toolkits/linux-c6-gtk2/Makefile (-1 / +1 lines)
Lines 16-22 CONFLICTS= linux-gtk2-[0-9]* linux-f8-gt Link Here
16
16
17
ONLY_FOR_ARCHS=	i386 amd64
17
ONLY_FOR_ARCHS=	i386 amd64
18
USE_LINUX=	c6
18
USE_LINUX=	c6
19
USE_LINUX_APPS=	atk gdkpixbuf jpeg pango png tiff xorglibs
19
USE_LINUX_APPS=	atk gdkpixbuf2 jpeg pango png tiff xorglibs
20
USE_LINUX_RPM=	yes
20
USE_LINUX_RPM=	yes
21
RPMVERSION=	6.el6
21
RPMVERSION=	6.el6
22
BRANDELF_DIRS=	usr/bin
22
BRANDELF_DIRS=	usr/bin

Return to bug 195121