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/irssi | |
| 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/irssi')
| -rw-r--r-- | package/irssi/Makefile | 20 | ||||
| -rw-r--r-- | package/irssi/ipkg/irssi.control | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 3c77111a1..60f82b7b5 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -6,16 +6,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= irssi -PKG_VERSION:= 0.8.12 +PKG_VERSION:= 0.8.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= e407b557b3cfc7c91ce4de2571dd79cb +PKG_MD5SUM:= 0d6fc2203832b514eff014fffd574664 +PKG_DESCR:= IRC text client +PKG_SECTION:= text +PKG_DEPENDS:= glib2 libncurses +PKG_URL:= http://www.irssi.org +PKG_SITES:= http://www.irssi.org/files/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= http://www.irssi.org/files/ -PKG_DEPENDS:= glib2, libncurses include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_PACKAGE_IRSSI_SSL},y) +PKG_DEPENDS+= libopenssl +endif + +$(eval $(call PKG_template,IRSSI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-perl=no \ @@ -29,7 +37,6 @@ BUILD_STYLE= auto ifeq (${ADK_PACKAGE_IRSSI_SSL},y) CONFIGURE_ARGS+= --enable-ssl -PKG_DEPENDS:= ${PKG_DEPENDS}, openssl else CONFIGURE_ARGS+= --disable-ssl endif @@ -37,6 +44,5 @@ endif do-install: ${INSTALL_DIR} ${IDIR_IRSSI}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/src/fe-text/${PKG_NAME} ${IDIR_IRSSI}/usr/bin/ - echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_IRSSI}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/irssi/ipkg/irssi.control b/package/irssi/ipkg/irssi.control deleted file mode 100644 index 5112153c4..000000000 --- a/package/irssi/ipkg/irssi.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: irssi -Priority: optional -Section: text -Description: IRC text client |