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/mini_sendmail | |
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/mini_sendmail')
-rw-r--r-- | package/mini_sendmail/Makefile | 8 | ||||
-rw-r--r-- | package/mini_sendmail/ipkg/mini-sendmail.control | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile index 25c93d08e..a091df078 100644 --- a/package/mini_sendmail/Makefile +++ b/package/mini_sendmail/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= mini-sendmail PKG_VERSION:= 1.3.6 PKG_RELEASE:= 1 PKG_MD5SUM:= fb1585d2ad81c519a26d83bfd783dee8 -MASTER_SITES:= http://www.acme.com/software/mini_sendmail/ +PKG_DESCR:= A small sendmail-compatible mail forwarder +PKG_SECTION:= net +PKG_URL:= http://www.acme.com/software/mini_sendmail +PKG_SITES:= http://www.acme.com/software/mini_sendmail/ + DISTFILES:= mini_sendmail-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/mini_sendmail-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MINI_SENDMAIL,mini-sendmail,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MINI_SENDMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto MAKE_FLAGS+= OFLAGS="${TARGET_CFLAGS}" diff --git a/package/mini_sendmail/ipkg/mini-sendmail.control b/package/mini_sendmail/ipkg/mini-sendmail.control deleted file mode 100644 index c08e16e1c..000000000 --- a/package/mini_sendmail/ipkg/mini-sendmail.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: mini-sendmail -Priority: optional -Section: net -Description: A small sendmail-compatible mail forwarder |