Page MenuHomeFreeBSD
Files F144320714

D13478.id36611.diff
No OneTemporary
Actions

D13478.id36611.diff
View Options

Index: audio/abraca/files/patch-waftools_man.py
===================================================================
--- /dev/null
+++ audio/abraca/files/patch-waftools_man.py
@@ -0,0 +1,11 @@
+--- waftools/man.py.orig 2014-10-26 18:55:55 UTC
++++ waftools/man.py
+@@ -14,7 +14,7 @@ def gzip_func(task):
+ try:
+ input = open(infile, 'rb')
+ outf = open(outfile, 'wb')
+- output = gzip.GzipFile(os.path.basename(infile), fileobj=outf)
++ output = gzip.GzipFile(os.path.basename(infile), fileobj=outf, mtime=0)
+ output.write(input.read())
+ finally:
+ if input:
Index: finance/gnucash/Makefile
===================================================================
--- finance/gnucash/Makefile
+++ finance/gnucash/Makefile
@@ -25,17 +25,12 @@
p5-Finance-Quote>=0:finance/p5-Finance-Quote
OPTIONS_DEFINE= AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM DOCS
-OPTIONS_SINGLE= GV
-OPTIONS_SINGLE_GV= GUILE1 GUILE2
-OPTIONS_DEFAULT= GUILE1
AQBANKING_DESC= AqBanking support (HBCI/OpenHBCI)
OFX_DESC= OFX support
DATABASE_DESC= Enable SQL database backends
LOCALE_TAX_DESC= Enable localized tax categories
GTKMM_DESC= Enable GTKMM based UI
-GUILE1_DESC= Use lang/guile
-GUILE2_DESC= Use lang/guile2
OPTIONS_SUB= yes
AQBANKING_CONFIGURE_ENABLE=aqbanking
@@ -57,13 +52,17 @@
GTKMM_USE= GNOME=gtkmm24
GTKMM_CONFIGURE_ON= --enable-gtkmm
GTKMM_CONFIGURE_OFF= --disable-gtkmm
-GUILE1_LIB_DEPENDS= libguile.so:lang/guile
-GUILE1_BUILD_DEPENDS= slib-guile>0:lang/slib-guile
-GUILE1_RUN_DEPENDS= slib-guile>0:lang/slib-guile
-GUILE2_LIB_DEPENDS= libguile-2.0.so:lang/guile2
-GUILE2_BUILD_DEPENDS= slib-guile2>0:lang/slib-guile2
-GUILE2_RUN_DEPENDS= slib-guile2>0:lang/slib-guile2
+FLAVORS= guile2 guile1
+
+guile1_PKGNAMESUFFIX= -guile1
+guile1_LIB_DEPENDS= libguile.so:lang/guile
+guile1_BUILD_DEPENDS= slib-guile>0:lang/slib-guile
+guile1_RUN_DEPENDS= slib-guile>0:lang/slib-guile
+guile2_LIB_DEPENDS= libguile-2.0.so:lang/guile2
+guile2_BUILD_DEPENDS= slib-guile2>0:lang/slib-guile2
+guile2_RUN_DEPENDS= slib-guile2>0:lang/slib-guile2
+
USES= compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \
perl5 pkgconfig shebangfix tar:bzip2
USE_XORG= x11
@@ -93,6 +92,14 @@
org.gnucash.warnings.gschema.xml \
org.gnucash.window.pages.account.tree.gschema.xml \
org.gnucash.window.pages.gschema.xml
+
+.if ${FLAVOR:U} == guile1
+CONFIGURE_ARGS+= --with-guile=1.8
+PLIST_SUB+= GUILE2="@comment "
+.else
+CONFIGURE_ARGS+= --with-guile=2.0
+PLIST_SUB+= GUILE2=""
+.endif
.include <bsd.port.pre.mk>
Index: games/pokerth/files/patch-src_third__party_websocketpp_websocketpp_transport_asio_connection.hpp
===================================================================
--- /dev/null
+++ games/pokerth/files/patch-src_third__party_websocketpp_websocketpp_transport_asio_connection.hpp
@@ -0,0 +1,21 @@
+--- src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp.orig 2014-01-10 21:18:21 UTC
++++ src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
+@@ -79,10 +79,18 @@ class connection : public config::socket_type::socket_
+ typedef typename config::response_type response_type;
+ typedef typename response_type::ptr response_ptr;
+
++#if BOOST_VERSION < 106600
+ /// Type of a pointer to the ASIO io_service being used
+ typedef boost::asio::io_service* io_service_ptr;
+ /// Type of a pointer to the ASIO io_service::strand being used
+ typedef lib::shared_ptr<boost::asio::io_service::strand> strand_ptr;
++#else
++ /// Type of a pointer to the ASIO io_service being used
++ typedef boost::asio::io_context* io_service_ptr;
++ /// Type of a pointer to the ASIO io_service::strand being used
++ typedef lib::shared_ptr<boost::asio::io_context::strand> strand_ptr;
++#endif
++
+ /// Type of a pointer to the ASIO timer class
+ typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
+
Index: games/pokerth/files/patch-src_third__party_websocketpp_websocketpp_transport_asio_endpoint.hpp
===================================================================
--- /dev/null
+++ games/pokerth/files/patch-src_third__party_websocketpp_websocketpp_transport_asio_endpoint.hpp
@@ -0,0 +1,28 @@
+--- src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig 2014-01-10 21:18:21 UTC
++++ src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
+@@ -76,16 +76,23 @@ class endpoint : public config::socket_type { (public)
+ /// associated with this endpoint transport component
+ typedef typename transport_con_type::ptr transport_con_ptr;
+
++#if BOOST_VERSION < 106600
+ /// Type of a pointer to the ASIO io_service being used
+ typedef boost::asio::io_service* io_service_ptr;
++ /// Type of a shared pointer to an io_service work object
++ typedef lib::shared_ptr<boost::asio::io_service::work> work_ptr;
++#else
++ /// Type of a pointer to the ASIO io_service being used
++ typedef boost::asio::io_context* io_service_ptr;
++ /// Type of a shared pointer to an io_service work object
++ typedef lib::shared_ptr<boost::asio::io_context::work> work_ptr;
++#endif
+ /// Type of a shared pointer to the acceptor being used
+ typedef lib::shared_ptr<boost::asio::ip::tcp::acceptor> acceptor_ptr;
+ /// Type of a shared pointer to the resolver being used
+ typedef lib::shared_ptr<boost::asio::ip::tcp::resolver> resolver_ptr;
+ /// Type of timer handle
+ typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
+- /// Type of a shared pointer to an io_service work object
+- typedef lib::shared_ptr<boost::asio::io_service::work> work_ptr;
+
+ // generate and manage our own io_service
+ explicit endpoint()

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 8, 8:16 PM (31 m, 36 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28493273
Default Alt Text
D13478.id36611.diff (5 KB)

Event Timeline