Update to network-3.1.1.1

Version 3.1.1.1
* Fix for GHCJS. #431

Version 3.1.1.0
* A new API: gracefulClose. #417
* touchSocket, unsafeFdSocket: Allow direct access to a socket's file
  descriptor while providing tools to prevent it from being garbage
  collected. This also deprecated fdSocket in favor of unsafeFdSocket
  and withFdSocket. #423
* socketToFd: Duplicates a socket as a file desriptor and closes the
  source socket. #424

Version 3.1.0.1
* getAddrInfo: raise exception if no AddrInfo returned. #410
* Avoid catching SomeException. #411

Version 3.1.0.0
* Making GC of socket safer. #399
* Deprecating fdSocket. Use withFdSocket instead to ensure that
  sockets are GCed in proper time. #399

Version 3.0.1.1
* Fix blocking if_nametoindex errors on Windows #391

Version 3.0.1.0
* Added getSocketType :: Socket -> IO SocketType. #372
* Correcting manual and brushing up test cases #375
* Fixed longstanded bug in getContents on mac #375
* Fixing regression: set correct sockaddr length for abstract
  addresses for Linux. #374

Version 3.0.0.1
* Fixed a bug in connect where exceptions were not thrown #368

Version 3.0.0.0
* Breaking change: the Network and Network.BSD are
  removed. Network.BSD is provided a new package: network-bsd.
* Breaking change: the signatures are changed:

    old fdSocket :: Socket -> CInt
    new fdSocket :: Socket -> IO CInt

    old mkSocket :: CInt -> Family -> SocketType -> ProtocolNumber -> SocketStatus -> IO Socket
    new mkSocket :: CInt -> IO Socket

* Breaking change: the deprecated APIs are removed: send, sendTo,
  recv, recvFrom, recvLen, htonl, ntohl, inet_addr, int_ntoa,
  bindSocket, sClose, SocketStatus, isConnected, isBound, isListening,
  isReadable, isWritable, sIsConnected, sIsBound, sIsListening,
  sIsReadable, sIsWritable, aNY_PORT, iNADDR_ANY, iN6ADDR_ANY,
  sOMAXCONN, sOL_SOCKET, sCM_RIGHTS, packSocketType, getPeerCred.
* Breaking change: SockAddrCan is removed from SockAddr.
* Socket addresses are extendable with Network.Socket.Address.
* "socket" is now asynchronous-exception-safe. #336
* "recvFrom" returns (0, addr) instead of throwing an error on EOF. #360
* All APIs are available on any platforms.
* Build system is simplified.
* Bug fixes.

Version 2.8.0.1
* Eensuring that accept returns a correct sockaddr for unix
  domain. #400
* Avoid out of bounds writes in pokeSockAddr. #400

Version 2.8.0.0
* Breaking change: PortNumber originally contained Word16 in network
  byte order and used "deriving Ord". This results in strange behavior
  on the Ord instance. Now PortNumber holds Word16 in host byte
  order. #347
* Breaking change: stopping the export of the PortNum constructor in
  PortNumber.
* Use bytestring == 0.10.* only.
* Use base >= 4.7 && < 5.

Version 2.7.0.2
* Removing withMVar to avoid the deadlock between "accept" and "close"
  #330
* "close" does not throw exceptions. A new API: "close'" throws
  exceptions when necessary. #337
* Fixing the hang of lazy sendAll. #340
* Installing NetDef.h (#334) #334

Version 2.7.0.1
* A new API: socketPortSafe. #319
* Fixing a drain bug of sendAll. #320
* Porting the new CALLCONV convention from master. #313
* Withdrawing the deprecations of packFamily and unpackFamily. #324

Version 2.7.0.0
* Obsoleting the Network module.
* Obsoleting the Network.BSD module.
* Obsoleting APIs: MkSocket, htonl, ntohl, getPeerCred, getPeerEid,
  send, sendTo, recv, recvFrom, recvLen, inet_addr, inet_ntoa,
  isConnected, isBound, isListening, isReadable, isWritable, aNY_PORT,
  iNADDR_ANY, iN6ADDR_ANY, sOMAXCONN, sOL_SOCKET, sCM_RIGHTS,
  packFamily, unpackFamily, packSocketType
* Breaking change: do not closeFd within sendFd. #271
* Exporting ifNameToIndex and ifIndexToName from Network.Socket.
* New APIs: setCloseOnExecIfNeeded, getCloseOnExec and getNonBlock
* New APIs: isUnixDomainSocketAvailable and getPeerCredential
* socketPair, sendFd and recvFd are exported even on Windows.

Version 2.6.3.5
* Reverting "Do not closeFd within sendFd" #271

Version 2.6.3.4
* Don't touch IPv6Only when running on OpenBSD #227
* Do not closeFd within sendFd #271
* Updating examples and docs.

Version 2.6.3.3
* Adds a function to show the defaultHints without reading their
  undefined fields #291
* Improve exception error messages for getAddrInfo and getNameInfo
  #289

Version 2.6.3.2
* Zero memory of sockaddr_un if abstract socket #220
* Improving error messages #232
* Allow non-blocking file descriptors via setNonBlockIfNeeded #242
* Update config.{guess,sub} to latest version #244
* Rename my_inet_ntoa to avoid symbol conflicts #228
* Test infrastructure improvements #219 #217 #218
* House keeping and cleanup #238 #237

Version 2.6.3.1
* Reverse breaking exception change in Network.Socket.ByteString.recv
  #215

Version 2.6.3.0
* New maintainers: Evan Borden (@eborden) and Kazu Yamamoto
  (@kazu-yamamoto). The maintainer for a long period, Johan Tibell
  (@tibbe) stepped down. Thank you, Johan, for your hard work for a
  long time.
* New APIs: ntohl, htonl,hostAddressToTuple{,6} and
  tupleToHostAddress{,6}. #210
* Added a Read instance for PortNumber. #145
* We only set the IPV6_V6ONLY flag to 0 for stream and datagram socket
  types, as opposed to all of them. This makes it possible to use
  ICMPv6. #180 #181
* Work around GHC bug #12020. Socket errors no longer cause segfaults
  or hangs on Windows. #192
* Various documentation improvements and the deprecated pragmas. #186
  #201 #205 #206 #211
* Various internal improvements. #193 #200

Version 2.6.2.1
* Regenerate configure and HsNetworkConfig.h.in.
* Better detection of CAN sockets.

Version 2.6.2.0
* Add support for TCP_USER_TIMEOUT.
* Don't conditionally export the SockAddr constructors.
* Add isSupportSockAddr to allow checking for supported address types
  at runtime.

4 files changed, 10 insertions, 80 deletions

diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index 54d48159f54..55dff7bf269 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2016/01/10 11:49:10 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.13 2020/01/01 03:10:36 pho Exp $
 
-DISTNAME=	network-2.5.0.0
-PKGREVISION=	11
+DISTNAME=	network-3.1.1.1
 CATEGORIES=	net
 
 MAINTAINER=	pho@cielonegro.org
@@ -9,5 +8,4 @@ COMMENT=	Haskell Low-level networking interface
 LICENSE=	modified-bsd
 
 .include "../../mk/haskell.mk"
-.include "../../textproc/hs-parsec/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/hs-network/PLIST b/net/hs-network/PLIST
deleted file mode 100644
index 42e1dd279e9..00000000000
--- a/net/hs-network/PLIST
+++ /dev/null
@@ -1,66 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/21 20:58:17 szptvlfn Exp $
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/HSnetwork-${PKGVERSION}.o
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/BSD.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket/ByteString.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket/ByteString/IOVec.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket/ByteString/Internal.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket/ByteString/Lazy.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket/ByteString/MsgHdr.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket/Internal.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/Socket/Types.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/Network/URI.hi
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/include/HsNet.h
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/include/HsNetworkConfig.h
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/libHSnetwork-${PKGVERSION}.a
-lib/network-${PKGVERSION}/${HASKELL_VERSION}/package-description
-share/doc/network-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/Network-BSD.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/Network-Socket-ByteString-Lazy.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/Network-Socket-ByteString.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/Network-Socket-Internal.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/Network-Socket.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/Network-URI.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/Network.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-A.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-All.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-B.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-C.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-D.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-E.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-F.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-G.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-H.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-I.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-K.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-L.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-M.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-N.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-O.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-P.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-Q.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-R.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-S.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-T.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-U.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-W.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index-Z.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/mini_Network-BSD.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/mini_Network-Socket-ByteString-Lazy.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/mini_Network-Socket-ByteString.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/mini_Network-Socket-Internal.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/mini_Network-Socket.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/mini_Network-URI.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/mini_Network.html
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/network.haddock
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/network-${PKGVERSION}/html/synopsis.png
diff --git a/net/hs-network/buildlink3.mk b/net/hs-network/buildlink3.mk
index c20f6ade131..1051f66bc5d 100644
--- a/net/hs-network/buildlink3.mk
+++ b/net/hs-network/buildlink3.mk
@@ -1,15 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.11 2016/01/10 11:49:10 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2020/01/01 03:10:36 pho Exp $
 
 BUILDLINK_TREE+=	hs-network
 
 .if !defined(HS_NETWORK_BUILDLINK3_MK)
 HS_NETWORK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-network+=	hs-network>=2.5.0
-BUILDLINK_ABI_DEPENDS.hs-network+=	hs-network>=2.5.0.0nb11
+BUILDLINK_API_DEPENDS.hs-network+=	hs-network>=3.1.1
+BUILDLINK_ABI_DEPENDS.hs-network+=	hs-network>=3.1.1.1
 BUILDLINK_PKGSRCDIR.hs-network?=	../../net/hs-network
-
-.include "../../textproc/hs-parsec/buildlink3.mk"
 .endif	# HS_NETWORK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-network
diff --git a/net/hs-network/distinfo b/net/hs-network/distinfo
index b4bc9204e97..4b3f763edb7 100644
--- a/net/hs-network/distinfo
+++ b/net/hs-network/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 00:35:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/01/01 03:10:36 pho Exp $
 
-SHA1 (network-2.5.0.0.tar.gz) = 4cdd80a99ce87e3eb3cf5b30ff50e4dc8ed2d9c6
-RMD160 (network-2.5.0.0.tar.gz) = d004f0d99e66321c3231bfb85e7aebfb022b7998
-SHA512 (network-2.5.0.0.tar.gz) = 37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
-Size (network-2.5.0.0.tar.gz) = 141768 bytes
+SHA1 (network-3.1.1.1.tar.gz) = 21cc751e5ad5aa9902a5ec2f9e87fee8cf9d8a14
+RMD160 (network-3.1.1.1.tar.gz) = 67e11c8f060e42001c95b6e2de5d5498d65d02de
+SHA512 (network-3.1.1.1.tar.gz) = caafd3c0730d0f6378230e0acdf285ca50480f02a44963c1f9ae9dc3d53cd496dd3171d7ff4bf79a1e072b85698d74f82d8075b999d5ba1d17ab1429c8094ca8
+Size (network-3.1.1.1.tar.gz) = 118478 bytes