Index: head/net/anet/Makefile =================================================================== --- head/net/anet/Makefile (revision 417941) +++ head/net/anet/Makefile (revision 417942) @@ -1,70 +1,57 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= anet -PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTVERSION= 0.3.3 CATEGORIES= net MASTER_SITES= http://www.codelabs.ch/download/ DISTNAME= libanet-${PORTVERSION} MAINTAINER= marino@FreeBSD.org COMMENT= Networking library for Ada LICENSE= GPLv2 GMGPL LICENSE_COMB= multi USES= ada tar:bzip2 ALL_TARGET= build_lib MAKE_ARGS+= NUM_CPUS=${MAKE_JOBS_NUMBER} \ LIBRARY_KIND=static \ OS=bsd OPTIONS_DEFINE= TEST DOCS TEST_DESC= Run unit test suite before installation +TEST_ALL_TARGET= tests +TEST_BUILD_DEPENDS= ${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven +DOCS_USES= gmake +DOCS_ALL_TARGET= doc +DOCS_BUILD_DEPENDS= asciidoc:textproc/asciidoc \ + source-highlight:textproc/source-highlight -.include - -.if ${OPSYS} == DragonFly && ${ARCH} == i386 -IGNORE= will not build; atomics are not supported on DF i386 -.endif - -.if ${PORT_OPTIONS:MTEST} -BUILD_DEPENDS+= ${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven -ALL_TARGET+= tests -.endif - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= asciidoc:textproc/asciidoc \ - source-highlight:textproc/source-highlight -ALL_TARGET+= doc -USES+= gmake -.endif - post-patch: @${REINPLACE_CMD} -e 's|dynamic|static|g' \ ${WRKSRC}/gnat/anet.gpr @${REINPLACE_CMD} -e 's|DESTDIR|DEST2|g' \ ${WRKSRC}/doc/Makefile do-build: ${MKDIR} ${WRKSRC}/doc/html cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \ ${STAGEDIR}${PREFIX}/lib/anet \ ${STAGEDIR}${PREFIX}/include/anet ${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] ${WRKSRC}/src/bsd/*.ad[bs] \ ${STAGEDIR}${PREFIX}/include/anet - ${INSTALL_DATA} ${WRKSRC}/lib/static/*.ali \ + ${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.ali \ ${STAGEDIR}${PREFIX}/lib/anet - ${INSTALL_DATA} ${WRKSRC}/lib/static/*.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/gnat/anet.gpr ${STAGEDIR}${PREFIX}/lib/gnat -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) -.endif .include Index: head/net/anet/distinfo =================================================================== --- head/net/anet/distinfo (revision 417941) +++ head/net/anet/distinfo (revision 417942) @@ -1,2 +1,3 @@ -SHA256 (libanet-0.3.1.tar.bz2) = 6366f4cfe3be0e61e319d0dad2018f61eb0437b4d551587e10cc6b8ab276fb93 -SIZE (libanet-0.3.1.tar.bz2) = 49100 +TIMESTAMP = 1467439601 +SHA256 (libanet-0.3.3.tar.bz2) = 8ef101d47f549232b0276687235ac7767a2b50b6bde5f48ca21c20007e8ad20b +SIZE (libanet-0.3.3.tar.bz2) = 50553 Index: head/net/anet/files/patch-src_anet-sockets-inet.adb =================================================================== --- head/net/anet/files/patch-src_anet-sockets-inet.adb (nonexistent) +++ head/net/anet/files/patch-src_anet-sockets-inet.adb (revision 417942) @@ -0,0 +1,74 @@ +--- src/anet-sockets-inet.adb.orig 2016-06-29 10:26:01 UTC ++++ src/anet-sockets-inet.adb +@@ -52,7 +52,7 @@ package body Anet.Sockets.Inet is + Res : C.int; + Sock : Thin.Inet.Sockaddr_In_Type + (Family => Socket_Families.Family_Inet); +- Len : aliased C.int := Sock'Size / 8; ++ Len : aliased C.int := Thin.Inet.Sockaddr_In_Size; + begin + New_Socket.Sock_FD := -1; + +@@ -80,7 +80,7 @@ package body Anet.Sockets.Inet is + Res : C.int; + Sock : Thin.Inet.Sockaddr_In_Type + (Family => Socket_Families.Family_Inet6); +- Len : aliased C.int := Sock'Size / 8; ++ Len : aliased C.int := Thin.Inet.Sockaddr_In6_Size; + begin + New_Socket.Sock_FD := -1; + +@@ -129,7 +129,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Bind + (S => Socket.Sock_FD, + Name => Sockaddr'Address, +- Namelen => Sockaddr'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In_Size), + Message => "Unable to bind IPv4 socket to " & To_String + (Address => Address) & "," & Port'Img); + end Bind; +@@ -153,7 +153,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Bind + (S => Socket.Sock_FD, + Name => Sockaddr'Address, +- Namelen => Sockaddr'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In6_Size), + Message => "Unable to bind IPv6 socket to " & To_String + (Address => Address) & "," & Port'Img); + end Bind; +@@ -173,7 +173,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Connect + (S => Socket.Sock_FD, + Name => Dst'Address, +- Namelen => Dst'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In_Size), + Message => "Unable to connect socket to address " & To_String + (Address => Address) & " (" & Port'Img & " )"); + end Connect; +@@ -193,7 +193,7 @@ package body Anet.Sockets.Inet is + (Result => Thin.C_Connect + (S => Socket.Sock_FD, + Name => Dst'Address, +- Namelen => Dst'Size / 8), ++ Namelen => Thin.Inet.Sockaddr_In6_Size), + Message => "Unable to connect socket to address " & To_String + (Address => Address) & " (" & Port'Img & " )"); + end Connect; +@@ -432,7 +432,7 @@ package body Anet.Sockets.Inet is + Len => Item'Length, + Flags => 0, + To => Dst'Address, +- Tolen => Dst'Size / 8); ++ Tolen => Thin.Inet.Sockaddr_In_Size); + + Errno.Check_Or_Raise + (Result => C.int (Res), +@@ -464,7 +464,7 @@ package body Anet.Sockets.Inet is + Len => Item'Length, + Flags => 0, + To => Dst'Address, +- Tolen => Dst'Size / 8); ++ Tolen => Thin.Inet.Sockaddr_In6_Size); + + Errno.Check_Or_Raise + (Result => C.int (Res), Property changes on: head/net/anet/files/patch-src_anet-sockets-inet.adb ___________________________________________________________________ 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 Index: head/net/anet/pkg-plist =================================================================== --- head/net/anet/pkg-plist (revision 417941) +++ head/net/anet/pkg-plist (revision 417942) @@ -1,76 +1,79 @@ include/anet/anet-byte_swapping.adb include/anet/anet-byte_swapping.ads include/anet/anet-constants.ads +include/anet/anet-errno.adb +include/anet/anet-errno.ads include/anet/anet-ipv4.adb include/anet/anet-ipv4.ads include/anet/anet-net_ifaces.adb include/anet/anet-net_ifaces.ads include/anet/anet-os.adb include/anet/anet-os.ads include/anet/anet-os_constants.ads include/anet/anet-receivers-datagram.adb include/anet/anet-receivers-datagram.ads include/anet/anet-receivers-stream.adb include/anet/anet-receivers-stream.ads include/anet/anet-receivers.adb include/anet/anet-receivers.ads include/anet/anet-socket_families.ads include/anet/anet-sockets-filters.adb include/anet/anet-sockets-filters.ads include/anet/anet-sockets-inet-iface.adb include/anet/anet-sockets-inet-iface.ads include/anet/anet-sockets-inet.adb include/anet/anet-sockets-inet.ads include/anet/anet-sockets-thin-inet.adb include/anet/anet-sockets-thin-inet.ads include/anet/anet-sockets-thin-netdev-requests.ads include/anet/anet-sockets-thin-netdev.ads include/anet/anet-sockets-thin-sockaddr.ads include/anet/anet-sockets-thin-unix.ads include/anet/anet-sockets-thin.ads include/anet/anet-sockets-unix.adb include/anet/anet-sockets-unix.ads include/anet/anet-sockets.adb include/anet/anet-sockets.ads include/anet/anet-streams.adb include/anet/anet-streams.ads include/anet/anet-thin.ads include/anet/anet-types.adb include/anet/anet-types.ads include/anet/anet-udp.adb include/anet/anet-udp.ads include/anet/anet-util.adb include/anet/anet-util.ads include/anet/anet.adb include/anet/anet.ads lib/anet/anet-byte_swapping.ali lib/anet/anet-constants.ali +lib/anet/anet-errno.ali lib/anet/anet-ipv4.ali lib/anet/anet-net_ifaces.ali lib/anet/anet-os.ali lib/anet/anet-os_constants.ali lib/anet/anet-receivers-datagram.ali lib/anet/anet-receivers-stream.ali lib/anet/anet-receivers.ali lib/anet/anet-socket_families.ali lib/anet/anet-sockets-filters.ali lib/anet/anet-sockets-inet-iface.ali lib/anet/anet-sockets-inet.ali lib/anet/anet-sockets-thin-inet.ali lib/anet/anet-sockets-thin-netdev-requests.ali lib/anet/anet-sockets-thin-netdev.ali lib/anet/anet-sockets-thin-sockaddr.ali lib/anet/anet-sockets-thin-unix.ali lib/anet/anet-sockets-thin.ali lib/anet/anet-sockets-unix.ali lib/anet/anet-sockets.ali lib/anet/anet-streams.ali lib/anet/anet-thin.ali lib/anet/anet-types.ali lib/anet/anet-udp.ali lib/anet/anet-util.ali lib/anet/anet.ali lib/gnat/anet.gpr lib/libanet.a %%PORTDOCS%%%%DOCSDIR%%/html/asciidoc.css %%PORTDOCS%%%%DOCSDIR%%/html/index.html