On Tue, Mar 18, 2014 at 2:18 PM, Aaron Bieber <[email protected]> wrote:
> Hola!
>
> Our erlang port had broken wx libs included because the driver didn't
> build.
>
> Eshell V5.9.2 (abort with ^G)
> 1> wx:demo().
> ok
>
> =ERROR REPORT==== 18-Mar-2014::14:16:19 ===
> ERROR: Could not find 'wxe_driver.so' in:
> /usr/local/lib/erlang/lib/wx-0.99.2/priv
> 2>
>
> The below diff fixes the above issue.
>
Forgot to ask for OK!
OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/erlang/Makefile,v
> retrieving revision 1.54
> diff -u -p -r1.54 Makefile
> --- Makefile 11 Mar 2013 11:20:27 -0000 1.54
> +++ Makefile 18 Mar 2014 20:12:33 -0000
> @@ -7,13 +7,16 @@ V= R15B02
> DISTNAME= otp_src_${V}
> PKGNAME= erlang-15b.02
> EPOCH= 0
> +REVISION= 0
> CATEGORIES= lang
>
> # Erlang Public License
> # http://www.erlang.org/EPLICENSE
> PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB= c crypto m ncurses pthread ssl util
> +WANTLIB += GL GLU c crypto m ncurses pthread stdc++ util wx_base
> +WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_gl
> +WANTLIB += wx_gtk2_html wx_gtk2_stc wx_gtk2_xrc
>
> MASTER_SITES= ${HOMEPAGE}download/
>
> @@ -35,11 +38,14 @@ CONFIGURE_ARGS= --disable-jinterface \
> USE_GMAKE= Yes
> USE_GROFF = Yes
> CONFIGURE_STYLE=autoconf no-autoheader
> -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -pthread"
> +CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -pthread -L${X11BASE}/lib" \
> + CFLAGS="-I${X11BASE}/include"
> AUTOCONF_VERSION=2.59
> AUTOCONF_DIR= ${WRKSRC} ${WRKSRC}/erts
> MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/erts/autoconf \
> ${WRKSRC}/lib/erl_interface/src/auxdir
> +
> +LIB_DEPENDS= x11/wxWidgets
>
> .if ${MACHINE_ARCH} == i386
> CONFIGURE_ARGS+= --enable-ethread-pre-pentium4-compatibility
> Index: pkg/PFRAG.shared
> ===================================================================
> RCS file: /cvs/ports/lang/erlang/pkg/PFRAG.shared,v
> retrieving revision 1.6
> diff -u -p -r1.6 PFRAG.shared
> --- pkg/PFRAG.shared 26 May 2012 09:08:57 -0000 1.6
> +++ pkg/PFRAG.shared 18 Mar 2014 20:12:33 -0000
> @@ -6,3 +6,5 @@ lib/erlang/lib/${MEGACO}/priv/lib/megaco
> lib/erlang/lib/${RUNTIME_TOOLS}/priv/lib/dyntrace.so
> lib/erlang/lib/${RUNTIME_TOOLS}/priv/lib/trace_file_drv.so
> lib/erlang/lib/${RUNTIME_TOOLS}/priv/lib/trace_ip_drv.so
> +lib/erlang/lib/${WX}/priv/erl_gl.so
> +lib/erlang/lib/${WX}/priv/wxe_driver.so
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/lang/erlang/pkg/PLIST,v
> retrieving revision 1.24
> diff -u -p -r1.24 PLIST
> --- pkg/PLIST 10 Sep 2012 20:35:19 -0000 1.24
> +++ pkg/PLIST 18 Mar 2014 20:12:33 -0000
> @@ -6809,6 +6809,9 @@ lib/erlang/lib/${WX}/include/gl.hrl
> lib/erlang/lib/${WX}/include/glu.hrl
> lib/erlang/lib/${WX}/include/wx.hrl
> lib/erlang/lib/${WX}/info
> +lib/erlang/lib/${WX}/priv/
> +lib/erlang/lib/${WX}/priv/erlang-logo32.png
> +lib/erlang/lib/${WX}/priv/erlang-logo64.png
> lib/erlang/lib/${WX}/src/
> lib/erlang/lib/${WX}/src/gen/
> lib/erlang/lib/${WX}/src/gen/gl.erl
>
