summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/Config.in43
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/bluez/Makefile4
-rw-r--r--package/bogofilter/Makefile16
-rw-r--r--package/bridge-utils/Makefile9
-rw-r--r--package/ca-certificates/Makefile15
-rw-r--r--package/cairo/Makefile2
-rw-r--r--package/cfinstall/Makefile3
-rw-r--r--package/collectd/Makefile13
-rw-r--r--package/cryptsetup/Makefile4
-rw-r--r--package/curl/Makefile17
-rw-r--r--package/exmap/Makefile11
-rw-r--r--package/fetchmail/Makefile20
-rw-r--r--package/freeradius-server/Makefile60
-rw-r--r--package/gatling/Makefile20
-rw-r--r--package/gcc/Makefile2
-rw-r--r--package/gdbserver/Makefile1
-rw-r--r--package/git/Makefile4
-rw-r--r--package/gnutls/Makefile2
-rw-r--r--package/heimdal/Makefile13
-rw-r--r--package/hostapd/Makefile6
-rw-r--r--package/iproute2/Makefile8
-rw-r--r--package/iptables/Makefile1
-rw-r--r--package/irssi/Makefile19
-rw-r--r--package/l2tpns/Makefile7
-rw-r--r--package/libXfont/Makefile2
-rw-r--r--package/mksh/Makefile14
-rw-r--r--package/openssl/Makefile2
28 files changed, 183 insertions, 137 deletions
diff --git a/package/Config.in b/package/Config.in
index a43138e36..f982e342d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -287,6 +287,7 @@ endmenu
menu "Network Filesystems"
source "package/davfs2/Config.in"
+source "package/davfs2/Config.in.kernel"
source "package/nfs-utils/Config.in"
source "package/nfs-utils/Config.in.kerberos"
source "package/samba/Config.in"
@@ -397,8 +398,10 @@ source "package/apr-util/Config.in"
source "package/atk/Config.in"
source "package/avahi/Config.in.lib"
source "package/axtls/Config.in.lib"
+source "package/bind/Config.in.lib"
source "package/cairo/Config.in"
source "package/cgilib/Config.in"
+source "package/curl/Config.in.lib"
source "package/cxxtools/Config.in"
source "package/dbus/Config.in"
source "package/e2fsprogs/Config.in.lib"
@@ -412,29 +415,37 @@ source "package/libaudiofile/Config.in"
source "package/libart/Config.in"
source "package/linux-atm/Config.in.lib"
source "package/libcli/Config.in"
-source "package/curl/Config.in.lib"
source "package/libdaemon/Config.in"
source "package/libdb/Config.in"
source "package/libdnet/Config.in"
source "package/libelf/Config.in"
source "package/libevent/Config.in"
source "package/libffi/Config.in"
-source "package/expat/Config.in" # libexpat
-source "package/faad2/Config.in" # libfaad2
-source "package/flac/Config.in" # libflac
-source "package/freetype/Config.in" # libfreetype
+source "package/freeradius-client/Config.in.lib"
+source "package/expat/Config.in"
+source "package/expat/Config.in.lib"
+source "package/faad2/Config.in"
+source "package/faad2/Config.in.lib"
+source "package/flac/Config.in"
+source "package/flac/Config.in.lib"
+source "package/freetype/Config.in"
source "package/libgcrypt/Config.in"
source "package/libgd/Config.in"
source "package/gdbm/Config.in"
+source "package/gdbm/Config.in.lib"
source "package/libgssglue/Config.in"
-source "package/gmp/Config.in" # libgmp
-source "package/gnutls/Config.in" ## libgnutls
+source "package/gmp/Config.in"
+source "package/gmp/Config.in.lib"
+source "package/gnutls/Config.in"
+source "package/gnutls/Config.in.lib"
source "package/libgpg-error/Config.in"
-source "package/gsm/Config.in" # libgsm
+source "package/gsm/Config.in"
+source "package/gsm/Config.in.lib"
source "package/libiconv/Config.in"
source "package/libid3tag/Config.in"
-source "package/jpeg/Config.in" # libjpeg
-source "package/lame/Config.in.lib" # libltdl
+source "package/jpeg/Config.in"
+source "package/jpeg/Config.in.lib"
+source "package/lame/Config.in.lib"
source "package/mpfr/Config.in"
source "package/nspr/Config.in"
source "package/nss/Config.in"
@@ -460,15 +471,15 @@ source "package/libp11/Config.in"
source "package/libpcap/Config.in"
source "package/libpri/Config.in"
source "package/pango/Config.in"
-source "package/pcre/Config.in" # libpcre
+source "package/pcre/Config.in"
source "package/libpng/Config.in"
-source "package/popt/Config.in" # libpopt
-source "package/postgresql/Config.in" # libpq
+source "package/popt/Config.in"
+source "package/postgresql/Config.in"
source "package/libpthread/Config.in"
source "package/libthread_db/Config.in"
-source "package/readline/Config.in" # libreadline
-source "package/cyrus-sasl/Config.in" # libsasl2
-source "package/speex/Config.in" # libspeex
+source "package/readline/Config.in"
+source "package/cyrus-sasl/Config.in.lib"
+source "package/speex/Config.in"
source "package/sqlite/Config.in.lib"
source "package/librpcsecgss/Config.in"
source "package/libshout/Config.in"
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1e0cbdafc..bff93bd38 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -17,7 +17,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-PKGDFLT_BASE_FILES= y
+PKGDFLT_BASE_FILES= y if !ADK_TOOLCHAIN_ONLY
do-install:
$(CP) ./extra/* $(IDIR_BASE_FILES)
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 8abb8954d..2d8c14735 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= bluez
PKG_VERSION:= 4.57
PKG_RELEASE:= 2
-PKG_BUILDDEP+= libusb dbus glib
PKG_MD5SUM:= dc29e54f1204ac4215caeeee062b26f6
PKG_DESCR:= bluetooth libraries and applications
PKG_SECTION:= bluetooth
-PKG_DEPENDS:= kmod-bluetooth
+PKG_DEPENDS:= kmod-bluetooth libusb glib dbus
+PKG_BUILDDEP+= libusb dbus glib
PKG_URL:= http://www.bluez.org
PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/}
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index 5b88d1b5c..c4458cb31 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= bogofilter
PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libiconv libdb
PKG_MD5SUM:= 4bbc9adc30d4f8e3a547f9be18a1cb74
PKG_DESCR:= mail filter
PKG_SECTION:= mail
-PKG_DEPENDS:= libdb libiconv
+PKG_DEPENDS:= libiconv libdb
+PKG_BUILDDEP+= libiconv libdb
PKG_URL:= http://bogofilter.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/}
@@ -18,24 +18,18 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= autotool gnu
+CONFIGURE_STYLE:= autotool gnu
CONFIGURE_ENV+= LIBS="-liconv"
CONFIGURE_ARGS+= --without-libsqlite3-prefix \
--without-libqdbm-prefix \
--with-included-gsl \
--with-libdb-prefix=${STAGING_DIR}/usr \
--disable-transactions
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_BOGOFILTER}/usr/bin/
-ifeq (${ADK_PACKAGE_BOGOFILTER_BOGOUTIL},y)
- ${INSTALL_BIN} ${WRKINST}/usr/bin/bogoutil ${IDIR_BOGOFILTER}/usr/bin/
-endif
-ifeq (${ADK_PACKAGE_BOGOFILTER_BOGOTUNE},y)
- ${INSTALL_BIN} ${WRKINST}/usr/bin/bogotune ${IDIR_BOGOFILTER}/usr/bin/
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index aa352ad69..cdd6c2439 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -9,17 +9,18 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 0182fcac3a2b307113bbec34e5f1c673
PKG_DESCR:= Ethernet bridging tools
PKG_SECTION:= net
+PKG_DEPENDS:= kmod-bridge
PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BRIDGE_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= autoconf gnu
+CONFIGURE_STYLE:= autoconf gnu
CONFIGURE_ARGS+= --with-linux-headers=${LINUX_DIR}
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_BRIDGE_UTILS}/usr/sbin
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index 020e0dfc7..8a9bf04e4 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -5,32 +5,35 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= ca-certificates
PKG_VERSION:= 20090814
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779
PKG_DESCR:= Collection of common CA certificates
PKG_SECTION:= shells
+PKG_DEPENDS:= openssl-util libopenssl
PKG_URL:= http://packages.debian.org/sid/ca-certificates
PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
+PKG_FLAVOURS:= SMALL
+PKGFD_SMALL:= Minimal set of CA certificates
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,CA_CERTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
-
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
-ifeq (${ADK_DO_MINIMAL_CA_CERTS},n)
+ifeq (${ADK_PACKAGE_CA_CERTS_SMALL},n)
$(INSTALL_DIR) $(IDIR_CA_CERTS)/{etc/ssl/certs,usr/share,usr/sbin}
$(CP) $(WRKINST)/usr/share/ca-certificates $(IDIR_CA_CERTS)/usr/share/
( cd ${IDIR_CA_CERTS}/usr/share/ca-certificates && \
ls */*.crt >${IDIR_CA_CERTS}/etc/ca-certificates.conf \
)
${INSTALL_BIN} ./extra/update-ca-certificates ${IDIR_CA_CERTS}/usr/sbin/
- -DESTDIR=${IDIR_CA_CERTS} sh ./extra/update-ca-certificates
+ -DESTDIR=${IDIR_CA_CERTS} ${BASH} ./extra/update-ca-certificates
else
${INSTALL_DIR} ${IDIR_CA_CERTS}/etc/ssl
${INSTALL_DATA} ./cert.pem ${IDIR_CA_CERTS}/etc/ssl/
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 81bc95e4e..ec6f2dd54 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cairo
PKG_VERSION:= 1.8.8
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libpng pixman freetype fontconfig libX11
PKG_MD5SUM:= d3e1a1035ae563812d4dd44a74fb0dd0
PKG_DESCR:= cairo graphics library
PKG_SECTION:= libs
PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman
+PKG_BUILDDEP+= libpng pixman freetype fontconfig libX11
PKG_URL:= http://cairographics.org/
PKG_SITES:= http://cairographics.org/releases/
diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile
index b48120005..1197fd15a 100644
--- a/package/cfinstall/Makefile
+++ b/package/cfinstall/Makefile
@@ -8,6 +8,9 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= compact flash installer
PKG_SECTION:= base
+PKG_DEPENDS:= parted sfdisk
+
+PKG_TARGET_DEPENDS:= alix1c alix2d wrap rb532
WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
NO_DISTFILES:= 1
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 076fa0063..222f46ab3 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -6,7 +6,6 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= collectd
PKG_VERSION:= 4.7.0
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libpthread
PKG_MD5SUM:= b077e3398bd6fac0e53e9df4794db264
PKG_DESCR:= System statistics collection daemon
PKG_SECTION:= console
@@ -14,6 +13,12 @@ PKG_DEPENDS:= libpthread
PKG_URL:= http://collectd.org
PKG_SITES:= http://collectd.org/files/
+PKG_FLAVOURS:= CPU LOAD MEMORY PING
+PKGFD_CPU:= collect CPU statistics
+PKGFD_LOAD:= collect system load statistics
+PKGFD_MEMORY:= collect memory usage statistics
+PKGFD_PING:= enable ping statistic plugin
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -31,7 +36,7 @@ ifneq (${ADK_PACKAGE_COLLECTD_PING},y)
DISABLE_PING:=--disable-ping
endif
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-apache \
--disable-apcups \
--disable-apple_sensors \
@@ -91,8 +96,8 @@ CONFIGURE_ARGS+= --disable-apache \
--with-nan-emulation
XAKE_FLAGS+= LIBS='-lm'
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/usr/lib/collectd
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index ad4129fee..ea81a3630 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm
PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
-PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt
+PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-dm-mod
+PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm
PKG_URL:= http://cryptsetup.googlecode.com
PKG_SITES:= http://cryptsetup.googlecode.com/files/
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 52b05d89d..26037200c 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -6,10 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= curl
PKG_VERSION:= 7.19.7
PKG_RELEASE:= 1
-PKG_BUILDDEP+= openssl zlib
PKG_MD5SUM:= ecb2e37e45c9933e2a963cabe03670ab
PKG_DESCR:= a client-side URL transfer tool
PKG_SECTION:= net
+PKG_DEPENDS:= libcurl
+PKG_BUILDDEP+= openssl zlib
PKG_URL:= http://curl.haxx.se
PKG_SITES:= http://curl.haxx.se/download/ \
http://www.mirrorspace.org/curl/ \
@@ -19,15 +20,17 @@ PKG_SITES:= http://curl.haxx.se/download/ \
http://www.mirrormonster.com/curl/download/ \
http://curl.mirrors.cyberservers.net/download/
-PKG_DESCR_1:= a client-side URL transfer library
-PKG_SECTION_1:= libs
-PKG_DEPENDS_1:= libopenssl zlib
+PKG_DESCR_LIB:= a client-side URL transfer library
+PKG_SECTION_LIB:= libs
+PKG_DEPENDS_LIB:= libopenssl zlib
+PKG_DESCR_LIB_DEV:= development files for libcurl
+PKG_SECTION_LIB_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
-$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIB},${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t
@@ -56,9 +59,9 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
- ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
+ ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index e714c780f..22acc5997 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -6,18 +6,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= exmap
PKG_VERSION:= 0.4.1
PKG_RELEASE:= 1
-PKG_BUILDDEP+= glib readline
PKG_MD5SUM:= 55aec784e214037e61400287a55b5426
-PKG_DESCR:= memory analysing toolsuite
+PKG_DESCR:= memory analysing client tool
PKG_SECTION:= utils
+PKG_DEPENDS:= kmod-exmap libreadline glib
+PKG_BUILDDEP+= glib readline
PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/
DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
-PKG_DESCR_EXMAPD:= exmap daemon
-PKG_DESCR_EXMAPSERVER:= exmap server
-PKG_DESCR_KMOD_EXMAP:= exmap kernel module
+PKG_DESCR_EXMAPD:= memory analysing daemon
+PKG_DESCR_EXMAPSERVER:= memory analysing server
+PKG_DESCR_KMOD_EXMAP:= memory analysing kernel module
include ${TOPDIR}/mk/package.mk
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index 22a616412..ea569df1d 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -6,29 +6,29 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= fetchmail
PKG_VERSION:= 6.3.9
PKG_RELEASE:= 1
-ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
-PKG_BUILDDEP+= openssl
-endif
PKG_MD5SUM:= 72c20ad2b9629f1a109668b05a84d823
PKG_DESCR:= fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
PKG_SECTION:= text
+ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
+PKG_DEPENDS:= libopenssl
+PKG_BUILDDEP+= openssl
+endif
PKG_URL:= http://fetchmail.berlios.de/
PKG_SITES:= http://download.berlios.de/fetchmail/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-include ${TOPDIR}/mk/package.mk
+PKG_FLAVOURS:= SSL
+PKGFD_SSL:= enable SSL support
-ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
-PKG_DEPENDS:= libopenssl
-endif
+include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-hesiod
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
CONFIGURE_ARGS+= --with-ssl='${STAGING_DIR}/usr'
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 2a6b5404f..f8f769da5 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -6,25 +6,43 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= freeradius-server
PKG_VERSION:= 2.1.7
PKG_RELEASE:= 1
+PKG_MD5SUM:= b1f77c5e3116bcb0ac0aa9080a06ebf1
+PKG_DESCR:= a flexible RADIUS server
+PKG_SECTION:= net
+PKG_DEPENDS:= libltdl libopenssl libpthread
PKG_BUILDDEP+= libtool openssl
ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
PKG_BUILDDEP+= openldap
+PKG_DEPENDS_LDAP:= libopenldap
endif
ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
PKG_BUILDDEP+= mysql
+PKG_DEPENDS_MYSQL:= libmysqlclient
endif
ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
PKG_BUILDDEP+= postgresql
+PKG_DEPENDS_PGSQL:= libpq
endif
-PKG_MD5SUM:= b1f77c5e3116bcb0ac0aa9080a06ebf1
-PKG_DESCR:= a flexible RADIUS server
-PKG_SECTION:= net
-PKG_DEPENDS:= libltdl libopenssl libpthread
PKG_URL:= http://www.freeradius.org
PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ \
http://freeradius.portal-to-web.de/ \
ftp://ftp.uk.freeradius.org/pub/radius/
+PKG_DESCR_DEMOCERTS:= Demo certificates to test the server
+PKG_DESCR_CHAP:= CHAP authentication module
+PKG_DESCR_DETAIL:= Detailed accounting module
+PKG_DESCR_DIGEST:= Digest authentication module
+PKG_DESCR_FILES:= Module using local files for authorization
+PKG_DESCR_LDAP:= LDAP module
+PKG_DESCR_MSCHAP:= MS-CHAP and MS-CHAPv2 module
+PKG_DESCR_PAP:= PAP authentication module
+PKG_DESCR_PREPROCESS:= Request pre-processing module
+PKG_DESCR_REALM:= Realms handling module
+PKG_DESCR_SQL:= Base SQL module
+PKG_DESCR_MYSQL:= MySQL module
+PKG_DESCR_PGSQL:= PostgreSQL module
+PKG_DESCR_UTILS:= Misc. client utilities
+
PKG_CONFIGURE_OPTIONS:=
ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},)
@@ -75,20 +93,20 @@ ${2}-install:
endef
$(eval $(call PKG_template,FREERADIUS_SERVER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DEMOCERTS},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CHAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DETAIL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DIGEST},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FILES},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LDAP},${PKG_DESCR_LDAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_MSCHAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_PAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_PREPROCESS},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_REALM},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_MYSQL},${PKG_DESCR_MYSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_PGSQL},${PKG_DESCR_PGSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UTILS},${PKG_SECTION}))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,))
@@ -103,7 +121,7 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,sql.conf))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,))
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_lib_nsl_inet_ntoa=no
CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} \
--with-openssl-includes=${STAGING_DIR}/usr/include \
@@ -147,8 +165,8 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} \
--without-rlm_sql_sqlite \
--libdir=/usr/lib/freeradius \
--libexecdir=/usr/lib/freeradius
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
FAKE_FLAGS+= R="${WRKINST}" \
INSTALLSTRIP=""
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index d8efdb125..88aa5a1e9 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -3,16 +3,16 @@
include ${TOPDIR}/rules.mk
-PKG_NAME= gatling
-PKG_VERSION= 0.10
-PKG_RELEASE= 1
-PKG_BUILDDEP+= libowfat libiconv
-PKG_MD5SUM= 04e8434156d91657c77a8a038c5b27cf
+PKG_NAME:= gatling
+PKG_VERSION:= 0.10
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 04e8434156d91657c77a8a038c5b27cf
PKG_DESCR:= small non-forking webserver
PKG_SECTION:= net
-PKG_DEPENDS:= libiconv
+PKG_DEPENDS:= libowfat libiconv
+PKG_BUILDDEP+= libowfat libiconv
PKG_URL:= http://www.fefe.de/gatling
-PKG_SITES= http://dl.fefe.de/
+PKG_SITES:= http://dl.fefe.de/
DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -20,9 +20,9 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GATLING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-BUILD_STYLE= auto
-MAKE_FILE= GNUmakefile
-ALL_TARGET= gatling
+BUILD_STYLE:= auto
+MAKE_FILE:= GNUmakefile
+ALL_TARGET:= gatling
TCPPFLAGS+= -I${STAGING_DIR}/usr/include/owfat
XAKE_FLAGS+= CC='${TARGET_CC}' \
CFLAGS='${TCPPFLAGS} ${TCFLAGS}' \
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 8d6c2203e..f2820d144 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc
PKG_DESCR:= GNU compiler collection
PKG_SECTION:= comp
-PKG_DEPENDS:= mpfr
PKG_OPTS:= noremove
+PKG_DEPENDS:= libgmp mpfr
PKG_BUILDDEP+= gmp mpfr
PKG_HOST_DEPENDS:= !freebsd
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 73d6ec68e..8b6034b43 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger (small server)
PKG_SECTION:= comp
+PKG_DEPENDS:= libthread-db
include ${TOPDIR}/mk/package.mk
diff --git a/package/git/Makefile b/package/git/Makefile
index ea93f3a07..da9896e51 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= git
PKG_VERSION:= 1.6.5.5
PKG_RELEASE:= 2
-PKG_BUILDDEP+= openssl curl expat
PKG_MD5SUM:= 50fb736021ef89916af622cb4772bbea
PKG_DESCR:= fast version control system
PKG_SECTION:= misc
-PKG_DEPENDS:= libopenssl curl
+PKG_DEPENDS:= libopenssl libcurl libexpat
+PKG_BUILDDEP+= openssl curl expat
PKG_URL:= http://git-scm.com
PKG_SITES:= http://kernel.org/pub/software/scm/git/
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 8d2c41abc..0d9a58a14 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gnutls
PKG_VERSION:= 2.8.5
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libgcrypt liblzo libtasn1 opencdk zlib ncurses
PKG_MD5SUM:= e3b2788b79bfc82acbe717e3c54d4e92
PKG_DESCR:= GNU TLS library
PKG_SECTION:= libs
PKG_DEPENDS:= libgcrypt libtasn1 zlib
+PKG_BUILDDEP+= libgcrypt liblzo libtasn1 opencdk zlib ncurses
PKG_URL:= http://www.gnu.org/software/gnutls
PKG_SITES:= ${MASTER_SITE_GNU:=gnutls/}
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index cd0c3fa9f..10e3a5678 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -6,6 +6,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= heimdal
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
+PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e
+PKG_DESCR:= Kerberos 5 server
+PKG_SECTION:= net
+PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses libcom-err
PKG_BUILDDEP+= openssl ncurses e2fsprogs
ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
PKG_BUILDDEP+= libdb
@@ -13,10 +17,6 @@ endif
ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
PKG_BUILDDEP+= openldap
endif
-PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e
-PKG_DESCR:= Kerberos 5 server
-PKG_SECTION:= net
-PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses libcom-err
PKG_URL:= http://www.h5l.org
PKG_SITES:= http://www.h5l.org/dist/src/
@@ -26,6 +26,9 @@ PKG_SECTION_1:= libs
PKG_DESCR_2:= Kerberos 5 client libraries
PKG_SECTION_2:= libs
+PKG_FLAVOURS:= PKINIT
+PKGFD_PKINIT:= Enable PK-INIT
+
include $(TOPDIR)/mk/package.mk
ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y)
@@ -62,7 +65,7 @@ else
CONFIGURE_ARGS+= --without-openldap
endif
-ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
+ifeq ($(ADK_PACKAGE_HEIMDAL_PKINIT),y)
CONFIGURE_OPTS+= --enable-pk-init
else
CONFIGURE_OPTS+= --disable-pk-init
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 2bf6da3b3..29827f7c9 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= hostapd
PKG_VERSION:= 0.6.9
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libnl openssl
PKG_MD5SUM:= 83630d11fa66ade9091f1b304fccd74c
PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
PKG_SECTION:= net
-PKG_DEPENDS:= libopenssl
+PKG_DEPENDS:= libnl libopenssl
+PKG_BUILDDEP+= libnl openssl
PKG_URL:= http://hostap.epitest.fi
PKG_SITES:= http://hostap.epitest.fi/releases/
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-BUILD_STYLE= auto
+BUILD_STYLE:= auto
do-configure:
${CP} ./files/hostapd.config ${WRKBUILD}/.config
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 00d453020..a70b675b5 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -6,19 +6,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= iproute2
PKG_VERSION:= 2.6.29-1
PKG_RELEASE:= 2
-ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
-PKG_BUILDDEP+= linux-atm
-endif
PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582
PKG_DESCR:= iproute2 routing control utility
PKG_SECTION:= net
+ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
+PKG_BUILDDEP+= linux-atm
+endif
PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2
PKG_SITES:= http://developer.osdl.org/dev/iproute2/download/
PKG_DESCR_TC:= iproute2 traffic control utility
PKG_DEPENDS_TC:= kmod-sched
PKG_DESCR_TC_ATM:= iproute2 traffic control ATM support library
-PKG_DEPENDS_TC_ATM:= tc
+PKG_DEPENDS_TC_ATM:= tc libatm
PKG_DESCR_IFSTAT:= iproute2 interface statistics utility
PKG_DESCR_LNSTAT:= iproute2 network statistics utilities
PKG_DESCR_ROUTEL:= iproute2 route list and flush utilities
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 6be328253..ae82b7fcf 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= c67cf30e281a924def6426be0973df56
PKG_DESCR:= The netfilter firewalling software
PKG_SECTION:= net
+PKG_DEPENDS:= kmod-nf-ip-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-nf-ip-target-masquerade kmod-nf-ip-target-reject kmod-nf-ip-filter
PKG_URL:= http://www.netfilter.org
PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \
ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 68079651b..1b502cff0 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -6,24 +6,24 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= irssi
PKG_VERSION:= 0.8.13
PKG_RELEASE:= 1
-PKG_BUILDDEP+= glib ncurses
-ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
-PKG_BUILDDEP+= openssl
-endif
PKG_MD5SUM:= 0d6fc2203832b514eff014fffd574664
PKG_DESCR:= IRC text client
PKG_SECTION:= text
PKG_DEPENDS:= glib libncurses
+PKG_BUILDDEP+= glib ncurses
+ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
+PKG_DEPENDS+= libopenssl
+PKG_BUILDDEP+= openssl
+endif
PKG_URL:= http://www.irssi.org
PKG_SITES:= http://www.irssi.org/files/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-include ${TOPDIR}/mk/package.mk
+PKG_FLAVOURS:= SSL
+PKGFD_SSL:= SSL/TLS support
-ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
-PKG_DEPENDS+= libopenssl
-endif
+include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IRSSI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -45,6 +45,7 @@ endif
do-install:
${INSTALL_DIR} ${IDIR_IRSSI}/usr/bin
- ${INSTALL_BIN} ${WRKBUILD}/src/fe-text/${PKG_NAME} ${IDIR_IRSSI}/usr/bin/
+ ${INSTALL_BIN} ${WRKBUILD}/src/fe-text/${PKG_NAME} \
+ ${IDIR_IRSSI}/usr/bin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index a87f1e79f..5a5b95a22 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -6,10 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= l2tpns
PKG_VERSION:= 2.1.21
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libcli
PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c
PKG_DESCR:= A layer 2 tunneling protocol network server (LNS)
PKG_SECTION:= net
+PKG_DEPENDS:= libcli
+PKG_BUILDDEP+= libcli
PKG_URL:= http://l2tpns.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=l2tpns/}
@@ -17,8 +18,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-BUILD_FLAGS= auto
-INSTALL_STYLE= auto
+BUILD_FLAGS:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_L2TPNS}/etc/l2tpns
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index e6dcbd766..3724575b5 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXfont
PKG_VERSION:= 1.4.1
PKG_RELEASE:= 1
-PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc
PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412
PKG_DESCR:= X font Library
PKG_SECTION:= x11
PKG_DEPENDS:= libfreetype
+PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index c85ebc585..1298e4cfe 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -3,20 +3,20 @@
include ${TOPDIR}/rules.mk
-PKG_NAME= mksh
-PKG_VERSION= 39
-PKG_RELEASE= 1
-PKG_MD5SUM= b2eeb4fe4ccac2704e1440e53cd2672c
+PKG_NAME:= mksh
+PKG_VERSION:= 39
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b2eeb4fe4ccac2704e1440e53cd2672c
PKG_DESCR:= MirBSD Korn Shell
PKG_SECTION:= shells
PKG_URL:= http://www.mirbsd.org
-PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.cpio.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}
-PKG_FLAVOURS= FULL
-PKGFD_FULL= Include all features
+PKG_FLAVOURS:= FULL
+PKGFD_FULL:= Include all features
include ${TOPDIR}/mk/package.mk
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index b74664d3a..17de862f3 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= openssl
PKG_VERSION:= 0.9.8l
PKG_RELEASE:= 1
-PKG_BUILDDEP+= zlib
PKG_MD5SUM:= 05a0ece1372392a2cf310ebb96333025
PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
+PKG_BUILDDEP+= zlib
PKG_URL:= http://www.openssl.org
PKG_SITES:= http://www.openssl.org/source/ \
ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \