convert to use autoreconf

6 files changed, 12 insertions, 66 deletions

diff --git a/package/libesmtp/Makefile b/package/libesmtp/Makefile
index ceeeec4fa..07bedd281 100644
--- a/package/libesmtp/Makefile
+++ b/package/libesmtp/Makefile
@@ -3,28 +3,34 @@
 
 include $(TOPDIR)/rules.mk
 
-# always use tab spaces as separator, no spaces
 PKG_NAME:=		libesmtp
 PKG_VERSION:=		1.0.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		bf3915e627fd8f35524a8fdfeed979c8
-PKG_DESCR:=		lib that implements the client side of the SMTP protocol
+PKG_DESCR:=		implements the client side of the smtp protocol
 PKG_SECTION:=		libs/net
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.stafford.uklinux.net/libesmtp/
 PKG_SITES:=		http://www.stafford.uklinux.net/libesmtp/
+PKG_OPTS:=		dev
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-PKG_FLAVOURS_PKGNAME:=	WITH_SSL
-PKGFD_WITH_SSL:=	enable SSL support
+PKG_FLAVOURS_LIBESMTP:=	WITH_SSL
+PKGFD_WITH_SSL:=	enable ssl support
 PKGFS_WITH_SSL:=	libopenssl
 PKGFB_WITH_SSL:=	openssl
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBESMTP,libesmtp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBESMTP,libesmtp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:=	autoreconf
 
 ifneq (${ADK_PACKAGE_LIBESMTP_WITH_SSL},)
 CONFIGURE_ARGS+=	--with-openssl
+else
+CONFIGURE_ARGS+=	--without-openssl
 endif
 
 libesmtp-install:
diff --git a/package/libesmtp/patches/patch-Makefile_in b/package/libesmtp/patches/patch-Makefile_in
deleted file mode 100644
index 94e8e12fe..000000000
--- a/package/libesmtp/patches/patch-Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-	prevent doubly passing our CFLAGS
---- libesmtp-1.0.6.orig/Makefile.in	2010-08-09 22:25:56.000000000 +0200
-+++ libesmtp-1.0.6/Makefile.in	2014-06-05 22:26:57.239828607 +0200
-@@ -293,7 +293,7 @@ AUTOMAKE_OPTIONS = gnu dist-bzip2
- INCLUDES = -I$(srcdir) $(VERSION_FLAGS)
- SUBDIRS = @subdirs@ @SASL_PLUGINS@
- DIST_SUBDIRS = @subdirs@ @DIST_PLUGINS@
--AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
-+AM_CFLAGS = @EXTRA_CFLAGS@
- ACLOCAL_AMFLAGS = -I m4
- lib_LTLIBRARIES = libesmtp.la
- libesmtp_la_SOURCES = auth-client.c base64.c concatenate.c errors.c \
diff --git a/package/libesmtp/patches/patch-crammd5_Makefile_in b/package/libesmtp/patches/patch-crammd5_Makefile_in
deleted file mode 100644
index d20c19ff2..000000000
--- a/package/libesmtp/patches/patch-crammd5_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-	prevent doubly passing our CFLAGS
---- libesmtp-1.0.6.orig/crammd5/Makefile.in	2010-08-09 22:25:56.000000000 +0200
-+++ libesmtp-1.0.6/crammd5/Makefile.in	2014-06-05 22:27:13.400815451 +0200
-@@ -225,7 +225,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I@srcdir@
--AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
-+AM_CFLAGS = @EXTRA_CFLAGS@
- lib_LTLIBRARIES = sasl-cram-md5.la
- sasl_cram_md5_la_SOURCES = client-crammd5.c hmacmd5.c hmacmd5.h
- sasl_cram_md5_la_LDFLAGS = -module -avoid-version @CRAMMD5_LIBS@
diff --git a/package/libesmtp/patches/patch-login_Makefile_in b/package/libesmtp/patches/patch-login_Makefile_in
deleted file mode 100644
index 713ca64c0..000000000
--- a/package/libesmtp/patches/patch-login_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-	prevent doubly passing our CFLAGS
---- libesmtp-1.0.6.orig/login/Makefile.in	2010-08-09 22:25:56.000000000 +0200
-+++ libesmtp-1.0.6/login/Makefile.in	2014-06-05 22:27:23.719807056 +0200
-@@ -227,7 +227,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I@srcdir@
- lib_LTLIBRARIES = sasl-login.la
--AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
-+AM_CFLAGS = @EXTRA_CFLAGS@
- sasl_login_la_SOURCES = client-login.c
- sasl_login_la_LDFLAGS = -module -avoid-version
- all: all-am
diff --git a/package/libesmtp/patches/patch-ntlm_Makefile_in b/package/libesmtp/patches/patch-ntlm_Makefile_in
deleted file mode 100644
index b335f8253..000000000
--- a/package/libesmtp/patches/patch-ntlm_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-	prevent doubly passing our CFLAGS
---- libesmtp-1.0.6.orig/ntlm/Makefile.in	2010-08-09 22:25:56.000000000 +0200
-+++ libesmtp-1.0.6/ntlm/Makefile.in	2014-06-05 22:27:36.420796718 +0200
-@@ -226,7 +226,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I@srcdir@
--AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
-+AM_CFLAGS = @EXTRA_CFLAGS@
- lib_LTLIBRARIES = sasl-ntlm.la
- sasl_ntlm_la_SOURCES = client-ntlm.c ntlmdes.c ntlmstruct.c ntlm.h
- sasl_ntlm_la_LDFLAGS = -module -avoid-version @NTLM_LIBS@
diff --git a/package/libesmtp/patches/patch-plain_Makefile_in b/package/libesmtp/patches/patch-plain_Makefile_in
deleted file mode 100644
index d5c694b87..000000000
--- a/package/libesmtp/patches/patch-plain_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-	prevent doubly passing our CFLAGS
---- libesmtp-1.0.6.orig/plain/Makefile.in	2010-08-09 22:25:56.000000000 +0200
-+++ libesmtp-1.0.6/plain/Makefile.in	2014-06-05 22:27:42.146792037 +0200
-@@ -226,7 +226,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I@srcdir@
--AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
-+AM_CFLAGS = @EXTRA_CFLAGS@
- lib_LTLIBRARIES = sasl-plain.la
- sasl_plain_la_SOURCES = client-plain.c
- sasl_plain_la_LDFLAGS = -module -avoid-version