Attachment #149539 for bug #195121




# Non-version specific components
_LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
					arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
					flac fontconfig freealut gdkpixbuf gdkpixbuf2 gnutls gtk2 hicontheme imlib jpeg libaudiofile \
					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
					libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
					naslibs ncurses-base openal openmotif openssl openssl-compat pango png \

freealut_DEPENDS=	openal

gdkpixbuf_f10_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
gdkpixbuf_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
gdkpixbuf_DETECT=	${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
gdkpixbuf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf

gdkpixbuf2_f10_FILE=${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
gdkpixbuf2_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
gdkpixbuf2_DETECT=	${gdkpixbuf2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
.if ${USE_LINUX} == "c6"
gdkpixbuf2_PORT=	${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf2
.else
gdkpixbuf2_PORT=	${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
.endif

gnutls_f10_FILE=	${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
gnutls_c6_FILE=		${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
gnutls_DETECT=		${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}

Lines 17-23 COMMENT= Adobe Flash Player NPAPI Plugin Link Here

(-)www/linux-c6-flashplugin11/Makefile (-1 / +1 lines)
17		17
18	ONLY_FOR_ARCHS= amd64 i386	18	ONLY_FOR_ARCHS= amd64 i386
19	USE_LINUX= c6	19	USE_LINUX= c6
20	USE_LINUX_APPS= curl cyrus-sasl2 gdkpixbuf gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap	20	USE_LINUX_APPS= curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap
21	WANT_GNOME= yes	21	WANT_GNOME= yes
22		22
23	RESTRICTED= Redistribution not allowed	23	RESTRICTED= Redistribution not allowed

Lines 22-28 COMMENT= Blazingly fast, full-featured, standards- Link Here

(-)www/linux-opera/Makefile (-1 / +1 lines)
22	RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info	22	RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
23		23
24	USE_LINUX= yes	24	USE_LINUX= yes
25	USE_LINUX_APPS= gdkpixbuf gtk2 naslibs png sqlite3 xorglibs	25	USE_LINUX_APPS= gdkpixbuf2 gtk2 naslibs png sqlite3 xorglibs
26	ONLY_FOR_ARCHS= i386 amd64	26	ONLY_FOR_ARCHS= i386 amd64
27	USES= desktop-file-utils shared-mime-info tar:xz	27	USES= desktop-file-utils shared-mime-info tar:xz
28	WANT_GNOME= yes	28	WANT_GNOME= yes

Lines 29-35 APP_NAME= ${PKGBASE} Link Here

(-)www/linux-seamonkey/Makefile.common (-1 / +1 lines)
29	BIN_NAME?= ${PORTNAME}	29	BIN_NAME?= ${PORTNAME}
30	USE_LINUX= yes	30	USE_LINUX= yes
31	USE_LINUX_APPS+=alsalib alsa-plugins-oss atk dbusglib dbuslibs \	31	USE_LINUX_APPS+=alsalib alsa-plugins-oss atk dbusglib dbuslibs \
32	fontconfig gdkpixbuf gtk2 hicontheme pango	32	fontconfig gdkpixbuf2 gtk2 hicontheme pango
33		33
34	WRKSRC?= ${WRKDIR}/${BIN_NAME}	34	WRKSRC?= ${WRKDIR}/${BIN_NAME}
35	FDIR= ${STAGEDIR}${PREFIX}/lib/${APP_NAME}	35	FDIR= ${STAGEDIR}${PREFIX}/lib/${APP_NAME}

Return to bug 195121

Lines 60-66 WEB_AUTH= nvu Link Here

(-)Mk/bsd.linux-apps.mk (-2 / +10 lines)
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}