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/screen | |
| 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/screen')
| -rw-r--r-- | package/screen/Makefile | 8 | ||||
| -rw-r--r-- | package/screen/ipkg/screen.control | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/screen/Makefile b/package/screen/Makefile index d43971e04..ec298f437 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= screen PKG_VERSION:= 4.0.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 -MASTER_SITES:= ${MASTER_SITE_GNU:=screen/} +PKG_DESCR:= A window manager for the terminal session +PKG_SECTION:= misc +PKG_DEPENDS:= libncurses +PKG_URL:= http://www.gnu.org/software/screen +PKG_SITES:= ${MASTER_SITE_GNU:=screen/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SCREEN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes) diff --git a/package/screen/ipkg/screen.control b/package/screen/ipkg/screen.control deleted file mode 100644 index cb19298a8..000000000 --- a/package/screen/ipkg/screen.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: screen -Priority: optional -Section: misc -Depends: libncurses -Description: A 'window manager' for the terminal session |