I'm trying to update net-p2p/libtorrent-rasterbar from 0.16.x to 1.0.x because that is the new stable release line. From what I've read, the 1.0 release offers some bug fixes that are affecting my deluge install on my server. I found this tutorial that has been very useful in getting me started in the port upgrade process, as this is my first attempt at modifying a port.
I was able to get the base port to update and build properly on my machine, but Deluge uses the slave port net-p2p/libtorrent-rasterbar-python which has build errors after my changes. Below is a copy of my changes and the build log. Thank you for any help or knowledge you can offer so I can finish this update will be appreciated.
Link to the full build log (Google Drive)
Copy of build log error:
diff of Makefile, distinfo and pkg-plist in libtorrent-rasterbar:
I was able to get the base port to update and build properly on my machine, but Deluge uses the slave port net-p2p/libtorrent-rasterbar-python which has build errors after my changes. Below is a copy of my changes and the build log. Thank you for any help or knowledge you can offer so I can finish this update will be appreciated.
Link to the full build log (Google Drive)
Copy of build log error:
Code:
c++ -shared -Wl,-rpath,/usr/lib:/usr/local/lib -O2 -pipe -fno-strict-aliasing build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/alert.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/big_number.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/converters.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/create_torrent.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/datetime.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/entry.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/error_code.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/fingerprint.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/ip_filter.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/magnet_uri.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/module.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/peer_info.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/session.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/session_settings.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/string.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/torrent_handle.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/torrent_info.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/torrent_status.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/utility.o build/temp.freebsd-10.0-RELEASE-p9-amd64-2.7/src/version.o -L/usr/local/lib -L/usr/lib -L/usr/local/lib -ltorrent-rasterbar -lGeoIP -lpthread -lboost_system -lboost_python -lpthread -lssl -lcrypto -lpython2.7 -o build/lib.freebsd-10.0-RELEASE-p9-amd64-2.7/libtorrent.so -L/usr/local/lib -Wl,-rpath,/usr/lib:/usr/local/lib -L../../src/.libs
/usr/bin/ld: cannot find -ltorrent-rasterbar
c++: error: linker command failed with exit code 1 (use -v to see invocation)
error: command 'c++' failed with exit status 1
*** Error code 1
Stop.
make[1]: stopped in /usr/ports/net-p2p/libtorrent-rasterbar-python
*** Error code 1
Stop.
make: stopped in /usr/ports/net-p2p/libtorrent-rasterbar-pythondiff of Makefile, distinfo and pkg-plist in libtorrent-rasterbar:
Code:
--- Makefile.new 2014-10-11 16:15:50.000000000 -0500
+++ Makefile.old 2014-10-11 10:02:33.000000000 -0500
@@ -2,7 +2,7 @@
# $FreeBSD: head/net-p2p/libtorrent-rasterbar/Makefile 364628 2014-08-11 17:05:50Z adamw $
PORTNAME= libtorrent-rasterbar
-PORTVERSION= 1.0.2
+PORTVERSION= 0.16.17
PORTREVISION= 1
CATEGORIES?= net-p2p ipv6
MASTER_SITES= SF/${PORTNAME:S/-rasterbar//}/${PORTNAME:S/-rasterbar//}/
@@ -32,7 +32,7 @@
--with-libiconv \
--with-openssl=${OPENSSLBASE}
-SHLIB_VER= 8
+SHLIB_VER= 7
PLIST_SUB+= SHLIB_VER="${SHLIB_VER}"
SUB_FILES= pkg-message
--- distinfo.new 2014-10-11 16:15:58.000000000 -0500
+++ distinfo.old 2014-10-11 10:02:42.000000000 -0500
@@ -1,3 +1,2 @@
-SHA256 (libtorrent-rasterbar-1.0.2.tar.gz) = 3c8c8e1484dfe6321271c4e51e7d5a005e13240f7f0e99908f50cc6ccd6204de
-SIZE (libtorrent-rasterbar-1.0.2.tar.gz) = 3259318
-
+SHA256 (libtorrent-rasterbar-0.16.17.tar.gz) = 67a1d29c626d991d6e39c2f9828ca70c4053d057070ce01fff9b4ad37e64aff0
+SIZE (libtorrent-rasterbar-0.16.17.tar.gz) = 3018881
--- pkg-plist.new 2014-10-11 16:16:10.000000000 -0500
+++ pkg-plist.old 2014-10-11 15:39:08.000000000 -0500
@@ -2,8 +2,6 @@
include/libtorrent/add_torrent_params.hpp
include/libtorrent/address.hpp
include/libtorrent/alert.hpp
-include/libtorrent/alert_dispatcher.hpp
-include/libtorrent/alert_manager.hpp
include/libtorrent/alert_types.hpp
include/libtorrent/alloca.hpp
include/libtorrent/allocator.hpp
@@ -30,13 +28,11 @@
include/libtorrent/disk_buffer_holder.hpp
include/libtorrent/disk_buffer_pool.hpp
include/libtorrent/disk_io_thread.hpp
-include/libtorrent/ed25519.hpp
include/libtorrent/entry.hpp
include/libtorrent/enum_net.hpp
include/libtorrent/error.hpp
include/libtorrent/error_code.hpp
include/libtorrent/escape_string.hpp
-include/libtorrent/export.hpp
include/libtorrent/extensions.hpp
include/libtorrent/extensions/logger.hpp
include/libtorrent/extensions/lt_trackers.hpp
@@ -64,13 +60,8 @@
include/libtorrent/io_service.hpp
include/libtorrent/io_service_fwd.hpp
include/libtorrent/ip_filter.hpp
-include/libtorrent/ip_voter.hpp
-include/libtorrent/kademlia/dht_observer.hpp
include/libtorrent/kademlia/dht_tracker.hpp
include/libtorrent/kademlia/find_data.hpp
-include/libtorrent/kademlia/get_item.hpp
-include/libtorrent/kademlia/get_peers.hpp
-include/libtorrent/kademlia/item.hpp
include/libtorrent/kademlia/logging.hpp
include/libtorrent/kademlia/msg.hpp
include/libtorrent/kademlia/node.hpp
@@ -88,6 +79,7 @@
include/libtorrent/natpmp.hpp
include/libtorrent/packet_buffer.hpp
include/libtorrent/parse_url.hpp
+include/libtorrent/pch.hpp
include/libtorrent/pe_crypto.hpp
include/libtorrent/peer.hpp
include/libtorrent/peer_connection.hpp
@@ -101,12 +93,12 @@
include/libtorrent/ptime.hpp
include/libtorrent/puff.hpp
include/libtorrent/random.hpp
+include/libtorrent/rsa.hpp
include/libtorrent/rss.hpp
include/libtorrent/session.hpp
include/libtorrent/session_settings.hpp
include/libtorrent/session_status.hpp
include/libtorrent/settings.hpp
-include/libtorrent/sha1_hash.hpp
include/libtorrent/size_type.hpp
include/libtorrent/sliding_average.hpp
include/libtorrent/socket.hpp
@@ -119,6 +111,7 @@
include/libtorrent/storage.hpp
include/libtorrent/storage_defs.hpp
include/libtorrent/string_util.hpp
+include/libtorrent/struct_debug.hpp
include/libtorrent/thread.hpp
include/libtorrent/time.hpp
include/libtorrent/timestamp_history.hpp
@@ -133,7 +126,7 @@
include/libtorrent/udp_tracker_connection.hpp
include/libtorrent/union_endpoint.hpp
include/libtorrent/upnp.hpp
-include/libtorrent/utf%%SHLIB_VER%%.hpp
+include/libtorrent/utf8.hpp
include/libtorrent/utp_socket_manager.hpp
include/libtorrent/utp_stream.hpp
include/libtorrent/version.hpp
@@ -142,8 +135,9 @@
include/libtorrent/xml_parse.hpp
lib/libtorrent-rasterbar.so
lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
+lib/libtorrent-rasterbar.so.%%SHLIB_VER%%.0.0
libdata/pkgconfig/libtorrent-rasterbar.pc
-@dir include/libtorrent/aux_
-@dir include/libtorrent/extensions
-@dir include/libtorrent/kademlia
-@dir include/libtorrent
+@dirrm include/libtorrent/aux_
+@dirrm include/libtorrent/extensions
+@dirrm include/libtorrent/kademlia
+@dirrm include/libtorrent