Date: Fri, 23 Jul 2004 15:33:32 +0200 (CEST) From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69484: Mk/bsd.gnome.mk - adds wxtgk/wxgtk2 components Message-ID: <20040723133332.6688525F@gw.xbsd.org> Resent-Message-ID: <200407231340.i6NDeLtE009251@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69484
>Category: ports
>Synopsis: Mk/bsd.gnome.mk - adds wxtgk/wxgtk2 components
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 23 13:40:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Florent Thoumie
>Release: FreeBSD 4.9-RC i386
>Organization:
Xbsd.org
>Environment:
System: FreeBSD gw 4.9-RC FreeBSD 4.9-RC #4: Sun Oct 5 14:25:09 CEST 2003 rf@gw:/usr/src/sys/compile/GW i386
>Description:
This patch adds support for wxgtk and wxgtk2 components.
I didn't add wxgtk2-devel.
I introduced a (non-sexy) way to set/modify variables using ${component}_SET_VARS.
This has been done because I had to set WX_CONFIG according to the
version of wxgtk specified in USE_GNOME.
Please note the following thing :
innercity# cd /usr/ports/devel/py-orbit2
innercity# make -V ORBIT_CONFIG
/usr/local/bin/orbit-config
I may be wrong but that's not what I am expecting..
This can be corrected using orbit2_SET_VARS= ORBIT_CONFIG=${LOCALBASE}/bin/orbit2-config
>How-To-Repeat:
N/A
>Fix:
--- wxgtk.diff begins here ---
--- bsd.gnome.mk.old Fri Jul 23 11:01:50 2004
+++ bsd.gnome.mk Fri Jul 23 15:17:18 2004
@@ -33,7 +33,7 @@
_USE_GNOME_ALL+=libghttp glib12 gtk12 libxml gdkpixbuf imlib orbit \
gnomelibs gnomecanvas oaf gconf gnomevfs libcapplet \
gnomeprint bonobo libgda gnomedb libglade gal glibwww \
- gtkhtml pygtk pygnome
+ gtkhtml pygtk pygnome wxgtk
# GNOME 2 components
_USE_GNOME_ALL+=glib20 atk pango gtk20 linc libidl orbit2 \
@@ -43,7 +43,7 @@
libgtkhtml gnomedesktop libwnck vte libzvt librsvg2 eel2 \
gnomepanel nautilus2 metacity gal2 gnomecontrolcenter2 libgda2 \
libgnomedb gtksourceview libgsf libgsf_gnome pygtk2 pygnome2 \
- gstreamerplugins gtkhtml3 gnomespeech
+ gstreamerplugins gtkhtml3 gnomespeech wxgtk2
SCROLLKEEPER_DIR= /var/db/scrollkeeper
gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
@@ -223,6 +223,13 @@
pygnome_RUN_DEPENDS= ${pygnome_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome
pygnome_USE_GNOME_IMPL= gtkhtml pygtk
+WXGTK_CONFIG?= ${X11BASE}/bin/wxgtk-2.4-config
+wxgtk_LIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk
+wxgtk_CONFIGURE_ENV= WX_CONFIG="${WXGTK_CONFIG}"
+wxgtk_CONFIGURE_ARGS= --with-wx-config=${WXGTK_CONFIG}
+wxgtk_DETECT= ${WXGTK_CONFIG}
+wxgtk_SET_VARS= WX_CONFIG=${WXGTK_CONFIG}
+
glib20_LIB_DEPENDS= glib-2.0.400:${PORTSDIR}/devel/glib20
glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc
glib20_USE_GNOME_IMPL=gnometarget pkgconfig
@@ -421,6 +428,13 @@
gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
gnomespeech_USE_GNOME_IMPL=libbonobo
+WXGTK2_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config
+wxgtk2_LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+wxgtk2_CONFIGURE_ENV= WX_CONFIG="${WXGTK2_CONFIG}"
+wxgtk2_CONFIGURE_ARGS= --with-wx-config=${WXGTK2_CONFIG}
+wxgtk2_DETECT= ${WXGTK2_CONFIG}
+wxgtk2_SET_VARS= WX_CONFIG=${WXGTK2_CONFIG}
+
# End component definition section
# This section defines tests for optional software. These work off four
@@ -567,6 +581,12 @@
CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS}
CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV}
MAKE_ENV+= ${${component}_MAKE_ENV}
+
+. if defined(${component}_SET_VARS)
+. for i in ${${component}_SET_VARS}
+${i}
+. endfor
+. endif
. if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
CONFIGURE_TARGET= ${${component}_CONFIGURE_TARGET}
--- wxgtk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040723133332.6688525F>