masqmail: update to 0.2.21, switched to Debian mirror

3 files changed, 7 insertions, 20 deletions

diff --git a/packages/masqmail/files/.mtn2git_empty b/packages/masqmail/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/masqmail/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/masqmail/files/configure-ac-glib-2-0.patch b/packages/masqmail/files/configure-ac-glib-2-0.patch
deleted file mode 100644
index c5e607f52d..0000000000
--- a/packages/masqmail/files/configure-ac-glib-2-0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- masqmail-0.2.20/configure.ac.orig	2005-11-11 16:36:05.894559778 -0800
-+++ masqmail-0.2.20/configure.ac	2005-11-11 16:36:19.935443315 -0800
-@@ -20,7 +20,7 @@ AC_STDC_HEADERS
- dnl AC_ARG_PROGRAM
- AC_PROG_RANLIB
- 
--AM_PATH_GLIB
-+AM_PATH_GLIB_2_0
- 
- dnl resolver support (default is use it)
- AC_ARG_ENABLE(resolver,
diff --git a/packages/masqmail/masqmail_0.2.20.bb b/packages/masqmail/masqmail_0.2.21.bb
index 1a64833bfc..05f377e4e5 100644
--- a/packages/masqmail/masqmail_0.2.20.bb
+++ b/packages/masqmail/masqmail_0.2.21.bb
@@ -1,19 +1,19 @@
-# MasqMail from http://innominate.org/kurth/masqmail/
-DESCRIPTION = "MasqMail is a mail server designed for hosts that do not have a permanent internet connection eg. a home network or a single host at home. It has special support for connections to different ISPs. It replaces sendmail or other MTAs such as qmail or exim."
+DESCRIPTION = "MasqMail is a mail server designed for hosts that do not have \
+a permanent internet connection eg. a home network or a single host at home. \
+It has special support for connections to different ISPs. It replaces sendmail \
+or other MTAs such as qmail or exim."
 HOMEPAGE = "http://innominate.org/kurth/masqmail/"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r0"
-
 DEPENDS = "glib-2.0"
 
-SRC_URI = "http://innominate.org/kurth/masqmail/download/masqmail-${PV}.tar.gz"
-SRC_URI += "file://configure-ac-glib-2-0.patch;patch=1"
+SRC_URI = "${DEBIAN_MIRROR}/main/m/${PN}/${PN}_${PV}.orig.tar.gz"
+
+inherit autotools pkgconfig
 
 EXTRA_OECONF += "--disable-glibtest"
 EXTRA_OECONF += "--disable-resolver"
-EXTRA_OECONF += "--disable-debug"
 
 # These are the standard Debian values for ownership of the programs,
 # this stuff fakes out the install script chown operations then replicates
@@ -26,5 +26,3 @@ EXTRA_OECONF += "--with-user=$(id -u)"
 EXTRA_OECONF += "--with-group=$(id -g)"
 
 IPKGBUILDCMD = "ipkg-build -o ${MAIL_USER} -g ${MAIL_GROUP}"
-
-inherit autotools