From a9f231baf23fc87f40bf0d5febc01dc489476877 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 3 May 2008 02:42:43 +0000 Subject: [PATCH] [packages] move packages to a new 'mail' section, cleanup git-svn-id: svn://svn.openwrt.org/openwrt/packages@11014 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- {net => mail}/dovecot/Makefile | 11 ++++------- {net => mail}/dovecot/files/dovecot.conf | 0 {net => mail}/dovecot/files/dovecot.init | 0 {net => mail}/dovecot/patches/configure.in.patch | 0 {utils => mail}/fetchmail/Makefile | 14 +++++--------- .../fetchmail/patches/001-amd64_detection.patch | 0 .../fetchmail/patches/002-no_rej.patch | 0 {net => mail}/imapfilter/Makefile | 9 +++------ .../imapfilter/patches/010-pathnames.patch | 0 {net => mail}/mini_sendmail/Makefile | 16 +++++++--------- .../mini_sendmail/patches/200-fullname.patch | 0 .../mini_sendmail/patches/500-flags.patch | 0 {utils => mail}/mutt/Makefile | 9 +++------ {utils => mail}/procmail/Makefile | 15 ++++++--------- .../procmail/patches/001-procmail_openwrt.patch | 0 {net => mail}/ssmtp/Makefile | 16 ++++++++-------- .../ssmtp/patches/500-debian-subset-2.61-2.patch | 0 .../patches/901-strftime_space_padding.patch | 0 {net => mail}/xmail/Makefile | 6 +++--- {net => mail}/xmail/files/SysMachine.h | 0 .../xmail/patches/010-Makefile.common.patch | 0 .../xmail/patches/020-Makefile.lnx.patch | 0 {net => mail}/xmail/patches/030-xmail.patch | 0 .../xmail/patches/040-honour_opt_flags.patch | 0 24 files changed, 39 insertions(+), 57 deletions(-) rename {net => mail}/dovecot/Makefile (91%) rename {net => mail}/dovecot/files/dovecot.conf (100%) rename {net => mail}/dovecot/files/dovecot.init (100%) rename {net => mail}/dovecot/patches/configure.in.patch (100%) rename {utils => mail}/fetchmail/Makefile (78%) rename {utils => mail}/fetchmail/patches/001-amd64_detection.patch (100%) rename {utils => mail}/fetchmail/patches/002-no_rej.patch (100%) rename {net => mail}/imapfilter/Makefile (89%) rename {net => mail}/imapfilter/patches/010-pathnames.patch (100%) rename {net => mail}/mini_sendmail/Makefile (69%) rename {net => mail}/mini_sendmail/patches/200-fullname.patch (100%) rename {net => mail}/mini_sendmail/patches/500-flags.patch (100%) rename {utils => mail}/mutt/Makefile (84%) rename {utils => mail}/procmail/Makefile (75%) rename {utils => mail}/procmail/patches/001-procmail_openwrt.patch (100%) rename {net => mail}/ssmtp/Makefile (78%) rename {net => mail}/ssmtp/patches/500-debian-subset-2.61-2.patch (100%) rename {net => mail}/ssmtp/patches/901-strftime_space_padding.patch (100%) rename {net => mail}/xmail/Makefile (95%) rename {net => mail}/xmail/files/SysMachine.h (100%) rename {net => mail}/xmail/patches/010-Makefile.common.patch (100%) rename {net => mail}/xmail/patches/020-Makefile.lnx.patch (100%) rename {net => mail}/xmail/patches/030-xmail.patch (100%) rename {net => mail}/xmail/patches/040-honour_opt_flags.patch (100%) diff --git a/net/dovecot/Makefile b/mail/dovecot/Makefile similarity index 91% rename from net/dovecot/Makefile rename to mail/dovecot/Makefile index a84314408..21c0d00ad 100644 --- a/net/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006,2007 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,21 +16,18 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.dovecot.org/releases/ PKG_MD5SUM:=6a87718a86ee1ae2334c75843dd9a7df -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/dovecot - SECTION:=net - CATEGORY:=Network + SECTION:=mail + CATEGORY:=Mail DEPENDS:=+libopenssl TITLE:=An IMAP and POP3 daemon URL:=http://www.dovecot.org/ endef define Package/dovecot/description - Dovecot is a program which provides POP3 and IMAP services. + Dovecot is a program which provides POP3 and IMAP services. endef define Build/Configure diff --git a/net/dovecot/files/dovecot.conf b/mail/dovecot/files/dovecot.conf similarity index 100% rename from net/dovecot/files/dovecot.conf rename to mail/dovecot/files/dovecot.conf diff --git a/net/dovecot/files/dovecot.init b/mail/dovecot/files/dovecot.init similarity index 100% rename from net/dovecot/files/dovecot.init rename to mail/dovecot/files/dovecot.init diff --git a/net/dovecot/patches/configure.in.patch b/mail/dovecot/patches/configure.in.patch similarity index 100% rename from net/dovecot/patches/configure.in.patch rename to mail/dovecot/patches/configure.in.patch diff --git a/utils/fetchmail/Makefile b/mail/fetchmail/Makefile similarity index 78% rename from utils/fetchmail/Makefile rename to mail/fetchmail/Makefile index d6d0812f5..301167913 100644 --- a/utils/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,22 +16,18 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.catb.org/~esr/fetchmail/ PKG_MD5SUM:=9956b30139edaa4f5f77c4d0dbd80225 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/fetchmail - SECTION:=utils - CATEGORY:=Utilities + SECTION:=mail + CATEGORY:=Mail TITLE:=Remote mail retriever URL:=http://www.catb.org/~esr/fetchmail/ - SUBMENU:=mail endef define Package/fetchmail/description - Retrieves remote mail via POP/IMAP. - Very useful in conjunction with mutt. + Retrieves remote mail via POP/IMAP. + Very useful in conjunction with mutt. endef define Build/Configure diff --git a/utils/fetchmail/patches/001-amd64_detection.patch b/mail/fetchmail/patches/001-amd64_detection.patch similarity index 100% rename from utils/fetchmail/patches/001-amd64_detection.patch rename to mail/fetchmail/patches/001-amd64_detection.patch diff --git a/utils/fetchmail/patches/002-no_rej.patch b/mail/fetchmail/patches/002-no_rej.patch similarity index 100% rename from utils/fetchmail/patches/002-no_rej.patch rename to mail/fetchmail/patches/002-no_rej.patch diff --git a/net/imapfilter/Makefile b/mail/imapfilter/Makefile similarity index 89% rename from net/imapfilter/Makefile rename to mail/imapfilter/Makefile index aca0f98d2..c360e5315 100644 --- a/net/imapfilter/Makefile +++ b/mail/imapfilter/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,14 +16,11 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://imapfilter.hellug.gr/source/ PKG_MD5SUM:=4c1f28dffbb727a4769948f10baccd79 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/imapfilter - SECTION:=net - CATEGORY:=Network + SECTION:=mail + CATEGORY:=Mail DEPENDS:=+liblua +libopenssl TITLE:=IMAP server based email filtering URL:=http://imapfilter.hellug.gr/ diff --git a/net/imapfilter/patches/010-pathnames.patch b/mail/imapfilter/patches/010-pathnames.patch similarity index 100% rename from net/imapfilter/patches/010-pathnames.patch rename to mail/imapfilter/patches/010-pathnames.patch diff --git a/net/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile similarity index 69% rename from net/mini_sendmail/Makefile rename to mail/mini_sendmail/Makefile index d243d82fb..ca544a51f 100644 --- a/net/mini_sendmail/Makefile +++ b/mail/mini_sendmail/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,22 +16,20 @@ PKG_SOURCE:=mini_sendmail-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.acme.com/software/mini_sendmail/ PKG_MD5SUM:=fb1585d2ad81c519a26d83bfd783dee8 -PKG_BUILD_DIR:=$(BUILD_DIR)/mini_sendmail-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk define Package/mini-sendmail - SECTION:=net - CATEGORY:=Network + SECTION:=mail + CATEGORY:=Mail TITLE:=A small sendmail-compatible mail forwarder URL:=http://www.acme.com/software/mini_sendmail/ endef define Package/mini-sendmail/description - mini_sendmail reads its standard input up to an end-of-file and sends a - copy of the message found there to all of the addresses listed. - The message is sent by connecting to a local SMTP server. This means - mini_sendmail can be used to send email from inside a chroot(2) area. + mini_sendmail reads its standard input up to an end-of-file and sends a + copy of the message found there to all of the addresses listed. + The message is sent by connecting to a local SMTP server. This means + mini_sendmail can be used to send email from inside a chroot(2) area. endef MAKE_FLAGS += \ diff --git a/net/mini_sendmail/patches/200-fullname.patch b/mail/mini_sendmail/patches/200-fullname.patch similarity index 100% rename from net/mini_sendmail/patches/200-fullname.patch rename to mail/mini_sendmail/patches/200-fullname.patch diff --git a/net/mini_sendmail/patches/500-flags.patch b/mail/mini_sendmail/patches/500-flags.patch similarity index 100% rename from net/mini_sendmail/patches/500-flags.patch rename to mail/mini_sendmail/patches/500-flags.patch diff --git a/utils/mutt/Makefile b/mail/mutt/Makefile similarity index 84% rename from utils/mutt/Makefile rename to mail/mutt/Makefile index 5bd502472..856b58eeb 100644 --- a/utils/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,17 +16,14 @@ PKG_SOURCE_URL:=@SF/mutt PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MD5SUM:=10eff7024dbb7ce1f773d688a69ea9db -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk define Package/mutt - SECTION:=utils - CATEGORY:=Utilities + SECTION:=mail + CATEGORY:=Mail DEPENDS:=+libopenssl +libncurses TITLE:=Console mail client URL:=http://www.mutt.org/ - SUBMENU:=mail endef CONFIGURE_ARGS += \ diff --git a/utils/procmail/Makefile b/mail/procmail/Makefile similarity index 75% rename from utils/procmail/Makefile rename to mail/procmail/Makefile index 1e37c645e..fc3f489b8 100644 --- a/utils/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,22 +16,19 @@ PKG_SOURCE_URL:=http://www.procmail.org/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MD5SUM:=1678ea99b973eb77eda4ecf6acae53f1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk define Package/procmail - SECTION:=utils - CATEGORY:=Utilities + SECTION:=mail + CATEGORY:=Mail TITLE:=Mail processing tool URL:=http://www.procmail.org - SUBMENU:=mail endef define Package/procmail/description - Procmail is able to process and classify incoming mail into - different mail boxes. - Very useful in conjunction with mutt. + Procmail is able to process and classify incoming mail into + different mail boxes. + Very useful in conjunction with mutt. endef define Build/Compile diff --git a/utils/procmail/patches/001-procmail_openwrt.patch b/mail/procmail/patches/001-procmail_openwrt.patch similarity index 100% rename from utils/procmail/patches/001-procmail_openwrt.patch rename to mail/procmail/patches/001-procmail_openwrt.patch diff --git a/net/ssmtp/Makefile b/mail/ssmtp/Makefile similarity index 78% rename from net/ssmtp/Makefile rename to mail/ssmtp/Makefile index 3bacab583..b481e6d11 100644 --- a/net/ssmtp/Makefile +++ b/mail/ssmtp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -19,19 +19,19 @@ PKG_MD5SUM:=957e6fff08625fe34f4fc33d0925bbc9 include $(INCLUDE_DIR)/package.mk define Package/ssmtp - SECTION:=net - CATEGORY:=Network + SECTION:=mail + CATEGORY:=Mail DEPENDS:=+libopenssl TITLE:=A minimal and secure mail sender URL:=http://packages.debian.org/stable/mail/ssmtp endef define Package/ssmtp/description - A secure, effective and simple way of getting mail off a system to your - mail hub. It contains no suid-binaries or other dangerous things - no - mail spool to poke around in, and no daemons running in the background. - mail is simply forwarded to the configured mailhost. Extremely easy - configuration. + A secure, effective and simple way of getting mail off a system to your + mail hub. It contains no suid-binaries or other dangerous things - no + mail spool to poke around in, and no daemons running in the background. + mail is simply forwarded to the configured mailhost. Extremely easy + configuration. endef EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include diff --git a/net/ssmtp/patches/500-debian-subset-2.61-2.patch b/mail/ssmtp/patches/500-debian-subset-2.61-2.patch similarity index 100% rename from net/ssmtp/patches/500-debian-subset-2.61-2.patch rename to mail/ssmtp/patches/500-debian-subset-2.61-2.patch diff --git a/net/ssmtp/patches/901-strftime_space_padding.patch b/mail/ssmtp/patches/901-strftime_space_padding.patch similarity index 100% rename from net/ssmtp/patches/901-strftime_space_padding.patch rename to mail/ssmtp/patches/901-strftime_space_padding.patch diff --git a/net/xmail/Makefile b/mail/xmail/Makefile similarity index 95% rename from net/xmail/Makefile rename to mail/xmail/Makefile index 04dbe94e8..8d526c74b 100644 --- a/net/xmail/Makefile +++ b/mail/xmail/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -19,8 +19,8 @@ PKG_MD5SUM:=106730bdbaa4fda9e90a7c22df024114 include $(INCLUDE_DIR)/package.mk define Package/xmail - SECTION:=net - CATEGORY:=Network + SECTION:=mail + CATEGORY:=Mail DEPENDS:=+uclibcxx +libopenssl TITLE:=advanced, fast and reliable ESMTP/POP3 mail server URL:=http://www.xmailserver.org/ diff --git a/net/xmail/files/SysMachine.h b/mail/xmail/files/SysMachine.h similarity index 100% rename from net/xmail/files/SysMachine.h rename to mail/xmail/files/SysMachine.h diff --git a/net/xmail/patches/010-Makefile.common.patch b/mail/xmail/patches/010-Makefile.common.patch similarity index 100% rename from net/xmail/patches/010-Makefile.common.patch rename to mail/xmail/patches/010-Makefile.common.patch diff --git a/net/xmail/patches/020-Makefile.lnx.patch b/mail/xmail/patches/020-Makefile.lnx.patch similarity index 100% rename from net/xmail/patches/020-Makefile.lnx.patch rename to mail/xmail/patches/020-Makefile.lnx.patch diff --git a/net/xmail/patches/030-xmail.patch b/mail/xmail/patches/030-xmail.patch similarity index 100% rename from net/xmail/patches/030-xmail.patch rename to mail/xmail/patches/030-xmail.patch diff --git a/net/xmail/patches/040-honour_opt_flags.patch b/mail/xmail/patches/040-honour_opt_flags.patch similarity index 100% rename from net/xmail/patches/040-honour_opt_flags.patch rename to mail/xmail/patches/040-honour_opt_flags.patch