Index: head/lang/erlang-wx/Makefile =================================================================== --- head/lang/erlang-wx/Makefile (revision 433112) +++ head/lang/erlang-wx/Makefile (revision 433113) @@ -1,76 +1,76 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.2.1 +PORTVERSION= 19.2.2 CATEGORIES= lang parallel MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg PKGNAMESUFFIX= -wx DISTNAME= otp_src_${ERL_RELEASE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ LOCAL/olgeni -PATCHFILES= patch-otp-19.2.1 +PATCHFILES= patch-otp-19.2.1 patch-otp-19.2.2 MAINTAINER= olgeni@FreeBSD.org COMMENT= Erlang bindings for wxWindows LICENSE= APACHE20 RUN_DEPENDS= ${LOCALBASE}/bin/erl:lang/erlang WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE} PLIST_SUB= APP_VERSION=${APP_VERSION} \ CONFIGURE_TARGET=${CONFIGURE_TARGET} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS ERL_RELEASE= 19.2 USES= gmake USE_GL= gl glu GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib APP_VERSION= 1.8 APP_DIR= ${PREFIX}/lib/erlang/lib/wx-${APP_VERSION} .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${ERLANG_DOCS}:erlangorg .endif CONFIGURE_ARGS+=--enable-threads --without-odbc --without-javac --with-wx-config=${WX_CONFIG} USE_WX= 2.8+ WX_COMPS= wx contrib ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz do-build: cd ${WRKSRC}/lib/wx && ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET} ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/erl_gl.so ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/wxe_driver.so do-install: @${MKDIR} ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} ebin ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} include ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} priv ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} src ${STAGEDIR}${APP_DIR} do-install-DOCS-on: cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} doc ${STAGEDIR}${APP_DIR} ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/erlang lib/wx-${APP_VERSION} @${FIND} ${STAGEDIR}${APP_DIR} -type d -empty -delete .include Index: head/lang/erlang-wx/distinfo =================================================================== --- head/lang/erlang-wx/distinfo (revision 433112) +++ head/lang/erlang-wx/distinfo (revision 433113) @@ -1,7 +1,9 @@ -TIMESTAMP = 1484655871 +TIMESTAMP = 1485949081 SHA256 (erlang/otp_src_19.2.tar.gz) = a016b3ef5dac1e532972617b2715ef187ecb616f7cd7ddcfe0f1d502f5d24870 SIZE (erlang/otp_src_19.2.tar.gz) = 68395949 SHA256 (erlang/otp_doc_html_19.2.tar.gz) = c373c8c1a9fe7433825088684932f3ded76f53d5b8a4d3d2a364263f1f783043 SIZE (erlang/otp_doc_html_19.2.tar.gz) = 34761971 SHA256 (erlang/patch-otp-19.2.1) = 5fe07da09c914e1145c3e15e2f459fdb7cceedec0213a289ad238dada9645d2c SIZE (erlang/patch-otp-19.2.1) = 9287 +SHA256 (erlang/patch-otp-19.2.2) = a64cac32675fe57cb749461eba9458bbc4d7abddf58996c897e2528a41f2e33c +SIZE (erlang/patch-otp-19.2.2) = 9412 Index: head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp =================================================================== --- head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp (nonexistent) +++ head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp (revision 433113) @@ -0,0 +1,20 @@ +--- lib/wx/c_src/wxe_impl.cpp.orig 2017-01-30 23:13:25 UTC ++++ lib/wx/c_src/wxe_impl.cpp +@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE + throw wxe_badarg(index); + } + void * temp = memenv->ref2ptr[index]; +- if((index < memenv->next) && ((index == 0) || (temp > NULL))) ++ if((index < memenv->next) && ((index == 0) || (temp != NULL))) + return temp; + else { + throw wxe_badarg(index); +@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD + if(!memenv) + throw wxe_badarg(index); + void * temp = memenv->ref2ptr[index]; +- if((index < memenv->next) && ((index == 0) || (temp > NULL))) { ++ if((index < memenv->next) && ((index == 0) || (temp != NULL))) { + ptrMap::iterator it; + it = ptr2ref.find(temp); + if(it != ptr2ref.end()) { Property changes on: head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property