a bunch of FreeBSD compatibility patches

4 files changed, 52 insertions, 36 deletions

diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index 4c3f09d5e..c2372448b 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		srelay
-PKG_VERSION:=		0.4.6
-PKG_RELEASE:=		9
-PKG_MD5SUM:=		4a9f3298b38d8588f0ffde31b946a47f
+PKG_VERSION:=		0.4.7b2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		73904ecbb5d305135b3e8907ce7d0513
 PKG_DESCR:=		A socks 4/5 proxy server
 PKG_SECTION:=		net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=socks-relay/}
@@ -15,7 +15,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autoconf gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_lib_nsl_getaddrinfo=no
 CONFIGURE_ARGS+=	--disable-thread \
 			--with-libwrap=no
diff --git a/package/srelay/patches/01-cross_compile.patch b/package/srelay/patches/01-cross_compile.patch
deleted file mode 100644
index 03d7fa215..000000000
--- a/package/srelay/patches/01-cross_compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN srelay-0.4.6/configure srelay-0.4.6.new/configure
---- srelay-0.4.6.orig/configure	2003-04-14 07:36:15.000000000 +0200
-+++ srelay-0.4.6/configure	2009-06-05 18:03:20.000000000 +0200
-@@ -1395,7 +1395,7 @@ _ACEOF
- 	;;
-   linux*)
- 	case "$build_cpu" in
--	  i*86)
-+	  i*86 | mips* | powerpc* | sparc* | x86_64*)
- 	    OS=LINUX
- 	    cat >>confdefs.h <<\_ACEOF
- #define LINUX 1
diff --git a/package/srelay/patches/patch-configure b/package/srelay/patches/patch-configure
new file mode 100644
index 000000000..b4a4e5999
--- /dev/null
+++ b/package/srelay/patches/patch-configure
@@ -0,0 +1,48 @@
+--- srelay-0.4.7b2.orig/configure	2009-08-30 15:06:32.000000000 +0200
++++ srelay-0.4.7b2/configure	2009-12-11 23:56:31.000000000 +0100
+@@ -1858,43 +1858,11 @@ test -n "$target_alias" &&
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 
+-case "$build_os" in
+-  freebsd*)
+-	OS=FREEBSD
+-	cat >>confdefs.h <<\_ACEOF
+-#define FREEBSD 1
+-_ACEOF
+-
+-	;;
+-  solaris*)
+-	OS=SOLARIS
+-	cat >>confdefs.h <<\_ACEOF
+-#define SOLARIS 1
+-_ACEOF
+-
+-	;;
+-  linux*)
+-	case "$build_cpu" in
+-	  i*86)
+-	    OS=LINUX
+-	    cat >>confdefs.h <<\_ACEOF
++OS=LINUX
++cat >>confdefs.h <<\_ACEOF
+ #define LINUX 1
+ _ACEOF
+ 
+-	    ;;
+-        esac
+-	;;
+-  darwin*)
+-	OS=MACOSX
+-	cat >>confdefs.h <<\_ACEOF
+-#define MACOSX 1
+-_ACEOF
+-
+-	;;
+-esac
+-
+-CFLAGS="$CFLAGS -O2 -Wall"
+-
+ if test -d /usr/local/lib; then
+     LIBS="-L/usr/local/lib $LIBS"
+ fi
diff --git a/package/srelay/patches/patch-configure_in b/package/srelay/patches/patch-configure_in
deleted file mode 100644
index 46e2a9aeb..000000000
--- a/package/srelay/patches/patch-configure_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- srelay-0.4.6.orig/configure.in	2003-04-14 07:36:15.000000000 +0200
-+++ srelay-0.4.6/configure.in	2009-06-05 18:11:26.000000000 +0200
-@@ -15,7 +15,7 @@ case "$build_os" in
- 	;;
-   linux*)
- 	case "$build_cpu" in
--	  i*86)
-+	  i*86 | mips* | powerpc* | sparc* | x86_64*)
- 	    OS=LINUX
- 	    AC_DEFINE(LINUX)
- 	    ;;
-@@ -23,7 +23,7 @@ case "$build_os" in
- 	;;
- esac
- 
--CFLAGS="$CFLAGS -O2 -Wall"
-+CFLAGS="$CFLAGS -Wall"
- LDFLAGS="$LDFLAGS -s"
- 
- dnl Local libralies.