Attachment #22772 for bug #39417

View | Details | Raw Unified | Return to bug 39417
Collapse All | Expand All




.if defined(WITH_GLIB) || defined(WITH_ALL)
HAVE_GLIB=	yes
.else
GLIB_CONFIG?=	${LOCALBASE}/bin/glib-config
.if exists(${GLIB_CONFIG})
HAVE_GLIB=	yes
.else

.if defined(WITH_GTK) || defined(WITH_ALL)
HAVE_GTK=	yes
.else
GTK_CONFIG?=	${X11BASE}/bin/gtk-config
.if exists(${GTK_CONFIG})
HAVE_GTK=	yes
.else


.if defined(USE_GLIB)
LIB_DEPENDS+=	glib12.3:${PORTSDIR}/devel/glib12
GLIB_CONFIG?=	${LOCALBASE}/bin/glib-config
CONFIGURE_ENV+=	GLIB_CONFIG="${GLIB_CONFIG}"
MAKE_ENV+=		GLIB_CONFIG="${GLIB_CONFIG}"
.if defined(HAVE_GLIB)


.if defined(USE_GTK)
LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
GTK_CONFIG?=	${X11BASE}/bin/gtk-config
CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
MAKE_ENV+=		GTK_CONFIG="${GTK_CONFIG}"
.if defined(HAVE_GTK)

Return to bug 39417

Lines 95-101 Link Here

(-)bsd.gnome.mk (-4 / +4 lines)
95	.if defined(WITH_GLIB) \|\| defined(WITH_ALL)	95	.if defined(WITH_GLIB) \|\| defined(WITH_ALL)
96	HAVE_GLIB= yes	96	HAVE_GLIB= yes
97	.else	97	.else
98	GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config	98	GLIB_CONFIG?= ${LOCALBASE}/bin/glib-config
99	.if exists(${GLIB_CONFIG})	99	.if exists(${GLIB_CONFIG})
100	HAVE_GLIB= yes	100	HAVE_GLIB= yes
101	.else	101	.else
Lines 115-121 Link Here
115	.if defined(WITH_GTK) \|\| defined(WITH_ALL)	115	.if defined(WITH_GTK) \|\| defined(WITH_ALL)
116	HAVE_GTK= yes	116	HAVE_GTK= yes
117	.else	117	.else
118	GTK_CONFIG?= ${X11BASE}/bin/gtk12-config	118	GTK_CONFIG?= ${X11BASE}/bin/gtk-config
119	.if exists(${GTK_CONFIG})	119	.if exists(${GTK_CONFIG})
120	HAVE_GTK= yes	120	HAVE_GTK= yes
121	.else	121	.else
Lines 240-246 Link Here
240		240
241	.if defined(USE_GLIB)	241	.if defined(USE_GLIB)
242	LIB_DEPENDS+= glib12.3:${PORTSDIR}/devel/glib12	242	LIB_DEPENDS+= glib12.3:${PORTSDIR}/devel/glib12
243	GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config	243	GLIB_CONFIG?= ${LOCALBASE}/bin/glib-config
244	CONFIGURE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}"	244	CONFIGURE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}"
245	MAKE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}"	245	MAKE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}"
246	.if defined(HAVE_GLIB)	246	.if defined(HAVE_GLIB)
Lines 256-262 Link Here
256		256
257	.if defined(USE_GTK)	257	.if defined(USE_GTK)
258	LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12	258	LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
259	GTK_CONFIG?= ${X11BASE}/bin/gtk12-config	259	GTK_CONFIG?= ${X11BASE}/bin/gtk-config
260	CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}"	260	CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}"
261	MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}"	261	MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}"
262	.if defined(HAVE_GTK)	262	.if defined(HAVE_GTK)