diff options
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/Depends.mk | 1 | ||||
| -rw-r--r-- | package/Makefile | 1 | ||||
| -rw-r--r-- | package/mutt/Makefile | 7 | ||||
| -rw-r--r-- | package/scdp/Config.in | 12 | ||||
| -rw-r--r-- | package/scdp/Makefile | 28 |
6 files changed, 3 insertions, 47 deletions
diff --git a/package/Config.in b/package/Config.in index 2e3aee10c..1cc29c402 100644 --- a/package/Config.in +++ b/package/Config.in @@ -272,7 +272,6 @@ source "package/portmap/Config.in" source "package/rarpd/Config.in" source "package/rrs/Config.in" source "package/rsync/Config.in" -source "package/scdp/Config.in" source "package/shat/Config.in" source "package/socat/Config.in" source "package/subversion/Config.in" diff --git a/package/Depends.mk b/package/Depends.mk index 35e426786..bf77d2106 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -214,7 +214,6 @@ rsync-compile: popt-compile rtorrent-compile: ncurses-compile libtorrent-compile curl-compile sane-backends-compile: libpthread-compile libusb-compile scanlogd-compile: libpcap-compile libnids-compile libnet-compile -scdp-compile: libnet-compile screen-compile: ncurses-compile serdisplib-compile: libgd-compile libusb-compile siproxd-compile: libosip2-compile diff --git a/package/Makefile b/package/Makefile index e4df19ce3..994520726 100644 --- a/package/Makefile +++ b/package/Makefile @@ -358,7 +358,6 @@ package-$(ADK_PACKAGE_RTORRENT) += rtorrent package-$(ADK_COMPILE_SAMBA) += samba package-$(ADK_PACKAGE_SANE_BACKENDS) += sane-backends package-$(ADK_PACKAGE_SCANLOGD) += scanlogd -package-$(ADK_PACKAGE_SCDP) += scdp package-$(ADK_PACKAGE_SCREEN) += screen package-$(ADK_PACKAGE_SCRNSAVERPROTO) += scrnsaverproto package-$(ADK_PACKAGE_SCSI_SPIN) += scsi-spin diff --git a/package/mutt/Makefile b/package/mutt/Makefile index 4a5673dd9..4645ec40c 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mutt -PKG_VERSION:= 1.5.19 +PKG_VERSION:= 1.5.20 PKG_RELEASE:= 1 -PKG_MD5SUM:= 73b3747bc7f7c805921e8d24ebac693f +PKG_MD5SUM:= 027cdd9959203de0c3c64149a7ee351c PKG_DESCR:= Mail text client PKG_SECTION:= text PKG_DEPENDS:= libncurses libopenssl @@ -25,11 +25,10 @@ CONFIGURE_ARGS+= --includedir=${WRKBUILD}/. \ --with-ssl BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" -#ALL_TARGET:= do-install: ${INSTALL_DIR} ${IDIR_MUTT}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_MUTT}/usr/bin/ + ${INSTALL_BIN} ${WRKBUILD}/mutt ${IDIR_MUTT}/usr/bin/ ifeq (${ADK_PACKAGE_GPG},y) ${INSTALL_BIN} ${WRKBUILD}/pgpewrap ${IDIR_MUTT}/usr/bin/ endif diff --git a/package/scdp/Config.in b/package/scdp/Config.in deleted file mode 100644 index 29bb50160..000000000 --- a/package/scdp/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_PACKAGE_SCDP - prompt "scdp.............................. An utility to send CDP (Cisco Discovery Protocol) packets" - tristate - default n - select ADK_PACKAGE_LIBNET - help - This program sends CDP (Cisco Discovery Protocol) packets out on - selected interfaces and tells the connected switch (cisco only) - where the host is connected. - - http://sourceforge.net/projects/scdp - diff --git a/package/scdp/Makefile b/package/scdp/Makefile deleted file mode 100644 index 24629ecb0..000000000 --- a/package/scdp/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= scdp -PKG_VERSION:= 1.0b -PKG_RELEASE:= 1 -PKG_MD5SUM:= 7eafaf5a422e37d04715613993ed5d95 -PKG_DESCR:= An utility to send CDP (Cisco Discovery Protocol) packets. -PKG_SECTION:= net -PKG_DEPENDS:= libnet -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=scdp/} - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,SCDP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_path_libnet_config=${STAGING_DIR}/usr/bin -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - -post-install: - ${INSTALL_DIR} ${IDIR_SCDP}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/scdp ${IDIR_SCDP}/usr/bin/ - -include ${TOPDIR}/mk/pkg-bottom.mk |