diff options
| author | joerg <joerg@pkgsrc.org> | 2006-04-28 20:43:42 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-04-28 20:43:42 +0000 |
| commit | c3d579d367c54f2e05b97938d3711d73b04f5540 (patch) | |
| tree | 908f471d9738e37e0c2ba327dd7412decbde6070 /net/amule | |
| parent | d282527de6cf73f5a6c3c5b1f66787be9d43fba1 (diff) | |
| download | pkgsrc-c3d579d367c54f2e05b97938d3711d73b04f5540.tar.gz | |
Add missing include for close(2). Fix DragonFly, esp. hack around a
propolice ICE.
Diffstat (limited to 'net/amule')
| -rw-r--r-- | net/amule/distinfo | 5 | ||||
| -rw-r--r-- | net/amule/hacks.mk | 18 | ||||
| -rw-r--r-- | net/amule/patches/patch-aa | 13 | ||||
| -rw-r--r-- | net/amule/patches/patch-ab | 12 |
4 files changed, 44 insertions, 4 deletions
diff --git a/net/amule/distinfo b/net/amule/distinfo index 45528eb2ddd..91d297a428d 100644 --- a/net/amule/distinfo +++ b/net/amule/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.11 2006/04/14 09:54:32 adam Exp $ +$NetBSD: distinfo,v 1.12 2006/04/28 20:43:42 joerg Exp $ SHA1 (aMule-2.1.1.tar.bz2) = dd2e48a13cf7260f327364f293eda0d90832048e RMD160 (aMule-2.1.1.tar.bz2) = 4a12afd91ecaaff75defa69796a7124abcd84dca Size (aMule-2.1.1.tar.bz2) = 3263428 bytes -SHA1 (patch-aa) = aa8145cd2cd53d72ad0effa36b22ba1f2bf088dc +SHA1 (patch-aa) = 49f38c9ca56945442c5e184dc341f7a91ed6c989 +SHA1 (patch-ab) = df17202991dc5477feca2a0129d9703a71665869 diff --git a/net/amule/hacks.mk b/net/amule/hacks.mk new file mode 100644 index 00000000000..718bba8a44f --- /dev/null +++ b/net/amule/hacks.mk @@ -0,0 +1,18 @@ +# $NetBSD: hacks.mk,v 1.1 2006/04/28 20:43:42 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "DragonFly" && ${PKGSRC_COMPILER} == "gcc" +# +# Workaround an ICE in the stack-smashing protection in GCC 3.4.x. +# +.if !defined(HAS_PROPOLICE) +HAS_PROPOLICE!= ( ${CC} -v 2>&1 | ${GREP} 'propolice' ) 2>/dev/null || echo no +MAKEVARS+= HAS_PROPOLICE +.endif + +.if ${HAS_PROPOLICE} != "no" +CFLAGS+= -fno-stack-protector +CXXFLAGS+= -fno-stack-protector +.endif +.endif diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa index 7fb4e73a8b5..38095141fbc 100644 --- a/net/amule/patches/patch-aa +++ b/net/amule/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2006/01/20 22:06:32 adam Exp $ +$NetBSD: patch-aa,v 1.6 2006/04/28 20:43:42 joerg Exp $ ---- configure.orig 2006-01-02 00:00:38.000000000 +0100 +--- configure.orig 2006-03-18 00:27:48.000000000 +0000 +++ configure @@ -7003,6 +7003,7 @@ else result="no" @@ -10,3 +10,12 @@ $NetBSD: patch-aa,v 1.5 2006/01/20 22:06:32 adam Exp $ HAVE_GETTEXT=$result echo "$as_me:$LINENO: result: $result ($autopoint_version)" >&5 +@@ -16139,7 +16140,7 @@ echo $ECHO_N "checking if this is a Free + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- LDFLAGS="$LDFLAGS -lpthread" ++ LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi diff --git a/net/amule/patches/patch-ab b/net/amule/patches/patch-ab new file mode 100644 index 00000000000..5247d5b9c8b --- /dev/null +++ b/net/amule/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.6 2006/04/28 20:43:42 joerg Exp $ + +--- src/FileLock.h.orig 2006-04-28 19:12:49.000000000 +0000 ++++ src/FileLock.h +@@ -30,6 +30,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <unistd.h> + #include <cerrno> + + |