summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorriastradh <riastradh@pkgsrc.org>2013-01-19 20:37:43 +0000
committerriastradh <riastradh@pkgsrc.org>2013-01-19 20:37:43 +0000
commit3779e17898c4f18cb9cde9d5c2ce792169404dd3 (patch)
tree9251a2d2898b506c7a3f2579b5f0497803101f00 /net
parent0771660b838891045c475a861cd57c94bf14a0b0 (diff)
downloadpkgsrc-3779e17898c4f18cb9cde9d5c2ce792169404dd3.tar.gz
Fix net/ocamlnet's AT_* flag build breakage on NetBSD.
Diffstat (limited to 'net')
-rw-r--r--net/ocamlnet/distinfo4
-rw-r--r--net/ocamlnet/patches/patch-src_netsys_netsys__c.c21
2 files changed, 19 insertions, 6 deletions
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index e7a83f05f78..ea462d85692 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2012/08/20 08:11:58 wiz Exp $
+$NetBSD: distinfo,v 1.8 2013/01/19 20:37:43 riastradh Exp $
SHA1 (ocamlnet-3.6.tar.gz) = 37972c5ed04bbcae4661c40f1b0e49ef1c8111d8
RMD160 (ocamlnet-3.6.tar.gz) = 3a1af8bc573150a26437e2c7feff3126b1ebfa9e
Size (ocamlnet-3.6.tar.gz) = 3322518 bytes
SHA1 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a
-SHA1 (patch-src_netsys_netsys__c.c) = 3c40b57e0cae5d20823273334f73dc2b5c6dbc51
+SHA1 (patch-src_netsys_netsys__c.c) = f2215802b272fdf5ac2f4b52e049007efed9f979
SHA1 (patch-src_netzip_netgzip.ml) = 04fd6e50094ed9a25937ed4b548d55f6313dd77b
diff --git a/net/ocamlnet/patches/patch-src_netsys_netsys__c.c b/net/ocamlnet/patches/patch-src_netsys_netsys__c.c
index 53970645635..391f0a1cb6c 100644
--- a/net/ocamlnet/patches/patch-src_netsys_netsys__c.c
+++ b/net/ocamlnet/patches/patch-src_netsys_netsys__c.c
@@ -1,12 +1,25 @@
-$NetBSD: patch-src_netsys_netsys__c.c,v 1.2 2012/07/18 21:56:05 wiz Exp $
+$NetBSD: patch-src_netsys_netsys__c.c,v 1.3 2013/01/19 20:37:44 riastradh Exp $
DragonFly doesn't define AT_SYMLINK_FOLLOW. The added patch will
-appropriately disable linkat support.
+at least unbreak the build for some code that obviously won't work.
https://sourceforge.net/tracker/?func=detail&aid=3545170&group_id=19774&atid=319774
---- src/netsys/netsys_c.c.orig 2012-02-29 18:02:52.000000000 +0000
+Also work around absence of AT_REMOVEDIR, as on NetBSD 6.0.
+
+--- src/netsys/netsys_c.c.orig 2012-07-19 23:25:25.000000000 +0000
+++ src/netsys/netsys_c.c
-@@ -528,7 +528,7 @@ CAMLprim value netsys_renameat(value old
+@@ -428,6 +428,10 @@ CAMLprim value netsys_at_fdcwd(value dum
+ #define AT_SYMLINK_NOFOLLOW 0
+ #endif
+
++#ifndef AT_REMOVEDIR
++#define AT_REMOVEDIR 0
++#endif
++
+ static int at_flags_table[] = {
+ AT_EACCESS, AT_SYMLINK_NOFOLLOW, AT_REMOVEDIR
+ };
+@@ -528,7 +532,7 @@ CAMLprim value netsys_renameat(value old
CAMLprim value netsys_linkat(value olddirfd, value oldpath,
value newdirfd, value newpath, value flags)
{