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/wput | |
| 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/wput')
| -rw-r--r-- | package/wput/Makefile | 9 | ||||
| -rw-r--r-- | package/wput/ipkg/wput.control | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/package/wput/Makefile b/package/wput/Makefile index 04477ed09..e6d6aa7c4 100644 --- a/package/wput/Makefile +++ b/package/wput/Makefile @@ -9,22 +9,23 @@ PKG_NAME:= wput PKG_VERSION:= 0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 441b2e07219f78167b29a7ac33488fff +PKG_DESCR:= a wget-like command-line FTP client +PKG_SECTION:= net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wput/} -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=wput/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz - WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WPUT,wput,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,WPUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-g-switch BUILD_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_WPUT}/usr/bin/ + ${INSTALL_DIR} ${IDIR_WPUT}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/wput ${IDIR_WPUT}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/wput/ipkg/wput.control b/package/wput/ipkg/wput.control deleted file mode 100644 index 06d51ad76..000000000 --- a/package/wput/ipkg/wput.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: wput -Priority: optional -Section: net -Description: a wget-like command-line FTP client |