2 files changed, 16 insertions, 13 deletions
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 96a820fcf..73428d536 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -9,28 +9,35 @@ PKG_NAME:=		weechat
 PKG_VERSION:=		0.1.8
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		73d6bc211ac32c597f0d278506480a20
-
-MASTER_SITES:=		http://weechat.flashtux.org/download/
+PKG_DESCR:=		Lightweight IRC client
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libncurses libiconv
+PKG_URL:=		http://weechat.flashtux.org/download/
+PKG_SITES:=		http://weechat.flashtux.org/download/
 
 include ${TOPDIR}/mk/package.mk
 
-PKG_DEPEND:=		libncurses libiconv
+ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y)
+PKG_DEPENDS+=		gnutls
+endif
+
+ifeq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
+PKG_DEPENDS+=		liblua
+endif
+
+
+$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y)
 ENABLE_TLS:=		--with-libgnutls-prefix=${STAGING_DIR}/usr
-PKG_DEPEND+=		gnutls
 else
 ENABLE_TLS:=		--disable-gnutls
 endif
 
 ifneq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
 DISABLE_LUA:=		--disable-lua
-else
-PKG_DEPEND+=		liblua
 endif
 
-$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
-
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	${ENABLE_TLS} \
 			--with-debug=0 \
@@ -43,7 +50,7 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin/
+	${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses ${IDIR_WEECHAT}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/weechat/ipkg/weechat.control b/package/weechat/ipkg/weechat.control
deleted file mode 100644
index 81a2bec6c..000000000
--- a/package/weechat/ipkg/weechat.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: weechat
-Section: net
-Priority: optional
-Description: Lightweight IRC client