diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/dovecot | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/dovecot')
| -rw-r--r-- | package/dovecot/Makefile | 7 | ||||
| -rw-r--r-- | package/dovecot/ipkg/dovecot.control | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index 794af7040..7f69e2d60 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= dovecot PKG_VERSION:= 1.1.14 PKG_RELEASE:= 1 PKG_MD5SUM:= 60b1deccc0ae77e5669060d2b1894e5e -MASTER_SITES:= http://www.dovecot.org/releases/1.1/ +PKG_DESCR:= A minimal and secure imap server +PKG_SECTION:= net +PKG_URL:= http://www.dovecot.org +PKG_SITES:= http://www.dovecot.org/releases/1.1/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,DOVECOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ignore_signed_size=1 \ diff --git a/package/dovecot/ipkg/dovecot.control b/package/dovecot/ipkg/dovecot.control deleted file mode 100644 index 23e9882af..000000000 --- a/package/dovecot/ipkg/dovecot.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dovecot -Priority: optional -Section: net -Description: A minimal and secure imap server |