2 files changed, 114 insertions, 39 deletions
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa
index 8181d47007c..a7452059945 100644
--- a/net/amule/patches/patch-aa
+++ b/net/amule/patches/patch-aa
@@ -1,30 +1,117 @@
-$NetBSD: patch-aa,v 1.8 2006/10/14 01:14:15 rillig Exp $
+$NetBSD: patch-aa,v 1.9 2009/06/06 13:08:27 obache Exp $
 
---- configure.orig	2006-06-11 17:08:53.000000000 +0200
-+++ configure	2006-10-14 03:13:01.000000000 +0200
-@@ -8227,6 +8227,7 @@ else
- 	result="no"
+* pthread flags portabilities
+* avoid check for gettext>=0.11.5
+* fixes to install all supported L10N man pages
+
+--- configure.orig	2009-05-16 07:38:31.000000000 +0000
++++ configure
+@@ -1998,7 +1998,8 @@ echo "${ECHO_T}yes" >&6
+ 
+ else
+ 
+-			MULELDFLAGS="$MULELDFLAGS -lpthread"
++			MULELDFLAGS="$MULELDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
++			MULECFLAGS="$MULECFLAGS ${PTHREAD_CFLAGS}"
+ 			echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+@@ -18080,7 +18081,7 @@ _ACEOF
  fi
  
-+result="yes"
- HAVE_GETTEXT=$result
- 
- { echo "$as_me:$LINENO: result: $result ($autopoint_version)" >&5
-@@ -18234,7 +18235,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
-@@ -18962,7 +18963,7 @@ case "$ccache" in
- 
- yes)
- 
--	if test x$ccache_prefix == x ; then
-+	if test x$ccache_prefix = x ; then
- 		ccache_full=$(which ccache)
- 		ccache_prefix=$(dirname ${ccache_full})
- 	fi
+ 
+-	if test x$USE_NLS = xyes; then
++	if test xno = xyes; then
+ 
+ 	echo "$as_me:$LINENO: checking for autopoint" >&5
+ echo $ECHO_N "checking for autopoint... $ECHO_C" >&6
+@@ -18116,7 +18117,7 @@ echo $ECHO_N "checking for requested lan
+ 
+ 	if test "$AMULE_DAEMON" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   AMULE_DAEMON_MANPAGES=`ls -1 ${srcdir}/docs/man/amuled.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18136,7 +18137,7 @@ fi
+ 
+ 	if test "$AMULECMD" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   AMULECMD_MANPAGES=`ls -1 ${srcdir}/docs/man/amulecmd.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18156,7 +18157,7 @@ fi
+ 
+ 	if test "$WEB" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   WEB_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18176,7 +18177,7 @@ fi
+ 
+ 	if test "$AMULE_GUI" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   AMULE_GUI_MANPAGES=`ls -1 ${srcdir}/docs/man/amulegui.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18196,7 +18197,7 @@ fi
+ 
+ 	if test "$CAS" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   CAS_MANPAGES=`ls -1 ${srcdir}/src/utils/cas/docs/cas.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18216,7 +18217,7 @@ fi
+ 
+ 	if test "$WXCAS" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   WXCAS_MANPAGES=`ls -1 ${srcdir}/src/utils/wxCas/docs/wxcas.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18236,7 +18237,7 @@ fi
+ 
+ 	if test "$ED2K" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   ED2K_MANPAGES=`ls -1 ${srcdir}/docs/man/ed2k.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18256,7 +18257,7 @@ fi
+ 
+ 	if test "$ALC" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   ALC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alc.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18276,7 +18277,7 @@ fi
+ 
+ 	if test "$ALCC" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   ALCC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alcc.* | sed -e 's:.*/::g'`
+ else
+ 
+@@ -18296,7 +18297,7 @@ fi
+ 
+ 	if test "$MONOLITHIC" = "yes"; then
+ 
+-		if test -z "$LINGUAS"; then
++		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+   MONOLITHIC_MANPAGES=`ls -1 ${srcdir}/docs/man/amule.* | sed -e 's:.*/::g'`
+ else
+ 
diff --git a/net/amule/patches/patch-ab b/net/amule/patches/patch-ab
deleted file mode 100644
index 5247d5b9c8b..00000000000
--- a/net/amule/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$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>
- 
-