From 05d0076d97ed69a531df1aa5cde3a1e6ed17f922 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Sep 2010 19:04:46 +0200 Subject: replace mksh scripts with faster C programs depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes, so that a package is rebuild. Generation of meta-data is a lot faster now. Fix or add new PKG variables to fulfill the needs of the new programs. Documentation will follow as soon as it is stable. --- Makefile | 9 - README | 1 - mk/build.mk | 27 +- mk/package.mk | 1 - mk/split-cfg.mk | 9 - package/DirectFB/Makefile | 2 +- package/MesaLib/Makefile | 21 +- package/adkinstall/Makefile | 1 + package/aiccu/Makefile | 2 +- package/aircrack-ng/Makefile | 4 +- package/alix-switch/Makefile | 4 +- package/alsa-utils/Makefile | 11 +- package/apr-util/Makefile | 12 +- package/apr/Makefile | 2 +- package/arpd/Makefile | 2 +- package/arpwatch/Makefile | 4 +- package/asterisk/Makefile | 39 +- package/atftp/Makefile | 9 +- package/atk/Makefile | 4 +- package/aufs2-util/Makefile | 1 + package/autossh/Makefile | 2 +- package/avahi/Makefile | 16 +- package/axtls/Makefile | 9 +- package/bc/Makefile | 4 +- package/bigreqsproto/Makefile | 1 + package/bind/Makefile | 34 +- package/binutils/Makefile | 9 +- package/bitlbee/Makefile | 4 +- package/bluez-firmware/Makefile | 2 +- package/bluez/Makefile | 4 +- package/bogofilter/Makefile | 2 +- package/busybox/Makefile | 7 +- package/bwm/Makefile | 6 +- package/bzip2/Makefile | 2 +- package/bzr/Makefile | 2 +- package/cairo/Makefile | 2 +- package/ccid/Makefile | 2 +- package/cfgfs/Makefile | 13 +- package/cgilib/Makefile | 2 +- package/chillispot/Makefile | 2 +- package/collectd/Makefile | 2 +- package/compositeproto/Makefile | 1 + package/conntrack-tools/Makefile | 5 +- package/coreutils/Makefile | 7 +- package/cpufrequtils/Makefile | 3 +- package/cryptinit/Makefile | 6 +- package/cryptsetup/Makefile | 8 +- package/ctorrent/Makefile | 2 +- package/cups/Makefile | 5 +- package/curl/Makefile | 17 +- package/cvs/Makefile | 8 - package/cxxtools/Makefile | 4 +- package/cyrus-sasl/Makefile | 7 +- package/damageproto/Makefile | 1 + package/dansguardian/Makefile | 6 +- package/davfs2/Makefile | 18 +- package/dbus-glib/Makefile | 2 +- package/dbus/Makefile | 4 +- package/deco/Makefile | 2 +- package/depmaker | 38 -- package/dhcp-forwarder/Makefile | 5 +- package/dhcp/Makefile | 8 +- package/dialog/Makefile | 2 +- package/digitemp/Makefile | 4 +- package/dillo/Makefile | 8 +- package/dnsmasq/Makefile | 2 +- package/dosfstools/Makefile | 2 +- package/dovecot/Makefile | 2 +- package/dri2proto/Makefile | 1 + package/dropbear/Makefile | 11 +- package/dsniff/Makefile | 4 +- package/e2fsprogs/Makefile | 28 +- package/eglibc/Makefile | 5 +- package/elinks/Makefile | 2 +- package/esound/Makefile | 2 +- package/ethtool/Makefile | 2 +- package/evieext/Makefile | 1 + package/evilwm/Makefile | 2 +- package/exmap/Makefile | 19 +- package/expat/Makefile | 2 + package/ez-ipupdate/Makefile | 7 +- package/faad2/Makefile | 2 + package/fetchmail/Makefile | 4 +- package/ffmpeg/Makefile | 14 +- package/firefox/Makefile | 8 +- package/fixesproto/Makefile | 1 + package/flac/Makefile | 2 + package/fltk/Makefile | 9 +- package/fluxbox/Makefile | 6 +- package/font-adobe-100dpi/Makefile | 2 +- package/font-adobe-75dpi/Makefile | 2 +- package/font-misc-misc/Makefile | 2 +- package/fontcacheproto/Makefile | 1 + package/fontconfig/Makefile | 4 +- package/fontsproto/Makefile | 1 + package/fping/Makefile | 2 +- package/fprobe/Makefile | 2 +- package/freeglut/Makefile | 4 +- package/freeradius-client/Makefile | 9 +- package/freeradius-server/Makefile | 86 ++-- package/freetype/Makefile | 6 +- package/fuse/Makefile | 4 +- package/gatling/Makefile | 2 +- package/gcc/Makefile | 4 +- package/gdb/Makefile | 6 +- package/gdbm/Makefile | 4 +- package/gdbserver/Makefile | 7 +- package/gettext/Makefile | 10 +- package/git/Makefile | 4 +- package/gkrellmd/Makefile | 2 +- package/glib/Makefile | 2 +- package/glibc/Makefile | 5 +- package/glproto/Makefile | 2 + package/gmediaserver/Makefile | 2 +- package/gmp/Makefile | 4 +- package/gnupg/Makefile | 4 +- package/gnutls/Makefile | 21 +- package/gpsd/Makefile | 9 +- package/grub-bin/Makefile | 7 +- package/grub/Makefile | 2 +- package/gsm/Makefile | 10 +- package/gtk+/Makefile | 4 +- package/haserl/Makefile | 2 +- package/heimdal/Makefile | 48 +- package/heyu/Makefile | 2 +- package/hostapd/Makefile | 21 +- package/httping/Makefile | 2 +- package/httptunnel/Makefile | 2 +- package/icecast/Makefile | 2 +- package/id3lib/Makefile | 6 +- package/iftop/Makefile | 4 +- package/igmpproxy/Makefile | 3 +- package/inputproto/Makefile | 1 + package/ipcad/Makefile | 2 +- package/iperf/Makefile | 2 +- package/iproute2/Makefile | 37 +- package/ipsec-tools/Makefile | 4 +- package/ipset/Makefile | 12 +- package/iptables-snmp/Makefile | 2 +- package/iptables/Makefile | 2 + package/iptraf/Makefile | 7 +- package/irssi/Makefile | 12 +- package/iw/Makefile | 2 +- package/jamvm/Makefile | 2 +- package/jpeg/Makefile | 5 +- package/kbproto/Makefile | 1 + package/kismet/Makefile | 17 +- package/knock/Makefile | 9 +- package/krb5/Makefile | 12 +- package/l2tpns/Makefile | 2 +- package/lame/Makefile | 9 +- package/less/Makefile | 6 +- package/libICE/Makefile | 2 +- package/libIDL/Makefile | 2 +- package/libSM/Makefile | 2 +- package/libX11/Makefile | 4 +- package/libXaw/Makefile | 2 +- package/libXdamage/Makefile | 2 +- package/libXext/Makefile | 2 +- package/libXfixes/Makefile | 2 +- package/libXfont/Makefile | 2 +- package/libXft/Makefile | 2 +- package/libXi/Makefile | 2 +- package/libXmu/Makefile | 2 +- package/libXrender/Makefile | 2 +- package/libXt/Makefile | 2 +- package/libXv/Makefile | 2 +- package/libXxf86dga/Makefile | 2 +- package/libXxf86vm/Makefile | 2 +- package/libao/Makefile | 2 +- package/libc/Makefile | 1 + package/libdrm/Makefile | 2 +- package/libfontenc/Makefile | 2 +- package/libgcrypt/Makefile | 2 +- package/libgd/Makefile | 6 +- package/libgpg-error/Makefile | 2 +- package/libiconv/Makefile | 2 +- package/libid3tag/Makefile | 2 +- package/liblzo/Makefile | 2 + package/libmpc/Makefile | 4 +- package/libnet/Makefile | 2 +- package/libnetfilter_conntrack/Makefile | 2 +- package/libnetfilter_log/Makefile | 2 +- package/libnetfilter_queue/Makefile | 2 +- package/libnids/Makefile | 2 +- package/libol/Makefile | 2 +- package/libowfat/Makefile | 1 + package/libp11/Makefile | 2 +- package/libpng/Makefile | 2 +- package/libpri/Makefile | 2 +- package/libpthread-stubs/Makefile | 2 + package/libpthread/Makefile | 1 + package/librpcsecgss/Makefile | 2 +- package/libshout/Makefile | 2 +- package/libstdcxx/Makefile | 1 + package/libtasn1/Makefile | 2 +- package/libthread_db/Makefile | 1 + package/libtiff/Makefile | 2 +- package/libtirpc/Makefile | 4 +- package/libtool/Makefile | 7 +- package/libtorrent/Makefile | 4 +- package/libupnp/Makefile | 2 +- package/libusb-compat/Makefile | 2 +- package/libusb/Makefile | 2 +- package/libvirt/Makefile | 2 +- package/libvorbis/Makefile | 4 +- package/libxkbfile/Makefile | 2 +- package/libxml2/Makefile | 2 +- package/libxslt/Makefile | 5 +- package/lighttpd/Makefile | 24 +- package/links/Makefile | 4 +- package/linux-atm/Makefile | 15 +- package/logrotate/Makefile | 2 +- package/lua/Makefile | 13 +- package/lvm/Makefile | 12 +- package/lynx/Makefile | 12 +- package/madplay/Makefile | 2 +- package/mc/Makefile | 14 +- package/miau/Makefile | 2 +- package/miax/Makefile | 2 +- package/microperl/Makefile | 7 +- package/mini_httpd/Makefile | 39 +- package/mini_sendmail/Makefile | 2 +- package/miredo/Makefile | 13 +- package/mksh/Makefile | 8 +- package/moc/Makefile | 4 +- package/monit/Makefile | 17 +- package/monit/patches/patch-configure | 86 ---- package/motion/Makefile | 2 +- package/mpc/Makefile | 2 +- package/mpd/Makefile | 57 +-- package/mpg123/Makefile | 2 +- package/mplayer/Makefile | 10 +- package/mrd6/Makefile | 2 +- package/mt-daapd/Makefile | 8 +- package/mtd/Makefile | 3 +- package/mtr/Makefile | 4 +- package/mutt/Makefile | 4 +- package/mysql/Makefile | 3 +- package/nand/Makefile | 3 +- package/nano/Makefile | 5 +- package/ncurses/Makefile | 7 +- package/ndisc/Makefile | 4 +- package/neon/Makefile | 2 +- package/net-snmp/Makefile | 19 +- package/netperf/Makefile | 3 +- package/nfs-utils/Makefile | 17 +- package/nmap/Makefile | 6 +- package/nss/Makefile | 6 +- package/ntfs-3g/Makefile | 10 +- package/ntpclient/Makefile | 2 +- package/nut/Makefile | 18 +- package/obexftp/Makefile | 11 +- package/olsrd/Makefile | 10 +- package/opencdk/Makefile | 4 +- package/openct/Makefile | 4 +- package/openldap/Makefile | 19 +- package/openntpd/Makefile | 7 +- package/openobex/Makefile | 2 +- package/opensc/Makefile | 4 +- package/opensips/Makefile | 17 +- package/openssh/Makefile | 49 +- package/openssl-pkcs11/Makefile | 2 +- package/openssl/Makefile | 19 +- package/openswan/Makefile | 3 +- package/openvpn/Makefile | 12 +- package/oprofile/Makefile | 6 +- package/osiris/Makefile | 4 +- package/owfs/Makefile | 2 +- package/p910nd/Makefile | 2 +- package/palantir/Makefile | 4 +- package/pango/Makefile | 2 +- package/parprouted/Makefile | 2 +- package/parted/Makefile | 2 +- package/patch/Makefile | 2 +- package/pciutils/Makefile | 7 +- package/pcmciautils/Makefile | 2 +- package/pcre/Makefile | 4 +- package/pcsc-lite/Makefile | 2 +- package/perl/Makefile | 9 +- package/php/Makefile | 53 +- package/picocom/Makefile | 2 +- package/pkg-config/Makefile | 2 +- package/pkgmaker | 354 ------------- package/pmacct/Makefile | 17 +- package/popt/Makefile | 6 +- package/portmap/Makefile | 6 +- package/postgresql/Makefile | 9 +- package/ppp/Makefile | 7 +- package/pptpd/Makefile | 2 +- package/privoxy/Makefile | 4 +- package/procmail/Makefile | 2 +- package/procps/Makefile | 4 +- package/proftpd/Makefile | 2 +- package/ptunnel/Makefile | 2 +- package/python/Makefile | 2 +- package/python2/Makefile | 2 +- package/qingy/Makefile | 2 +- package/quagga/Makefile | 33 +- package/raddump/Makefile | 2 +- package/radvd/Makefile | 5 +- package/randrproto/Makefile | 1 + package/rarpd/Makefile | 2 +- package/rdate/Makefile | 10 +- package/readline/Makefile | 4 +- package/reaim/Makefile | 2 +- package/renderproto/Makefile | 1 + package/resourceproto/Makefile | 1 + package/rng-tools/Makefile | 2 +- package/rp-pppoe/Makefile | 4 +- package/rpcbind/Makefile | 2 +- package/rpm/Makefile | 10 +- package/rrdcollect/Makefile | 4 +- package/rrdtool/Makefile | 3 +- package/rrs/Makefile | 53 +- package/rsync/Makefile | 4 +- package/rtorrent/Makefile | 4 +- package/ruby/Makefile | 5 +- package/rxvt-unicode/Makefile | 2 +- package/samba/Makefile | 4 +- package/sane-backends/Makefile | 26 +- package/sangam-atm/Makefile | 2 +- package/scanlogd/Makefile | 8 +- package/screen/Makefile | 4 +- package/scrnsaverproto/Makefile | 1 + package/sdl-image/Makefile | 10 +- package/sdl/Makefile | 12 +- package/section.lst | 46 ++ package/sections.lst | 53 -- package/serdisplib/Makefile | 2 +- package/siproxd/Makefile | 2 +- package/sipsak/Makefile | 7 +- package/sispmctl/Makefile | 4 +- package/snort/Makefile | 4 +- package/socat/Makefile | 4 +- package/speex/Makefile | 4 +- package/sqlite/Makefile | 4 +- package/squid/Makefile | 22 +- package/ssltunnel/Makefile | 2 +- package/strace/Makefile | 4 +- package/strongswan/Makefile | 14 +- package/subversion/Makefile | 2 +- package/syslog-ng/Makefile | 4 +- package/tcp_wrappers/Makefile | 4 +- package/tcpdump/Makefile | 2 +- package/tcsh/Makefile | 2 +- package/tinc/Makefile | 4 +- package/tinyproxy/Makefile | 2 +- package/tmsnc/Makefile | 2 +- package/tntnet/Makefile | 41 +- package/tor/Makefile | 6 +- package/trafshow/Makefile | 1 - package/tslib/Makefile | 3 +- package/twm/Makefile | 4 +- package/uclibc++/Makefile | 4 +- package/uclibc/Makefile | 8 +- package/udev/Makefile | 4 +- package/udp-broadcast-relay/Makefile | 2 +- package/ulogd/Makefile | 22 +- package/updatedd/Makefile | 6 +- package/usbutils/Makefile | 4 +- package/ussp-push/Makefile | 2 +- package/util-linux-ng/Makefile | 29 +- package/uvd/Makefile | 2 +- package/valgrind/Makefile | 2 +- package/vgp/Makefile | 2 +- package/videoproto/Makefile | 1 + package/vilistextum/Makefile | 2 +- package/vim/Makefile | 12 +- package/vnc-reflector/Makefile | 2 +- package/vpnc/Makefile | 2 +- package/vsftpd/Makefile | 2 +- package/vtun/Makefile | 2 +- package/wdfs/Makefile | 12 +- package/weechat/Makefile | 2 +- package/wifidog/Makefile | 2 +- package/wondershaper/Makefile | 2 +- package/wpa_supplicant/Makefile | 10 +- package/xauth/Makefile | 2 +- package/xcb-proto/Makefile | 1 + package/xcmiscproto/Makefile | 1 + package/xextproto/Makefile | 1 + package/xf86-input-evtouch/Makefile | 6 +- package/xf86-input-keyboard/Makefile | 2 +- package/xf86-input-mouse/Makefile | 2 +- package/xf86-video-cirrus/Makefile | 2 +- package/xf86-video-fbdev/Makefile | 2 +- package/xf86-video-geode/Makefile | 2 +- package/xf86-video-intel/Makefile | 2 +- package/xf86-video-siliconmotion/Makefile | 2 +- package/xf86dga/Makefile | 3 +- package/xf86dgaproto/Makefile | 1 + package/xf86driproto/Makefile | 2 + package/xf86vidmodeproto/Makefile | 1 + package/xfsprogs/Makefile | 2 +- package/xinetd/Makefile | 2 +- package/xinit/Makefile | 4 +- package/xkeyboard-config/Makefile | 2 +- package/xorg-server/Makefile | 25 +- package/xproto/Makefile | 1 + package/xterm/Makefile | 3 +- package/xtrans/Makefile | 1 + package/xvinfo/Makefile | 2 +- package/zlib/Makefile | 11 +- scripts/split-cfg.sh | 1 + target/target.lst | 36 +- tools/Makefile | 2 +- tools/adk/Makefile | 11 + tools/adk/depmaker.c | 233 +++++++++ tools/adk/pkgmaker.c | 797 ++++++++++++++++++++++++++++++ tools/adk/sortfile.c | 153 ++++++ tools/adk/sortfile.h | 1 + tools/adk/strmap.c | 510 +++++++++++++++++++ tools/adk/strmap.h | 350 +++++++++++++ 414 files changed, 3318 insertions(+), 1843 deletions(-) delete mode 100644 mk/split-cfg.mk delete mode 100644 package/depmaker delete mode 100644 package/monit/patches/patch-configure delete mode 100644 package/pkgmaker create mode 100644 package/section.lst delete mode 100644 package/sections.lst create mode 100644 tools/adk/Makefile create mode 100644 tools/adk/depmaker.c create mode 100644 tools/adk/pkgmaker.c create mode 100644 tools/adk/sortfile.c create mode 100644 tools/adk/sortfile.h create mode 100644 tools/adk/strmap.c create mode 100644 tools/adk/strmap.h diff --git a/Makefile b/Makefile index bfa10b106..bc5184b65 100644 --- a/Makefile +++ b/Makefile @@ -180,15 +180,6 @@ NO_ERROR=0 echo "GNU bash needs to be installed."; \ exit 1; \ fi - @if ! mksh -c 'echo $$KSH_VERSION' 2>&1 | grep -F 'MIRBSD' >/dev/null 2>&1; then \ - echo "MirBSD ksh (mksh) needs to be installed."; \ - exit 1; \ - else \ - if [ $$(mksh -c 'echo $$KSH_VERSION' |cut -d ' ' -f 3|sed "s#R##") -le 34 ]; then \ - echo "MirBSD ksh is too old. R35 or higher needed."; \ - exit 1; \ - fi \ - fi @if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \ echo >&2 Error: you must build with umask 022, sorry.; \ exit 1; \ diff --git a/README b/README index 04b6b441e..284c4664e 100644 --- a/README +++ b/README @@ -5,7 +5,6 @@ This is a menu based buildsystem for your home made embedded Linux system. Before you can start you need to install some tools: - bash -- mksh - gcc - binutils - GNU make diff --git a/mk/build.mk b/mk/build.mk index f71808b3f..c3ab05dcd 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -87,17 +87,17 @@ endif ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) include $(TOPDIR)/rules.mk -include ${TOPDIR}/mk/split-cfg.mk all: world ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile) - mksh ${TOPDIR}/package/depmaker + $(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk + .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean -world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG +world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh ifeq ($(ADK_NATIVE),y) $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install @@ -137,10 +137,10 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf endif -package/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk +package/%: ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk $(MAKE) -C package $(patsubst package/%,%,$@) -target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG +target/%: $(MAKE) -C target $(patsubst target/%,%,$@) toolchain/%: ${STAGING_DIR} @@ -179,11 +179,6 @@ newpackage: @echo "Edit package/$(PKG)/Makefile to complete" @echo "choose PKG_SECTION to add it to an existent submenu" -############################################################# -# -# Cleanup and misc junk -# -############################################################# root_clean: @$(TRACE) root_clean rm -rf $(TARGET_DIR) @@ -411,7 +406,7 @@ ifneq (,$(filter wrap%,${TARGET})) @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config endif -menuconfig: $(CONFIG)/mconf defconfig .menu +menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto @if [ ! -f .config ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ fi @@ -495,14 +490,18 @@ bulkallmod: ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \ done <${TOPDIR}/target/bulk.lst -menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) +${TOPDIR}/bin/tools/pkgmaker: + @$(HOSTCC) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c + +package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker @echo "Generating menu structure ..." - mksh $(TOPDIR)/package/pkgmaker + @mkdir -p $(TOPDIR)/bin/tools + @$(TOPDIR)/bin/tools/pkgmaker @:>.menu dep: @echo "Generating dependencies ..." - mksh $(TOPDIR)/package/depmaker + $(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk .PHONY: menu dep diff --git a/mk/package.mk b/mk/package.mk index 30965e17b..1f582b3d1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -108,7 +108,6 @@ _IPKGS_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} _IN_PACKAGE:= 1 include ${TOPDIR}/mk/buildhlp.mk --include info.mk # defined in buildhlp.mk ('extract' can fail, use 'patch' then) extract: ${_EXTRACT_COOKIE} diff --git a/mk/split-cfg.mk b/mk/split-cfg.mk deleted file mode 100644 index e9521c259..000000000 --- a/mk/split-cfg.mk +++ /dev/null @@ -1,9 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. -# must work with both BSD and GNU make - -${TOPDIR}/.ADK_HAVE_DOT_CONFIG: \ - ${TOPDIR}/.config ${TOPDIR}/mk/split-cfg.mk \ - ${TOPDIR}/scripts/split-cfg.sh - mksh ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}' '${ADK_TARGET}' '${ADK_LIBC}' - touch ${TOPDIR}/.ADK_HAVE_DOT_CONFIG diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index f96d888ec..ba0b69a03 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 223e036da906ceb4bd44708026839ff1 PKG_DESCR:= Thin library on top of the Linux framebuffer devices PKG_SECTION:= libs -PKG_BUILDDEP:= libpng libX11 libXext PKG_DEPENDS:= libpng +PKG_BUILDDEP:= libpng libX11 libXext PKG_URL:= http://www.directfb.org/ PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.4/ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 4d82687ee..6d70a1798 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -10,26 +10,27 @@ PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a PKG_DESCR:= MESA library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm -PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP:= libXdamage libXfixes libXxf86vm libdrm PKG_BUILDDEP+= dri2proto glproto expat PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ -PKG_DESCR_GLXINFO:= Display various GLX information -PKG_SECT_GLXINFO:= x11/apps -PKG_DESCR_GLXGEARS:= Nice little OpenGL demo application -PKG_SECT_GLXGEARS:= x11/apps +PKG_SUBPKGS:= MESALIB GLXINFO GLXGEARS +PKGSD_GLXINFO:= Display various GLX information +PKGSC_GLXINFO:= x11/apps +PKGSD_GLXGEARS:= Nice little OpenGL demo application +PKGSC_GLXGEARS:= x11/apps -WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} - -PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin +PKG_TARGET_DEPENDS:= ibmx40 lemote + +WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_GLXINFO},${PKG_SECT_GLXINFO})) -$(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_GLXGEARS},${PKG_SECT_GLXGEARS})) +$(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO})) +$(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS})) ifeq (${ADK_LINUX_X86_IBMX40},y) DRI_DRIVERS:=i810 diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 65745cd08..5a64ae14d 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 5 PKG_DESCR:= openadk installer PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs +PKG_URL:= http://www.openadk.org/ PKG_TARGET_DEPENDS:= alix wrap routerboard foxg20 diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 0a6d706ed..5eeeac943 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility PKG_SECTION:= ipv6 PKG_DEPENDS:= kmod-ipv6 libpthread -PKG_URL:= http://www.sixxs.net +PKG_URL:= http://www.sixxs.net/ PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index b9c9470bf..7bc5ec29e 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= f7a24ed8fad122c4187d06bfd6f998b4 PKG_DESCR:= set of tools for auditing wireless networks PKG_SECTION:= wifi PKG_DEPENDS:= libpthread libopenssl libpcap -PKG_BUILDDEP+= openssl libpcap -PKG_URL:= http://www.aircrack-ng.org +PKG_BUILDDEP:= openssl libpcap +PKG_URL:= http://www.aircrack-ng.org/ PKG_SITES:= http://download.aircrack-ng.org/ include $(TOPDIR)/mk/package.mk diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 493a73053..79b72b1e1 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -8,8 +8,10 @@ PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_DESCR:= daemon listening on button events PKG_SECTION:= base +PKG_URL:= http://www.openadk.org/ PKG_TARGET_DEPENDS:= alix +PKG_DFLT_ALIX_SWITCH:= y NO_DISTFILES:= 1 @@ -17,8 +19,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ALIX_SWITCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_ALIX_SWITCH= y - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index e1668520c..288faafdf 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -10,17 +10,14 @@ PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d PKG_DESCR:= ALSA mixer utility PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread -PKG_BUILDDEP+= alsa-lib -ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) -PKG_BUILDDEP+= ncurses -endif -PKG_URL:= http://www.alsa-project.org -PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ - ftp://ftp.alsa-project.org/pub/utils/ +PKG_BUILDDEP:= alsa-lib +PKG_URL:= http://www.alsa-project.org/ +PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/ PKG_FLAVOURS:= WITH_ALSAMIXER PKGFS_WITH_ALSAMIXER:= libncurses PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet +PKGFB_WITH_ALSAMIXER:= ncurses DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 2c0afd8bf..86ddd34ca 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -3,15 +3,15 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= apr-util -PKG_VERSION:= 1.3.9 -PKG_RELEASE:= 1 -PKG_MD5SUM:= cc2ec0ba4f01d88375f1170f762518fa +PKG_NAME:= apr-util +PKG_VERSION:= 1.3.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= cc2ec0ba4f01d88375f1170f762518fa PKG_DESCR:= Apache Portable Runtime utility library PKG_SECTION:= libs PKG_DEPENDS:= libexpat apr -PKG_BUILDDEP+= expat apr -PKG_URL:= http://apr.apache.org +PKG_BUILDDEP:= expat apr +PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://apache.mirror.clusters.cc/apr/ include ${TOPDIR}/mk/package.mk diff --git a/package/apr/Makefile b/package/apr/Makefile index 7da0bf8b5..08faf55d9 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= fc80cb54f158c2674f9eeb47a1f672cd PKG_DESCR:= Apache Portable Runtime library PKG_SECTION:= libs PKG_DEPENDS:= libpthread -PKG_URL:= http://apr.apache.org +PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ PKG_FLAVOURS:= WITH_IPV6 diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 249f4b8eb..071e4eb7d 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d PKG_DESCR:= Generates ARP responses for IP address ranges PKG_SECTION:= route PKG_DEPENDS:= libpcap libdnet libevent -PKG_BUILDDEP+= libpcap libdnet libevent +PKG_BUILDDEP:= libpcap libdnet libevent PKG_URL:= http://niels.xtdnet.nl/honeyd/ PKG_SITES:= http://niels.xtdnet.nl/honeyd/ diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 83584fb1e..a3e437f64 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= cebfeb99c4a7c2a6cee2564770415fe7 PKG_DESCR:= Ethernet monitor program PKG_SECTION:= net/security PKG_DEPENDS:= libpcap -PKG_BUILDDEP+= libpcap -PKG_URL:= http://www-nrg.ee.lbl.gov +PKG_BUILDDEP:= libpcap +PKG_URL:= http://www-nrg.ee.lbl.gov/ PKG_SITES:= ftp://ftp.ee.lbl.gov/ include $(TOPDIR)/mk/package.mk diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index a6025ce43..3083656f4 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -9,38 +9,37 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 50412a90942ae7306fb8dcc31a05c2ce PKG_DESCR:= Open Source PBX PKG_SECTION:= phone -PKG_MULTI:= 1 -PKG_NOPARALLEL:= 1 PKG_DEPENDS:= libncurses libpthread libopenssl libcurl -PKG_BUILDDEP+= ncurses openssl zlib curl popt -ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),) -PKG_BUILDDEP+= speex -endif -ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),) -PKG_BUILDDEP+= postgresql -endif +PKG_BUILDDEP:= ncurses openssl zlib curl popt PKG_URL:= http://www.asterisk.org/ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ +PKG_MULTI:= 1 +PKG_NOPARALLEL:= 1 PKG_TARGET_DEPENDS:= !foxboard -PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation -PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation -PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol -PKG_DESCR_CODEC_SPEEX:= Speex/PCM16 Codec Translator -PKG_DESCR_SOUNDS:= Various soundfiles in GSM format -PKG_DEPENDS_SOUNDS:= ${PKG_DEPENDS} asterisk-codec-gsm +PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP +PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM +PKG_SUBPKGS+= ASTERISK_PBX_DUNDI ASTERISK_RES_AGI +PKGSB_ASTERISK_CODEC_SPEEX:= speex +PKGSB_ASTERISK_PQSQL:= postgresql +PKGSD_ASTERISK_CHAN_MGCP:= Media Gateway Control Protocol implementation +PKGSD_ASTERISK_CHAN_SKINNY:= Skinny Client Control Protocol implementation +PKGSD_ASTERISK_CHAN_IAX2:= Support for the Inter Asterisk Protocol +PKGSD_ASTERISK_CODEC_SPEEX:= Speex/PCM16 Codec Translator +PKGSD_ASTERISK_SOUNDS:= Various soundfiles in GSM format +PKGSS_ASTERISK_SOUNDS:= asterisk-codec-gsm include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_SOUNDS},${PKG_DESCR_SOUNDS},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CODEC_SPEEX},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_ASTERISK_SOUNDS},${PKGSD_ASTERISK_SOUNDS},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_SKINNY},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_IAX2},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_SPEEX},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/atftp/Makefile b/package/atftp/Makefile index e009111fa..601e9aba3 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -10,16 +10,17 @@ PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82 PKG_DESCR:= TFTP client PKG_SECTION:= dhcp PKG_DEPENDS:= libreadline libncurses -PKG_BUILDDEP+= readline ncurses -PKG_URL:= http://freshmeat.net/projects/atftp +PKG_BUILDDEP:= readline ncurses +PKG_URL:= http://freshmeat.net/projects/atftp/ PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ -PKG_DESCR_TFTP_SERVER:= TFTP server +PKG_SUBPKGS:= ATFTP ATFTPD +PKGSD_ATFTPD:= TFTP server include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TFTP_SERVER},${PKG_SECTION})) +$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ATFTPD},${PKG_SECTION})) MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline" diff --git a/package/atk/Makefile b/package/atk/Makefile index 2b3437450..cb33d1f30 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f587d9285b2d0ac35ea95acef673517c PKG_DESCR:= atk library PKG_SECTION:= libs -PKG_BUILDDEP+= glib -PKG_URL:= http://www.gnome.org +PKG_BUILDDEP:= glib +PKG_URL:= http://www.gnome.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.29/} ifeq ($(ADK_STATIC),y) diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile index d757e9c98..4078fa8e1 100644 --- a/package/aufs2-util/Makefile +++ b/package/aufs2-util/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= aufs2 utilities PKG_SECTION:= fs PKG_URL:= http://aufs.sf.net/ + PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd NO_DISTFILES:= 1 diff --git a/package/autossh/Makefile b/package/autossh/Makefile index 8f7a776b2..19fc3216d 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7 PKG_DESCR:= Automatically restart SSH sessions and tunnels PKG_SECTION:= net/security PKG_DEPENDS:= openssh-client -PKG_URL:= http://www.harding.motd.ca/autossh +PKG_URL:= http://www.harding.motd.ca/autossh/ PKG_SITES:= http://www.harding.motd.ca/autossh/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz diff --git a/package/avahi/Makefile b/package/avahi/Makefile index ba55ad05a..ebd811ca9 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -10,19 +10,21 @@ PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp PKG_DEPENDS:= libavahi libdaemon libexpat gettext -PKG_BUILDDEP+= libdaemon expat gdbm glib gettext -PKG_URL:= http://avahi.org +PKG_BUILDDEP:= libdaemon expat gdbm glib gettext +PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ -PKG_DEPENDS_DNSCONFD:= libavahi libdaemon avahi-daemon -PKG_DESCR_DNSCONFD:= DNS server from mDNS configuration daemon -PKG_DESCR_LIB:= DNS-SD over mDNS library +PKG_SUBPKGS:= AVAHI_DAEMON AVAHI_DNSCONFD LIBAVAHI +PKGSS_AVAHI_DNSCONFD:= libavahi libdaemon avahi-daemon +PKGSD_AVAHI_DNSCONFD:= DNS server from mDNS configuration daemon +PKGSD_LIBAVAHI:= DNS-SD over mDNS library +PKGSC_LIBAVAHI:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DNSCONFD},${PKG_DESCR_DNSCONFD},${PKG_SECTION})) -$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs)) +$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI})) TLDFLAGS+= -lintl CONFIGURE_ARGS+= --enable-glib \ diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 0b2e60d97..c3c659666 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -10,11 +10,12 @@ PKG_MD5SUM:= 03471b5a5874e2ce86025f24b3fa0958 PKG_DESCR:= small embedded webserver PKG_SECTION:= net/security PKG_DEPENDS:= libaxtls -PKG_URL:= http://axtls.sourceforge.net +PKG_URL:= http://axtls.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} -PKG_DESCR_LIB:= small tls library -PKG_SECTION_LIB:= libs +PKG_SUBPKGS:= AXHTTPD LIBAXTLS +PKGSD_LIBAXTLS:= small tls library +PKGSC_LIBAXTLS:= libs DISTFILES:= axTLS-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/axTLS @@ -22,7 +23,7 @@ WRKDIST= ${WRKDIR}/axTLS include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB})) +$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAXTLS},${PKGSC_LIBAXTLS})) CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/bc/Makefile b/package/bc/Makefile index 8912693c0..3ee37411b 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117 PKG_DESCR:= An arbitrary precision calculator language PKG_SECTION:= utils -PKG_URL:= http://www.gnu.org/software/bc +PKG_URL:= http://www.gnu.org/software/bc/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ +PKG_SUBPKGS:= BC DC + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index 52b61b367..05488be69 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 882d49cc3bb591dbdccdf9e680bd2e4b PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bind/Makefile b/package/bind/Makefile index 2ad76e560..9adff33fd 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -10,17 +10,19 @@ PKG_MD5SUM:= c245b5d1aa0a4f53d9538faa1efe2c3f PKG_DESCR:= popular DNS server PKG_SECTION:= dns PKG_DEPENDS:= libopenssl libbind libxml2 -PKG_BUILDDEP+= openssl libxml2 -PKG_URL:= https://www.isc.org/software/bind +PKG_BUILDDEP:= openssl libxml2 +PKG_URL:= https://www.isc.org/software/bind/ PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ -PKG_DESCR_1:= dynamic dns client (nsupdate utility) -PKG_DESCR_2:= library for the bind software suite -PKG_DESCR_3:= rndc & rndc-confgen utilities -PKG_DESCR_4:= check utilities -PKG_DESCR_5:= dnssec utilities -PKG_DESCR_6:= host utility -PKG_DESCR_7:= dig utility +PKG_SUBPKGS:= BIND_SERVER BIND_CLIENT LIBBIND BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG +PKGSD_LIBBIND:= library for the bind software suite +PKGSC_LIBBIND:= libs +PKGSD_BIND_CLIENT:= dynamic dns client (nsupdate utility) +PKGSD_BIND_RNDC:= rndc & rndc-confgen utilities +PKGSD_BIND_CHECK:= check utilities +PKGSD_BIND_DNSSEC:= dnssec utilities +PKGSD_BIND_HOST:= host utility +PKGSD_BIND_DIG:= dig utility PKG_FLAVOURS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support @@ -28,13 +30,13 @@ PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) -$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},libs)) -$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND})) +$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_RNDC},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CHECK},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DNSSEC},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_HOST},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DIG},${PKG_SECTION})) CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \ --disable-threads \ diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 6959e8e96..b076323d5 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -8,17 +8,16 @@ PKG_DESCR:= binary utilities (nm, objdump, as, ..) PKG_SECTION:= lang PKG_DEPENDS:= libbfd -# subpackage -PKG_NAME_LIBBFD:= libbfd -PKG_DESCR_LIBBFD:= bfd library -PKG_SECTION_LIBBFD:= libs +PKG_SUBPKGS:= BINUTILS LIBBFD +PKGSD_LIBBFD:= Binary File Descriptor library +PKGSC_LIBBFD:= libs PKG_HOST_DEPENDS:= !cygwin include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBBFD,${PKG_NAME_LIBBFD},${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBBFD},${PKG_SECTION_LIBBFD})) +$(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD})) TCFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-werror \ diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 223fdd654..41319a738 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 26b9bfc5446bdf0e932e8074d117be67 PKG_DESCR:= IRC gateway to IM chat networks PKG_SECTION:= chat PKG_DEPENDS:= glib libiconv libopenssl -PKG_BUILDDEP+= glib libiconv openssl -PKG_URL:= http://www.bitlbee.org +PKG_BUILDDEP:= glib libiconv openssl +PKG_URL:= http://www.bitlbee.org/ PKG_SITES:= http://get.bitlbee.org/src/ include ${TOPDIR}/mk/package.mk diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index 50961a2d7..56ce5d5ed 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd PKG_DESCR:= Bluez firmware for BCM2033 PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt bluez -PKG_URL:= http://www.bluez.org +PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://bluez.sourceforge.net/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 34c8e7b7c..eb72b47f7 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 1c7cee215bc84656b1edee019cee78f5 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt libusb glib dbus -PKG_BUILDDEP+= libusb dbus glib -PKG_URL:= http://www.bluez.org +PKG_BUILDDEP:= libusb dbus glib +PKG_URL:= http://www.bluez.org/ PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} include ${TOPDIR}/mk/package.mk diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index c923305b2..103f95c68 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= a12a16d88d6d565dacf2a5e6259a3337 PKG_DESCR:= mail filter PKG_SECTION:= mail PKG_DEPENDS:= libiconv libdb -PKG_BUILDDEP+= libiconv libdb +PKG_BUILDDEP:= libiconv libdb PKG_URL:= http://bogofilter.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} diff --git a/package/busybox/Makefile b/package/busybox/Makefile index cdd0d8538..35007df31 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -14,13 +14,14 @@ PKG_SITES:= http://www.busybox.net/downloads/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_DESCR_UDHCPD:= uDHCPD meta package -PKG_SECTION_UDHCPD:= net +PKG_SUBPKGS:= BUSYBOX UDHCPD +PKGSD_UDHCPD:= uDHCPD meta package +PKGSC_UDHCPD:= net include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKG_DESCR_UDHCPD},${PKG_SECTION_UDHCPD})) +$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/bwm/Makefile b/package/bwm/Makefile index c26ae51ec..119f23c11 100644 --- a/package/bwm/Makefile +++ b/package/bwm/Makefile @@ -18,9 +18,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual do-build: ${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index fc15ee0ab..b94a29059 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 3c15a0c8d1d3ee1c46a1634d00617b1a PKG_DESCR:= bzip2 compression utility PKG_SECTION:= archive -PKG_URL:= http://www.bzip.org +PKG_URL:= http://www.bzip.org/ PKG_SITES:= http://www.bzip.org/1.0.5/ include ${TOPDIR}/mk/package.mk diff --git a/package/bzr/Makefile b/package/bzr/Makefile index d67497c22..7b6836cae 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 0b253f59601ebc9ee5975c612fc65f43 PKG_DESCR:= bazaar PKG_SECTION:= scm PKG_DEPENDS:= python2 -PKG_BUILDDEP+= python2 +PKG_BUILDDEP:= python2 PKG_URL:= http://bazaar.canonical.com/en/ PKG_SITES:= http://launchpad.net/bzr/2.0/${PKG_VERSION}/+download/ diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 4b6f40c7b..5c2a6f96c 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b60a82f405f9400bbfdcf850b1728d25 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman -PKG_BUILDDEP+= libpng pixman freetype fontconfig libX11 +PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ diff --git a/package/ccid/Makefile b/package/ccid/Makefile index bd3223d77..87f48c483 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be PKG_DESCR:= a generic USB CCID and ICCD driver PKG_SECTION:= crypto -PKG_BUILDDEP+= pcsc-lite +PKG_BUILDDEP:= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/ diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index a67ad4329..77ec839e3 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -8,20 +8,25 @@ PKG_VERSION:= 1.0.7 PKG_RELEASE:= 3 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base +PKG_URL:= http://www.openadk.org/ PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 foxg20 routerboard +PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@ +PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ +PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ +PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ +PKG_CFLINE_CFGFS+= select BUSYBOX_DIFF@ +PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS +PKG_DFLT_CFGFS:= y + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 -CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tselect BUSYBOX_DIFF\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_CFGFS= y - CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile index 316b5e143..7fd1dc97a 100644 --- a/package/cgilib/Makefile +++ b/package/cgilib/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2c7053f58dfb06f7a80a112797ed7e86 PKG_DESCR:= Simple CGI Library PKG_SECTION:= libs -PKG_URL:= http://www.infodrom.org/projects/cgilib +PKG_URL:= http://www.infodrom.org/projects/cgilib/ PKG_SITES:= http://www.infodrom.org/projects/cgilib/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index d7bbad374..2b5e15872 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b PKG_DESCR:= Wireless LAN Access Point Controller PKG_SECTION:= wifi PKG_DEPENDS:= kmod-tun -PKG_URL:= http://www.chillispot.info +PKG_URL:= http://www.chillispot.info/ PKG_SITES= http://www.chillispot.info/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 07f54226e..52e6e6ab5 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c473cf8e9f22f5a9f7ef4c5be1b0c436 PKG_DESCR:= System statistics collection daemon PKG_SECTION:= misc PKG_DEPENDS:= libpthread -PKG_URL:= http://collectd.org +PKG_URL:= http://collectd.org/ PKG_SITES:= http://collectd.org/files/ PKG_FLAVOURS:= CPU LOAD MEMORY PING diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index 6f7572f55..3b5abb435 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 0.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 6994a209774fe7877fd8e0c9fafe2466 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index 3e22262f7..1e8971ecd 100644 --- a/package/conntrack-tools/Makefile +++ b/package/conntrack-tools/Makefile @@ -10,9 +10,10 @@ PKG_MD5SUM:= 35b0ab9cde069b4ec8a493daae82d67b PKG_DESCR:= Connection tracking userspace tools PKG_SECTION:= firewall PKG_DEPENDS:= libnetfilter-conntrack -PKG_BUILDDEP+= libnetfilter_conntrack -PKG_URL:= http://conntrack-tools.netfilter.org +PKG_BUILDDEP:= libnetfilter_conntrack +PKG_URL:= http://conntrack-tools.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/conntrack-tools/files/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index bd7a621af..39ab9fddf 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -12,13 +12,14 @@ PKG_SECTION:= base PKG_URL:= http://www.gnu.org/software/coreutils/ PKG_SITES:= http://ftp.gnu.org/gnu/coreutils/ -PKG_DESCR_TSORT:= topological sort utility -PKG_SECTION_TSORT:= misc +PKG_SUBPKGS:= TSORT +PKGSD_TSORT:= topological sort utility +PKGSC_TSORT:= misc include $(TOPDIR)/mk/package.mk #$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TSORT},${PKG_SECTION_TSORT})) +$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT})) post-install: $(INSTALL_DIR) $(IDIR_TSORT)/usr/bin diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile index 1962dd729..19ceff96a 100644 --- a/package/cpufrequtils/Makefile +++ b/package/cpufrequtils/Makefile @@ -11,7 +11,8 @@ PKG_DESCR:= utilities for the Linux kernel cpufreq subsystem PKG_SECTION:= utils PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/ -PKG_TARGET_DEPENDS:= !foxboard !foxg20 !ag241 + +PKG_TARGET_DEPENDS:= !ag241 !foxboard !foxg20 include $(TOPDIR)/mk/package.mk diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index b82e67e51..e3204b615 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -6,15 +6,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptinit PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= cryptsetup lvm PKG_DESCR:= init for encrypted rootfilesystem PKG_SECTION:= base +PKG_BUILDDEP:= cryptsetup lvm + +PKG_CFLINE_CRYPTINIT:= depends on ADK_TARGET_ROOTFS_ENCRYPTED WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 -CFLINE_CRYPTINIT:= depends on ADK_TARGET_ROOTFS_ENCRYPTED - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 3daa946da..893f431b9 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 318a64470861ea5b92a52f2014f1e7c1 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto -PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt \ - kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc \ - kmod-crypto-sha256 kmod-blk-dev-dm -PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm +PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt +PKG_DEPENDS+= kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc +PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm +PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index c21c89d66..ea39d0d64 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= openssl PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= p2p +PKG_BUILDDEP:= openssl PKG_URL:= http://www.rahul.net/dholmes/ctorrent PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/} diff --git a/package/cups/Makefile b/package/cups/Makefile index 24fcfa408..635638767 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -6,13 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= zlib PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net/misc PKG_DEPENDS:= zlib libpthread -PKG_BUILDDEP+= zlib -PKG_URL:= http://www.cups.org +PKG_BUILDDEP:= zlib +PKG_URL:= http://www.cups.org/ PKG_SITES:= ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 diff --git a/package/curl/Makefile b/package/curl/Makefile index 41c271e22..781adb27e 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -10,15 +10,16 @@ PKG_MD5SUM:= 6dfb911a254a1b5ca8b534b98f2196aa PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= www PKG_DEPENDS:= libcurl -PKG_BUILDDEP+= openssl zlib +PKG_BUILDDEP:= openssl zlib PKG_URL:= http://curl.haxx.se/ PKG_SITES:= http://curl.haxx.se/download/ -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 +PKG_SUBPKGS:= CURL LIBCURL LIBCURL_DEV +PKGSD_LIBCURL:= a client-side URL transfer library +PKGSC_LIBCURL:= libs +PKGSS_LIBCURL:= libopenssl zlib +PKGSD_LIBCURL_DEV:= development files for libcurl +PKGSC_LIBCURL_DEV:= devel PKG_FLAVOURS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support @@ -26,8 +27,8 @@ PKGFD_WITH_IPV6:= enable IPv6 support 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_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})) +$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) +$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/cvs/Makefile b/package/cvs/Makefile index c35193271..13e750f6d 100644 --- a/package/cvs/Makefile +++ b/package/cvs/Makefile @@ -16,14 +16,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CVS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -#CONFIG_STYLE:= manual -# use following to add ./configure options -#CONFIGURE_ARGS+= --disable-foo -# overwrite any configure variables -#CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes -#BUILD_STYLE:= manual -#INSTALL_STYLE:= manual - post-install: $(INSTALL_DIR) $(IDIR_CVS)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/cvs \ diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index a21312e41..b01fc0618 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= libs PKG_DEPENDS:= libiconv -PKG_BUILDDEP+= libiconv -PKG_URL:= http://www.tntnet.org +PKG_BUILDDEP:= libiconv +PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index d9724f2fc..b5640cb66 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -10,12 +10,13 @@ PKG_MD5SUM:= 45dde9d19193ae9dd388eb68b2027bc9 PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -PKG_URL:= http://asg.web.cmu.edu/sasl +PKG_BUILDDEP:= openssl +PKG_URL:= http://asg.web.cmu.edu/sasl/ PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ - PKG_NOPARALLEL:= 1 +PKG_SUBPKGS:= LIBSASL2 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index 129f2837d..e3883040e 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 423516fd64e43e8671120056b0d9f597 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 4d69720f9..215ff8c08 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -9,11 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a PKG_DESCR:= web content filter proxy PKG_SECTION:= proxy -PKG_CXX:= DANSGUARDIAN PKG_DEPENDS:= libpcre zlib -PKG_BUILDDEP+= pcre zlib -PKG_URL:= http://dansguardian.org +PKG_BUILDDEP:= pcre zlib +PKG_URL:= http://dansguardian.org/ PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ +PKG_CXX:= DANSGUARDIAN include ${TOPDIR}/mk/package.mk diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index b21ad8fca..b3a1dbcda 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -5,24 +5,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= davfs2 PKG_VERSION:= 1.4.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c9e8aeb15daeba4b6283b40bb640e908 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net/fs -PKG_BUILDDEP+= libiconv neon -ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},) -PKG_BUILDDEP+= fuse -endif -PKG_URL:= http://savannah.nongnu.org/projects/davfs2 -PKG_SITES:= http://www.very-clever.com/download/nongnu/davfs2/ - -ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon -else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) -PKG_DEPENDS:= kmod-coda-fs libiconv neon -else -PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon -endif +PKG_BUILDDEP:= libiconv neon fuse +PKG_URL:= http://savannah.nongnu.org/projects/davfs2/ +PKG_SITES:= http://www.very-clever.com/download/nongnu/davfs2/ include ${TOPDIR}/mk/package.mk diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile index 33461c7c4..0db8b64bc 100644 --- a/package/dbus-glib/Makefile +++ b/package/dbus-glib/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= cd0ab148fb0c786fc88be49d19971f50 PKG_DESCR:= DBUS glib bindings PKG_SECTION:= libs PKG_DEPENDS:= dbus -PKG_BUILDDEP+= dbus +PKG_BUILDDEP:= dbus PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-glib/ diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 0dc44e852..931ac4373 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 565346cecd9cfecf1463540c6086cc2c PKG_DESCR:= DBUS library PKG_SECTION:= libs PKG_DEPENDS:= libexpat -PKG_BUILDDEP+= expat -PKG_URL:= http://dbus.freedesktop.org +PKG_BUILDDEP:= expat +PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ ifeq ($(ADK_STATIC),y) diff --git a/package/deco/Makefile b/package/deco/Makefile index 9cabc38ae..a8c3086dd 100644 --- a/package/deco/Makefile +++ b/package/deco/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= f77f60e8be0cae1f814cba1ef61bf4d0 PKG_DESCR:= Text-based, full featured file manager PKG_SECTION:= misc PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses +PKG_BUILDDEP:= ncurses PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=deco/} DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tgz diff --git a/package/depmaker b/package/depmaker deleted file mode 100644 index da3923554..000000000 --- a/package/depmaker +++ /dev/null @@ -1,38 +0,0 @@ -unset MAKEFLAGS -export MAKEFLAGS=s -cd "$(dirname "$0")" -export TOPDIR=$(realpath ..) -if gmake --help >/dev/null 2>&1; then - export GMAKE=gmake -else - export GMAKE=make -fi -GMAKE="$GMAKE --no-print-directory" -(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) -typeset -L$x_cols pbar - -for dn in */Makefile; do - dn=${dn%/*} - pbar="$dn ..." - print -nu2 "$pbar\r" - case $dn { - (@(?(e)g|uc|)libc|libpthread|uclibc++) ;; - (*) - # dnu: directory name, uppercase, y/-+/_X/ - typeset -u dnu=${dn//-/_} - dnu=${dnu//+/X} - print "package-\$(ADK_COMPILE_${dnu}) += $dn" - ;; - } - cd $dn - deps=$($GMAKE show=PKG_BUILDDEP) - cd .. - [[ -n $deps ]] || continue - x="${dn}-compile:" - for dep in $deps; do - x="$x ${dep}-compile" - done - print -r -- $x -done >Depends.mk -pbar=done -print -u2 "$pbar" diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index c95d620f6..ff483b392 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -9,9 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= fb3670dee9f71af1e55ac5dcd64e213e PKG_DESCR:= DHCP relay agent PKG_SECTION:= dhcp -PKG_URL:= http://www.nongnu.org/dhcp-fwd -PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ \ - http://ftp.cc.uoc.gr/mirrors/nongnu.org/dhcp-fwd/ +PKG_URL:= http://www.nongnu.org/dhcp-fwd/ +PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index d3769845e..ea3af6439 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -9,17 +9,17 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 38a74c89d8913b9b5f33737047623c18 PKG_DESCR:= ISC DHCP server PKG_SECTION:= dhcp -PKG_URL:= https://www.isc.org/software/dhcp +PKG_URL:= https://www.isc.org/software/dhcp/ PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/ -PKG_DESCR_RELAY:= ISC DHCP relay server +PKG_SUBPKGS:= DHCP_SERVER DHCP_RELAY +PKGSD_DHCP_RELAY:= ISC DHCP relay server include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_RELAY},${PKG_SECTION})) +$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DHCP_RELAY},${PKG_SECTION})) -#TCFLAGS+= -D_GNU_SOURCE CONFIGURE_ENV+= ac_cv_file__dev_random=yes post-install: diff --git a/package/dialog/Makefile b/package/dialog/Makefile index cefcfaa32..774af32ad 100644 --- a/package/dialog/Makefile +++ b/package/dialog/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 3caebd641a9f337b980becb4444336c5 PKG_DESCR:= A text gui interface PKG_SECTION:= misc PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses +PKG_BUILDDEP:= ncurses PKG_SITES:= ftp://ftp.us.debian.org/debian/pool/main/d/dialog/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index fc7a2bcc3..390ac22a0 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84 PKG_DESCR:= program for reading values from 1-wire devices PKG_SECTION:= misc PKG_DEPENDS:= libusb -PKG_BUILDDEP+= libusb libusb-compat -PKG_URL:= http://www.digitemp.com/software/linux +PKG_BUILDDEP:= libusb libusb-compat +PKG_URL:= http://www.digitemp.com/software/linux/ PKG_SITES:= http://www.digitemp.com/software/linux/ include ${TOPDIR}/mk/package.mk diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 5f39f9c79..853f3e4ce 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -11,14 +11,14 @@ PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps PKG_DEPENDS:= libfltk libxi libiconv libpng zlib libjpeg PKG_DEPENDS+= libstdcxx -PKG_BUILDDEP+= fltk libXi libiconv jpeg libpng zlib +PKG_BUILDDEP:= fltk libXi libiconv jpeg libpng zlib PKG_URL:= http://www.dillo.org/ PKG_SITES:= http://www.dillo.org/download/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin +PKG_TARGET_DEPENDS:= ibmx40 lemote + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 57cc71bab..3586fe165 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns -PKG_URL:= http://thekelleys.org.uk/dnsmasq +PKG_URL:= http://thekelleys.org.uk/dnsmasq/ PKG_SITES:= http://thekelleys.org.uk/dnsmasq/ include ${TOPDIR}/mk/package.mk diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index 269f26cc4..89a3cb861 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= bd273cf8aa6341c0b52cbac72050bcf4 PKG_DESCR:= Utilities to create and check MS-DOS FAT filesystems PKG_SECTION:= fs -PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools +PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/ PKG_SITES:= http://www.daniel-baumann.ch/software/dosfstools/ include ${TOPDIR}/mk/package.mk diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile index 9bab810f5..124b1c393 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= b7d0081b17ff6afae85e8dc14157fa57 PKG_DESCR:= A minimal and secure imap server PKG_SECTION:= mail -PKG_URL:= http://www.dovecot.org +PKG_URL:= http://www.dovecot.org/ PKG_SITES:= http://www.dovecot.org/releases/1.2/ include ${TOPDIR}/mk/package.mk diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile index 8d1241c55..a4d11920f 100644 --- a/package/dri2proto/Makefile +++ b/package/dri2proto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 2087269416782cff56f9b22d1449c192 PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 8d720680a..c80be266a 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -9,21 +9,20 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e PKG_DESCR:= SSH 2 server/client designed for embedded systems PKG_SECTION:= net/security -PKG_URL:= http://matt.ucc.asn.au/dropbear +PKG_URL:= http://matt.ucc.asn.au/dropbear/ PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ -PKG_DESCR_UTIL:= Utility for converting SSH private keys +PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY +PKG_SUBPKGS:= DROPBEAR DBCONVERT +PKGSD_DBCONVERT:= Utility for converting SSH private keys include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UTIL},${PKG_SECTION})) - -PKGDFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY +$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION})) BUILD_STYLE:= manual INSTALL_STYLE:= manual - CONFIGURE_ARGS+= --disable-pam \ --enable-openpty \ --enable-syslog \ diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index edc333b66..b943675e7 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 2f761fa3475682a7512b0b43568ee7d6 PKG_DESCR:= tools for network auditing and penetration testing PKG_SECTION:= net PKG_DEPENDS:= libnet libpcap libnids libopenssl libgdbm -PKG_BUILDDEP+= libnids openssl gdbm libpcap libnet -PKG_URL:= http://www.monkey.org/~dugsong/dsniff +PKG_BUILDDEP:= libnids openssl gdbm libpcap libnet +PKG_URL:= http://www.monkey.org/~dugsong/dsniff/ PKG_SITES:= http://www.monkey.org/~dugsong/dsniff/beta/ WRKDIST= ${WRKDIR}/${PKG_NAME}-2.4 diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 34c2cdab8..471f0fa04 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -13,25 +13,25 @@ PKG_DEPENDS:= libcom-err libuuid libblkid libpthread PKG_URL:= http://e2fsprogs.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} -PKG_DESCR_UUID:= UUID library -PKG_SECTION_UUID:= libs -PKG_DESCR_COM_ERR:= Common error library -PKG_SECTION_COM_ERR:= libs -PKG_DESCR_BLKID:= Libblkid -PKG_SECTION_BLKID:= libs -PKG_DESCR_SS:= Subsystem command parsing library -PKG_SECTION_SS:= libs +PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID +PKGSD_LIBUUID:= UUID library +PKGSC_LIBUUID:= libs +PKGSD_LIBCOM_ERR:= Common error library +PKGSC_LIBCOM_ERR:= libs +PKGSD_LIBSS:= Subsystem command parsing library +PKGSC_LIBSS:= libs +PKGSD_LIBBLKID:= Libblkid +PKGSC_LIBBLKID:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_UUID},${PKG_SECTION_UUID})) -$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR})) -$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_SS},${PKG_SECTION_SS})) -$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID},${PKGSC_LIBUUID})) +$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR})) +$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS})) +$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) -CONFIGURE_ARGS+= --enable-elf-shlibs \ - --disable-tls +CONFIGURE_ARGS+= --enable-elf-shlibs --disable-tls INSTALL_TARGET+= install-libs pre-build: diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index e70d9a790..911aa45f8 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -6,9 +6,12 @@ include $(TOPDIR)/toolchain/eglibc/Makefile.inc PKG_DESCR:= embedded GNU C library PKG_SECTION:= base -NO_DISTFILES:= 1 PKG_OPTS:= noremove +PKG_SUBPKGS:= EGLIBC EGLIBC_DEV + +NO_DISTFILES:= 1 + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/elinks/Makefile b/package/elinks/Makefile index 4a11809df..6101f0abc 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab PKG_DESCR:= advanced text web browser PKG_SECTION:= browser PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl +PKG_BUILDDEP:= openssl PKG_URL:= http://elinks.or.cz/ PKG_SITES:= http://elinks.or.cz/download/ diff --git a/package/esound/Makefile b/package/esound/Makefile index c0d31c270..8923d7b7d 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688 PKG_DESCR:= Enlightened Sound Daemon PKG_SECTION:= multimedia PKG_DEPENDS:= libaudiofile -PKG_BUILDDEP+= libaudiofile +PKG_BUILDDEP:= libaudiofile PKG_URL:= http://www.tux.org/~ricdude/EsounD.html PKG_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/ diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index 76b3b16c9..dd9aafb7d 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -13,7 +13,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ETHTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: ${INSTALL_DIR} ${IDIR_ETHTOOL}/usr/sbin diff --git a/package/evieext/Makefile b/package/evieext/Makefile index b1765b721..238d50aff 100644 --- a/package/evieext/Makefile +++ b/package/evieext/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 68e61ce53caa495a3ad4085f66010eb8 PKG_SITES:= ftp://ftp.x.org/pub/individual/proto/ +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile index f98696aef..d88504298 100644 --- a/package/evilwm/Makefile +++ b/package/evilwm/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 8fd9256c635cce2289b648a01d54202c PKG_DESCR:= A minimalist window manager for the X Window System PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 libxext -PKG_BUILDDEP+= libX11 libXext +PKG_BUILDDEP:= libX11 libXext PKG_URL:= http://www.6809.org.uk/evilwm/ PKG_SITES:= http://www.6809.org.uk/evilwm/ diff --git a/package/exmap/Makefile b/package/exmap/Makefile index acb6feb88..536249af9 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -10,23 +10,24 @@ PKG_MD5SUM:= 55aec784e214037e61400287a55b5426 PKG_DESCR:= memory analysing client tool PKG_SECTION:= debug PKG_DEPENDS:= exmap-kmod libreadline glib -PKG_BUILDDEP+= glib readline +PKG_BUILDDEP:= glib readline PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/ +PKG_SUBPKGS:= EXMAP EXMAPD EXMAPSERVER EXMAP_KMOD +PKGSD_EXMAPD:= memory analysing daemon +PKGSD_EXMAPSERVER:= memory analysing server +PKGSD_EXMAP_KMOD:= memory analysing kernel module +PKGSC_EXMAP_KMOD:= kernel + DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION} -PKG_DESCR_EXMAPD:= memory analysing daemon -PKG_DESCR_EXMAPSERVER:= memory analysing server -PKG_DESCR_EXMAP_KMOD:= memory analysing kernel module -PKG_SECTION_EXMAP_KMOD:=kernel - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPD},${PKG_SECTION})) -$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION})) -$(eval $(call PKG_template,EXMAP_KMOD,exmap-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_EXMAP_KMOD},${PKG_SECTION_EXMAP_KMOD})) +$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPD},${PKG_SECTION})) +$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPSERVER},${PKG_SECTION})) +$(eval $(call PKG_template,EXMAP_KMOD,exmap-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_EXMAP_KMOD},${PKGSC_EXMAP_KMOD})) CONFIGURE_ARGS+= --disable-doc CONFIGURE_ENV+= LIBS="-lncurses" diff --git a/package/expat/Makefile b/package/expat/Makefile index 6d267e53e..49aae5e2d 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= libs PKG_URL:= http://expat.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} +PKG_SUBPKGS:= LIBEXPAT + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile index 3bf09fc18..bb2fd7bfe 100644 --- a/package/ez-ipupdate/Makefile +++ b/package/ez-ipupdate/Makefile @@ -9,9 +9,10 @@ PKG_RELEASE:= 10 PKG_MD5SUM:= 000211add4c4845ffa4211841bff4fb0 PKG_DESCR:= a client for dynamic DNS services PKG_SECTION:= dns -PKG_URL:= http://ez-ipupdate.com -PKG_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \ - http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate/ +PKG_URL:= http://ez-ipupdate.com/ +PKG_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ + +PKG_SUBPKGS:= EZIPUPDATE DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz diff --git a/package/faad2/Makefile b/package/faad2/Makefile index ab794dab2..53ef6196a 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= libs PKG_URL:= http://sourceforge.net/projects/faac/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} +PKG_SUBPKGS:= LIBFAAD2 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 3d06db9cb..8dd02942e 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -9,9 +9,6 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 72c20ad2b9629f1a109668b05a84d823 PKG_DESCR:= fetch mail from a POP or IMAP server PKG_SECTION:= mail -ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y) -PKG_BUILDDEP+= openssl -endif PKG_URL:= http://fetchmail.berlios.de/ PKG_SITES:= http://download.berlios.de/fetchmail/ @@ -20,6 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 PKG_FLAVOURS:= SSL PKGFD_SSL:= enable SSL support PKGFS_SSL:= libopenssl +PKGFB_SSL:= openssl include ${TOPDIR}/mk/package.mk diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 142c6fa07..5d4306cbc 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -10,20 +10,22 @@ PKG_MD5SUM:= d6142a9a5821d6a6262a6edb903faa24 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_DEPENDS:= libfaad2 -PKG_BUILDDEP+= faad2 sdl +PKG_BUILDDEP:= faad2 PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SUBPKGS:= FFMPEG FFPLAY +PKGSD_FFPLAY:= ffmpeg based video player +PKGSC_FFPLAY:= multimedia +PKGSS_FFPLAY:= libsdl libpthread ffmpeg +PKGSB_FFPLAY:= sdl -PKG_SECTION_FFPLAY:= multimedia -PKG_DESCR_FFPLAY:= ffmpeg based video player -PKG_DEPENDS_FFPLAY:= libsdl libpthread ffmpeg +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_FFPLAY},${PKG_DESCR_FFPLAY},${PKG_SECTION_FFPLAY})) +$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 54e62d6b1..e807fda8f 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -12,17 +12,17 @@ PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx PKG_DEPENDS+= libxdamage libxfixes libidl -PKG_BUILDDEP+= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 +PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 PKG_BUILDDEP+= nspr nss jpeg libXt PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 - -WRKDIST= ${WRKDIR}/mozilla-1.9.2 PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 +WRKDIST= ${WRKDIR}/mozilla-1.9.2 + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile index 07cf45150..aeca1101e 100644 --- a/package/fixesproto/Makefile +++ b/package/fixesproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 4.1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 95806b9b648639d4c3e5b226d10927c0 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/flac/Makefile b/package/flac/Makefile index fa7ccb9f8..274a74714 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= libs PKG_URL:= http://flac.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=flac/} +PKG_SUBPKGS:= LIBFLAC + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/fltk/Makefile b/package/fltk/Makefile index c08d8d21a..6757c1bf8 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -9,16 +9,17 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 557544badbacca4ee1ebb2448f6e1f8a PKG_DESCR:= fast light toolkit PKG_SECTION:= libs -PKG_BUILDDEP+= libX11 libXi MesaLib freeglut +PKG_BUILDDEP:= libX11 libXi MesaLib freeglut PKG_URL:= http://www.fltk.org/ PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/ +PKG_SUBPKGS:= LIBFLTK +PKG_TARGET_DEPENDS:= ibmx40 lemote +PKG_HOST_DEPENDS:= !cygwin + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2 WRKDIST= ${WRKDIR}/${PKG_NAME}-2.0.x-r7513 -PKG_TARGET_DEPENDS:= ibmx40 lemote -PKG_HOST_DEPENDS:= !cygwin - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile index 7ad664321..885972f1a 100644 --- a/package/fluxbox/Makefile +++ b/package/fluxbox/Makefile @@ -11,15 +11,13 @@ PKG_DESCR:= Fluxbox is an X11 window manager featuring tabs and an iconbar PKG_SECTION:= x11/apps PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= libXpm -ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y) -PKG_BUILDDEP+= imlib2 -endif -PKG_URL:= http://www.fluxbox.org +PKG_URL:= http://www.fluxbox.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} PKG_FLAVOURS:= WITH_IMLIB2 PKGFD_WITH_IMLIB2:= enable imlib2 support PKGFS_WITH_IMLIB2:= imlib2 +PKGFB_WITH_IMLIB2:= imlib2 include $(TOPDIR)/mk/package.mk diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index 47ce19f35..35e10ec85 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 93bd04e2fb348a0c48e13ab3933f2381 PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts PKG_DEPENDS:= font-util -PKG_BUILDDEP+= font-util +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile index 3e12e5fd2..6f0da9876 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= d22283daba10129643800d73f5496aab PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts PKG_DEPENDS:= font-util -PKG_BUILDDEP+= font-util +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile index 3baa548a4..4e1015900 100644 --- a/package/font-misc-misc/Makefile +++ b/package/font-misc-misc/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 047eae4d061f17d96213c4e78f7abccb PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts -PKG_BUILDDEP+= font-util +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile index ce103cade..dec821d49 100644 --- a/package/fontcacheproto/Makefile +++ b/package/fontcacheproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 0.1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= dc8c34a8c3559bf3b008bcdf7ba5a743 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 0a1bee2dd..119c09e9a 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 77e15a92006ddc2adbb06f840d591c0e PKG_DESCR:= fontconfig PKG_SECTION:= libs PKG_DEPENDS:= libxml2 -PKG_BUILDDEP+= freetype libxml2 -PKG_URL:= http://fontconfig.org +PKG_BUILDDEP:= freetype libxml2 +PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ ifeq ($(ADK_STATIC),y) diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile index 718d10a53..dd62362e2 100644 --- a/package/fontsproto/Makefile +++ b/package/fontsproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 6819fc82585daac68cec17938b659bf0 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fping/Makefile b/package/fping/Makefile index 002639da2..3f0fec5e3 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d5e8be59e307cef76bc479e1684df705 PKG_DESCR:= A program to ping hosts in parallel PKG_SECTION:= net -PKG_URL:= http://fping.sourceforge.net +PKG_URL:= http://fping.sourceforge.net/ PKG_SITES:= http://fping.sourceforge.net/download/ DISTFILES:= ${PKG_NAME}.tar.gz diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 510dd466f..67353121a 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 65850d0470078269b33eee58cba77ac2 PKG_DESCR:= NetFlow probe PKG_SECTION:= net PKG_DEPENDS:= libpcap libpthread -PKG_BUILDDEP+= libpcap +PKG_BUILDDEP:= libpcap PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index a3585b620..5f94775b5 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -9,12 +9,12 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 39f0f2de89f399529d2b981188082218 PKG_DESCR:= OpenGL Utility Toolkit PKG_SECTION:= libs -PKG_BUILDDEP+= MesaLib +PKG_BUILDDEP:= MesaLib PKG_URL:= http://freeglut.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/} -PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin +PKG_TARGET_DEPENDS:= ibmx40 lemote include $(TOPDIR)/mk/package.mk diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile index d40360831..eecc9f3ee 100644 --- a/package/freeradius-client/Makefile +++ b/package/freeradius-client/Makefile @@ -10,12 +10,11 @@ PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7 PKG_DESCR:= RADIUS client PKG_SECTION:= ppp PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -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_BUILDDEP:= openssl +PKG_URL:= http://www.freeradius.org/ +PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ +PKG_SUBPKGS:= FREERADIUS_CLIENT LIBFREERADIUS_CLIENT PKG_SECTION_LIB:= libs include ${TOPDIR}/mk/package.mk diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index 92313ca39..8ccd93613 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -9,40 +9,41 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= aa2ae711387af144df7c351b28b8789c PKG_DESCR:= a flexible RADIUS server PKG_SECTION:= ppp -PKG_MULTI:= 1 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_URL:= http://www.freeradius.org +PKG_BUILDDEP:= libtool openssl +PKG_URL:= http://www.freeradius.org/ PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ +PKG_MULTI:= 1 + +PKG_SUBPKGS:= FREERADIUS_SERVER FREERADIUS_DEMOCERTS FREERADIUS_MOD_CHAP FREERADIUS_MOD_DETAIL +PKG_SUBPKGS+= FREERADIUS_MOD_DIGEST FREERADIUS_MOD_FILES FREERADIUS_MOD_LDAP FREERADIUS_MOD_MSCHAP +PKG_SUBPKGS+= FREERADIUS_MOD_PAP FREERADIUS_MOD_PREPROCESS FREERADIUS_MOD_REALM FREERADIUS_MOD_SQL +PKG_SUBPKGS+= FREERADIUS_MOD_SQL_MYSQL FREERADIUS_MOD_SQL_PGSQL FREERADIUS_UTILS PKG_HOST_DEPENDS:= !cygwin -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 +# sub package build dependencies +PKGSB_FREERADIUS_MOD_LDAP:= openldap +PKGSB_FREERADIUS_MOD_SQL_MYSQL:= mysql +PKGSB_FREERADIUS_MOD_SQL_PGSQL:= postgresql +PKGSS_FREERADIUS_MOD_LDAP:= libopenldap +PKGSS_FREERADIUS_MOD_SQL_MYSQL:= libmysqlclient +PKGSS_FREERADIUS_MOD_SQL_PGSQL:= libpq + +PKGSD_FREERADIUS_DEMOCERTS:= Demo certificates to test the server +PKGSD_FREERADIUS_MOD_CHAP:= CHAP authentication module +PKGSD_FREERADIUS_MOD_DETAIL:= Detailed accounting module +PKGSD_FREERADIUS_MOD_DIGEST:= Digest authentication module +PKGSD_FREERADIUS_MOD_FILES:= Module using local files for authorization +PKGSD_FREERADIUS_MOD_LDAP:= LDAP module +PKGSD_FREERADIUS_MOD_MSCHAP:= MS-CHAP and MS-CHAPv2 module +PKGSD_FREERADIUS_MOD_PAP:= PAP authentication module +PKGSD_FREERADIUS_MOD_PREPROCESS:= Request pre-processing module +PKGSD_FREERADIUS_MOD_REALM:= Realms handling module +PKGSD_FREERADIUS_MOD_SQL:= Base SQL module +PKGSD_FREERADIUS_MOD_SQL_MYSQL:= MySQL module +PKGSD_FREERADIUS_MOD_SQL_PGSQL:= PostgreSQL module +PKGSD_FREERADIUS_UTILS:= Misc. client utilities PKG_CONFIGURE_OPTS:= @@ -91,20 +92,19 @@ ${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_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_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_DEMOCERTS},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_CHAP},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_DETAIL},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_DIGEST},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_FILES},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LDAP},${PKGSD_FREERADIUS_MOD_LDAP},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_MSCHAP},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_PAP},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_PREPROCESS},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_REALM},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_MYSQL},${PKGSD_FREERADIUS_MOD_SQL_MYSQL},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_PGSQL},${PKGSD_FREERADIUS_MOD_SQL_PGSQL},${PKG_SECTION})) +$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_UTILS},${PKG_SECTION})) $(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,)) diff --git a/package/freetype/Makefile b/package/freetype/Makefile index eab453ba6..469859884 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -10,10 +10,12 @@ PKG_MD5SUM:= a693c9a4b0121890ca71e39364ffea4a PKG_DESCR:= A free, high-quality and portable font engine PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP+= zlib -PKG_URL:= http://www.freetype.org +PKG_BUILDDEP:= zlib +PKG_URL:= http://www.freetype.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} +PKG_SUBPKGS:= LIBFREETYPE + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 06d20ec6d..c861a06d0 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -10,9 +10,11 @@ PKG_MD5SUM:= 4879f06570d2225667534c37fea04213 PKG_DESCR:= Filesystem in Userspace (utilities) PKG_SECTION:= fs PKG_DEPENDS:= kmod-fuse-fs -PKG_URL:= http://fuse.sourceforge.net +PKG_URL:= http://fuse.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} +PKG_SUBPKGS:= FUSE_UTILS + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gatling/Makefile b/package/gatling/Makefile index cae136e1b..850ef17be 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= a0fb49ccb6b910bdbd7e76a9960394e3 PKG_DESCR:= small non-forking webserver PKG_SECTION:= www PKG_DEPENDS:= libiconv -PKG_BUILDDEP+= libowfat libiconv +PKG_BUILDDEP:= libowfat libiconv PKG_URL:= http://www.fefe.de/gatling/ PKG_SITES:= http://dl.fefe.de/ diff --git a/package/gcc/Makefile b/package/gcc/Makefile index b12f2a3ec..000b9d98c 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -7,8 +7,8 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc PKG_DESCR:= GNU compiler collection PKG_SECTION:= lang PKG_OPTS:= noremove -PKG_DEPENDS:= libgmp mpfr -PKG_BUILDDEP+= gmp mpfr +PKG_DEPENDS:= libmpc libgmp mpfr +PKG_BUILDDEP:= mpc gmp mpfr ifeq ($(ADK_TARGET_LIB_UCLIBC),y) PKG_DEPENDS+= uclibc-dev diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 07371ea3e..7c1261135 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -7,11 +7,11 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger PKG_SECTION:= debug PKG_DEPENDS:= libthread-db libncurses libiconv libexpat -PKG_BUILDDEP+= ncurses readline libiconv expat -PKG_TARGET_DEPENDS:= !foxboard !ag241 - +PKG_BUILDDEP:= ncurses readline libiconv expat PKG_NOPARALLEL:= 1 +PKG_TARGET_DEPENDS:= !foxboard !ag241 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile index fcef44550..42dfeacfd 100644 --- a/package/gdbm/Makefile +++ b/package/gdbm/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1d1b1d5c0245b1c00aff92da751e9aa1 PKG_DESCR:= disk file format database PKG_SECTION:= libs -PKG_URL:= http://www.gnu.org/software/gdbm +PKG_URL:= http://www.gnu.org/software/gdbm/ PKG_SITES:= ${MASTER_SITE_GNU:=gdbm/} +PKG_SUBPKGS:= LIBGDBM + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index a11971547..56ead34a6 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -7,13 +7,14 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger (small server) PKG_SECTION:= debug PKG_DEPENDS:= libthread-db +PKG_SUBPKGS:= GDBSERVER -PKG_TARGET_DEPENDS:= !foxboard - -include ${TOPDIR}/mk/package.mk +PKG_TARGET_DEPENDS:= !foxboard WRKSRC= ${WRKDIST}/gdb/gdbserver +include ${TOPDIR}/mk/package.mk + $(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 4ef29852e..8637f4193 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -3,14 +3,14 @@ include ${TOPDIR}/rules.mk -PKG_NAME= gettext -PKG_VERSION= 0.16.1 -PKG_RELEASE= 1 -PKG_MD5SUM= 3d9ad24301c6d6b17ec30704a13fe127 +PKG_NAME:= gettext +PKG_VERSION:= 0.16.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 3d9ad24301c6d6b17ec30704a13fe127 PKG_DESCR:= internationalisation library PKG_SECTION:= libs PKG_DEPENDS:= libiconv libpthread -PKG_BUILDDEP+= libiconv libpthread +PKG_BUILDDEP:= libiconv libpthread PKG_URL:= http://www.gnu.org/software/gettext/ PKG_SITES:= ${MASTER_SITE_GNU:=gettext/} diff --git a/package/git/Makefile b/package/git/Makefile index 162cc13ab..068ba07b2 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 13fc44363df744a401552e73e5476351 PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_DEPENDS:= libopenssl libcurl libexpat libpthread -PKG_BUILDDEP+= openssl curl expat -PKG_URL:= http://git-scm.com +PKG_BUILDDEP:= openssl curl expat +PKG_URL:= http://git-scm.com/ PKG_SITES:= http://kernel.org/pub/software/scm/git/ include $(TOPDIR)/mk/package.mk diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile index 5ef0ed431..2f2548ca6 100644 --- a/package/gkrellmd/Makefile +++ b/package/gkrellmd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 600f4daa395112ed19a3633deb0829ff PKG_DESCR:= The GNU Krell Monitors Server PKG_SECTION:= net/misc PKG_DEPENDS:= glib libpthread -PKG_BUILDDEP+= glib +PKG_BUILDDEP:= glib PKG_URL:= http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html PKG_SITES:= http://members.dslextreme.com/users/billw/gkrellm/ diff --git a/package/glib/Makefile b/package/glib/Makefile index 4db94344a..9abe5a292 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e699a93d62c01e0ee07caef3e11eddd8 PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= gettext libiconv libpthread -PKG_BUILDDEP+= gettext libiconv +PKG_BUILDDEP:= gettext libiconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.22/ diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 483c5244d..497fecd7c 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -6,9 +6,12 @@ include $(TOPDIR)/toolchain/glibc/Makefile.inc PKG_DESCR:= GNU C library PKG_SECTION:= base -NO_DISTFILES:= 1 PKG_OPTS:= noremove +PKG_SUBPKGS:= GLIBC GLIBC_DEV + +NO_DISTFILES:= 1 + include $(TOPDIR)/mk/package.mk GLIBC_CONFOPTS:= \ diff --git a/package/glproto/Makefile b/package/glproto/Makefile index b9b5ce58d..d85612a22 100644 --- a/package/glproto/Makefile +++ b/package/glproto/Makefile @@ -8,6 +8,8 @@ PKG_VERSION:= 1.4.11 PKG_RELEASE:= 1 PKG_MD5SUM:= 78e7c4dc7dcb74b1869fee7897e00f59 PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SUBPKGS:= + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 53ae8367f..568bc424c 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 PKG_DESCR:= An UPnP music media server PKG_SECTION:= multimedia PKG_DEPENDS:= id3lib libupnp -PKG_BUILDDEP+= id3lib libupnp +PKG_BUILDDEP:= id3lib libupnp PKG_URL:= http://www.gnu.org/software/gmediaserver PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/ diff --git a/package/gmp/Makefile b/package/gmp/Makefile index b7e6c2e82..721f16573 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -6,7 +6,9 @@ include ${TOPDIR}/toolchain/gmp/Makefile.inc PKG_DESCR:= GNU multiprecision arithmetic library PKG_SECTION:= libs -PKG_URL:= http://gmplib.org +PKG_URL:= http://gmplib.org/ + +PKG_SUBPKGS:= LIBGMP include ${TOPDIR}/mk/package.mk diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile index 3f30ef3c2..ff3739775 100644 --- a/package/gnupg/Makefile +++ b/package/gnupg/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 991faf66d3352ac1452acc393c430b23 PKG_DESCR:= Gnu Privacy Guard PKG_SECTION:= crypto PKG_DEPENDS:= libreadline libiconv -PKG_BUILDDEP+= readline libiconv -PKG_URL:= http://www.gnupg.org +PKG_BUILDDEP:= readline libiconv +PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/ include ${TOPDIR}/mk/package.mk diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index aaabead17..c6967f497 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -10,22 +10,25 @@ PKG_MD5SUM:= eb0a6d7d3cb9ac684d971c14f9f6d3ba PKG_DESCR:= GNU TLS library PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib -PKG_BUILDDEP+= libgcrypt liblzo libtasn1 opencdk zlib ncurses +PKG_BUILDDEP:= libgcrypt liblzo libtasn1 opencdk zlib ncurses PKG_URL:= http://www.gnu.org/software/gnutls/ PKG_SITES:= ${MASTER_SITE_GNU:=gnutls/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL +PKGSD_GNUTLS_UTILS:= GNU TLS utilities +PKGSS_GNUTLS_UTILS:= libgnutls libgnutls-extra +PKGSC_LIBGNUTLS:= libs +PKGSC_LIBGNUTLS_EXTRA:= libs +PKGSC_LIBGNUTLS_OPENSSL:= libs -PKG_DESCR_GNUTLS_UTILS:= GNU TLS utilities -PKG_DEPENDS_GNUTLS_UTILS:= libgnutls libgnutls-extra -PKG_SECTION_LIB:= libs +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB})) -$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_GNUTLS_UTILS},${PKG_DESCR_GNUTLS_UTILS},${PKG_SECTION})) -$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB})) -$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB})) +$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS})) +$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKG_SECTION})) +$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA})) +$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL})) CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 167af550a..275613e3d 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -10,17 +10,18 @@ PKG_MD5SUM:= 12535a9ed9fecf9ea2c5bdc9840da5ae PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= misc PKG_DEPENDS:= libpthread -PKG_BUILDDEP+= ncurses -PKG_CXX:= GPSD +PKG_BUILDDEP:= ncurses PKG_SITES:= http://download.berlios.de/gpsd/ PKG_URL:= http://gpsd.berlios.de/ +PKG_CXX:= GPSD -PKG_DESCR_CLIENTS:= GPS client utilities +PKG_SUBPKGS:= GPSD GPSD_CLIENTS +PKGSD_GPSD_CLIENTS:= GPS client utilities include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENTS},${PKG_SECTION})) +$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GPSD_CLIENTS},${PKG_SECTION})) CONFIGURE_ENV+= EGREP="grep -E" \ CPP="$(TARGET_CC) -E" \ diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index c1d412b32..d39c1bb21 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -12,16 +12,17 @@ PKG_MD5SUM:= 958f9fd415a0bd52fe115176afbf19d9 PKG_DESCR:= GRUB2 bootloader (binary package) PKG_SECTION:= base PKG_SITES:= http://openadk.org/distfiles/ +PKG_URL:= http://www.gnu.org/software/grub PKG_TARGET_DEPENDS:= x86 x86_64 -CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT\n\tdepends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS +PKG_CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT@ +PKG_CFLINE_GRUB_BIN+= depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS +PKG_DFLT_GRUB_BIN:= y include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GRUB_BIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_GRUB_BIN= y - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/grub/Makefile b/package/grub/Makefile index b594a5632..404332590 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/ PKG_HOST_DEPENDS:= linux -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_TARGET_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/gsm/Makefile b/package/gsm/Makefile index ef5beb10b..cac1448ae 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -11,17 +11,19 @@ PKG_DESCR:= A GSM 06.10 full-rate speech transcoding implementation (library) PKG_SECTION:= libs PKG_URL:= http://www-rn.informatik.uni-bremen.de/software/gsm/ PKG_SITES:= http://www-rn.informatik.uni-bremen.de/software/gsm/ - PKG_NOPARALLEL:= 1 -PKG_DESCR_1:= A GSM 06.10 full-rate speech transcoding implementation (utilities) -PKG_DEPENDS_1:= libgsm + +PKG_SUBPKGS:= LIBGSM GSM_UTILS +PKGSD_GSM_UTILS:= A GSM 06.10 full-rate speech transcoding implementation (utilities) +PKGSS_GSM_UTILS:= libgsm +PKGSC_GSM_UTILS:= misc WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GSM_UTILS},${PKGSD_GSM_UTILS},${PKGSC_GSM_UTILS})) CONFIG_STYLE:= manual diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index c67a7c101..163aeed97 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -10,10 +10,12 @@ PKG_MD5SUM:= f98617af9f6be3065f64248f78dae2b7 PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib -PKG_BUILDDEP+= cairo atk pango libXext renderproto libXrender +PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/ +PKG_SUBPKGS:= GTK + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif diff --git a/package/haserl/Makefile b/package/haserl/Makefile index b40ffdc9c..25b8bff76 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 8cd64e591209751a062ad4e08f1d10dd PKG_DESCR:= a CGI wrapper to embed shell scripts in HTML documents PKG_SECTION:= lang -PKG_URL:= http://haserl.sourceforge.net +PKG_URL:= http://haserl.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/} include ${TOPDIR}/mk/package.mk diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 6065af49f..41cb87bd1 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -5,44 +5,38 @@ include $(TOPDIR)/rules.mk PKG_NAME:= heimdal PKG_VERSION:= 1.2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e PKG_DESCR:= Kerberos 5 server PKG_SECTION:= crypto -PKG_NOPARALLEL:= 1 PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err -PKG_BUILDDEP+= openssl ncurses e2fsprogs -ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y) -PKG_BUILDDEP+= libdb -endif -ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y) -PKG_BUILDDEP+= openldap -endif -PKG_URL:= http://www.h5l.org +PKG_BUILDDEP:= openssl ncurses e2fsprogs +PKG_URL:= http://www.h5l.org/ PKG_SITES:= http://www.h5l.org/dist/src/ +PKG_NOPARALLEL:= 1 -PKG_DESCR_1:= Kerberos 5 server libraries -PKG_SECTION_1:= libs - -PKG_DESCR_2:= Kerberos 5 client libraries -PKG_SECTION_2:= libs +PKG_SUBPKGS:= HEIMDAL LIBHEIMDAL LIBHEIMDAL_CLIENT +PKGSD_LIBHEIMDAL:= Kerberos 5 server libraries +PKGSC_LIBHEIMDAL:= libs +PKGSD_LIBHEIMDAL_CLIENT:= Kerberos 5 client libraries +PKGSC_LIBHEIMDAL_CLIENT:= libs PKG_FLAVOURS:= PKINIT PKGFD_PKINIT:= Enable PK-INIT -include $(TOPDIR)/mk/package.mk - -ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y) -PKG_DEPENDS+= libdb -endif +PKG_CHOICES:= WITH_LDAP WITH_BDB +PKGCD_WITH_LDAP:= use OpenLDAP as database backend +PKGCS_WITH_LDAP:= libopenldap +PKGCB_WITH_LDAP:= openldap +PKGCD_WITH_BDB:= use Berkeley DB as database backend +PKGCS_WITH_BDB:= libdb +PKGCB_WITH_BDB:= libdb -ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_LDAP),y) -PKG_DEPENDS+= libopenldap -endif +include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) -$(eval $(call PKG_template,LIBHEIMDAL_CLIENT,libheimdal-client,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2})) +$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL},${PKGSC_LIBHEIMDAL})) +$(eval $(call PKG_template,LIBHEIMDAL_CLIENT,libheimdal-client,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL_CLIENT},${PKGSC_LIBHEIMDAL_CLIENT})) CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \ --disable-otp \ @@ -52,13 +46,13 @@ CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \ --with-ipv6 \ --sysconfdir=/etc/heimdal -ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y) +ifeq ($(ADK_COMPILE_HEIMDAL_WITH_BDB),y) CONFIGURE_ARGS+= --enable-berkeley-db else CONFIGURE_ARGS+= --disable-berkeley-db endif -ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_LDAP),y) +ifeq ($(ADK_COMPILE_HEIMDAL_WITH_LDAP),y) CONFIGURE_ARGS+= --with-openldap=yes CONFIGURE_ARGS+= --with-openldap-include=${STAGING_DIR}/usr CONFIGURE_ARGS+= --with-openldap-lib=${STAGING_DIR}/usr diff --git a/package/heyu/Makefile b/package/heyu/Makefile index d52aa0a22..f94c27072 100644 --- a/package/heyu/Makefile +++ b/package/heyu/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 9c7624b61ea39bbfa70336dc703cd5f1 PKG_DESCR:= X10 home automation control using the CM11A PKG_SECTION:= serial PKG_DEPENDS:= setserial -PKG_URL:= http://heyu.tanj.com +PKG_URL:= http://heyu.tanj.com/ PKG_SITES:= http://heyu.tanj.com/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index d547c9c94..0aa427d55 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -9,25 +9,22 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= f47689c62ee8c1c59989b402d4f130c3 PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator PKG_SECTION:= wifi -PKG_MULTI:= 1 -PKG_DEPENDS:= libnl libopenssl -PKG_BUILDDEP+= libnl openssl -PKG_URL:= http://hostap.epitest.fi -ifeq (${ADK_PACKAGE_HOSTAPD_WITH_OPENSSL},y) -PKG_BUILDDEP+= openssl -endif -ifeq (${ADK_PACKAGE_HOSTAPD_WITH_GNUTLS},y) -PKG_BUILDDEP+= gnutls -endif +PKG_DEPENDS:= libnl +PKG_BUILDDEP:= libnl +PKG_URL:= http://hostap.epitest.fi/ PKG_SITES:= http://hostap.epitest.fi/releases/ +PKG_MULTI:= 1 -WRKSRC= ${WRKDIST}/${PKG_NAME} - +PKG_SUBPKGS:= HOSTAPD HOSTAPD_UTILS PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_GNUTLS:= use GnuTLS for crypto PKGCS_WITH_GNUTLS:= libgnutls +PKGCB_WITH_GNUTLS:= gnutls + +WRKSRC= ${WRKDIST}/${PKG_NAME} include ${TOPDIR}/mk/package.mk diff --git a/package/httping/Makefile b/package/httping/Makefile index ca536190f..2abf4d187 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= bde1ff3c01343d2371d8f34fbf8a1d9a PKG_DESCR:= Httping is like 'ping' but for http-requests PKG_SECTION:= net PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl +PKG_BUILDDEP:= openssl PKG_SITES:= http://www.vanheusden.com/httping/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile index 134a207a1..31ddcda22 100644 --- a/package/httptunnel/Makefile +++ b/package/httptunnel/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2a710f377c82ab4eb201458f7b9f99c5 PKG_DESCR:= http tunneling software PKG_SECTION:= net/security -PKG_URL:= http://www.nocrew.org/software/httptunnel +PKG_URL:= http://www.nocrew.org/software/httptunnel/ PKG_SITES:= http://www.nocrew.org/software/httptunnel/ include ${TOPDIR}/mk/package.mk diff --git a/package/icecast/Makefile b/package/icecast/Makefile index 24e5c6633..295c45844 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= icecast PKG_VERSION:= 2.3.2 PKG_RELEASE:= 2 -PKG_BUILDDEP+= curl libvorbis libxml2 libxslt PKG_MD5SUM:= ff516b3ccd2bcc31e68f460cd316093f PKG_DESCR:= A streaming media server PKG_SECTION:= multimedia PKG_DEPENDS:= libcurl libvorbis libpthread libxml2 libxslt +PKG_BUILDDEP:= curl libvorbis libxml2 libxslt PKG_URL:= http://www.icecast.org/ PKG_SITES:= http://downloads.us.xiph.org/releases/icecast/ diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index 983ac7a1d..a35c76f0e 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -9,11 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7 PKG_DESCR:= An ID3v1/ID3v2 tagging library PKG_SECTION:= libs -PKG_CXX:= ID3LIB PKG_DEPENDS:= zlib libiconv -PKG_BUILDDEP+= zlib libiconv -PKG_URL:= http://id3lib.sourceforge.net +PKG_BUILDDEP:= zlib libiconv +PKG_URL:= http://id3lib.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/} +PKG_CXX:= ID3LIB include ${TOPDIR}/mk/package.mk diff --git a/package/iftop/Makefile b/package/iftop/Makefile index 374cf5410..fdee53037 100644 --- a/package/iftop/Makefile +++ b/package/iftop/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 062bc8fb3856580319857326e0b8752d PKG_DESCR:= display bandwith usage on an interface PKG_SECTION:= net PKG_DEPENDS:= libncurses libpcap libpthread -PKG_BUILDDEP+= libpcap libpthread ncurses -PKG_URL:= http://www.ex-parrot.com/~pdw/iftop +PKG_BUILDDEP:= libpcap libpthread ncurses +PKG_URL:= http://www.ex-parrot.com/~pdw/iftop/ PKG_SITES:= http://www.ex-parrot.com/~pdw/iftop/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index 32797780f..d255fd1f2 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -12,7 +12,8 @@ PKG_SECTION:= proxy PKG_URL:= http://sourceforge.net/projects/igmpproxy/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/} -CFLINE_IGMPPROXY= select ADK_KERNEL_IP_MULTICAST\n\tselect ADK_KERNEL_IP_MROUTE +PKG_CFLINE_IGMPPROXY:= select ADK_KERNEL_IP_MULTICAST@ +PKG_CFLINE_IGMPPROXY+= select ADK_KERNEL_IP_MROUTE include ${TOPDIR}/mk/package.mk diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index e9243c8cf..bf22d9d9a 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 13d91739cf70a781f1db24d8d3677574 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 342822d26..769b3898b 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 125605249958894148ec26d3c88189f5 PKG_DESCR:= IP Cisco Accounting Daemon PKG_SECTION:= net PKG_DEPENDS:= libpcap -PKG_BUILDDEP+= libpcap +PKG_BUILDDEP:= libpcap PKG_URL:= http://lionet.info/ipcad PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipcad/} diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 2876f1464..7a4f70994 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb PKG_DESCR:= Internet Protocol bandwidth measuring tool PKG_SECTION:= net -PKG_CXX:= IPERF PKG_DEPENDS:= libpthread PKG_URL:= http://sourceforge.net/projects/iperf PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} +PKG_CXX:= IPERF include ${TOPDIR}/mk/package.mk diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index aaf17a1a5..8ffc0ddb0 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -9,34 +9,33 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5c5742bdac05a1688f266512e685b83c PKG_DESCR:= iproute2 routing control utility PKG_SECTION:= route -ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),) -PKG_BUILDDEP+= linux-atm -endif PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 PKG_SITES:= http://devresources.linuxfoundation.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 libatm -PKG_DESCR_IFSTAT:= iproute2 interface statistics utility -PKG_DESCR_LNSTAT:= iproute2 network statistics utilities -PKG_DESCR_ROUTEL:= iproute2 route list and flush utilities -PKG_DESCR_RTMON:= iproute2 RTnetlink monitor -PKG_DESCR_SS:= iproute2 socket statistics utility +PKG_SUBPKGS:= IP TC TC_ATM IFSTAT LNSTAT ROUTEL RTMON SS +PKGSD_TC:= iproute2 traffic control utility +PKGSS_TC:= kmod-sched +PKGSD_TC_ATM:= iproute2 traffic control ATM support library +PKGSS_TC_ATM:= tc libatm +PKGSB_TC_ATM:= linux-atm +PKGSD_IFSTAT:= iproute2 interface statistics utility +PKGSD_LNSTAT:= iproute2 network statistics utilities +PKGSD_ROUTEL:= iproute2 route list and flush utilities +PKGSD_RTMON:= iproute2 RTnetlink monitor +PKGSD_SS:= iproute2 socket statistics utility DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_TC},${PKG_DESCR_TC},${PKG_SECTION})) -$(eval $(call PKG_template,TC_ATM,tc-atm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_TC_ATM},${PKG_DESCR_TC_ATM},${PKG_SECTION})) -$(eval $(call PKG_template,IFSTAT,ifstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_IFSTAT},${PKG_DESCR_IFSTAT},${PKG_SECTION})) -$(eval $(call PKG_template,LNSTAT,lnstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LNSTAT},${PKG_DESCR_LNSTAT},${PKG_SECTION})) -$(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_ROUTEL},${PKG_DESCR_ROUTEL},${PKG_SECTION})) -$(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_RTMON},${PKG_DESCR_RTMON},${PKG_SECTION})) -$(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SS},${PKG_DESCR_SS},${PKG_SECTION})) +$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC},${PKGSD_TC},${PKG_SECTION})) +$(eval $(call PKG_template,TC_ATM,tc-atm,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_ATM},${PKGSD_TC_ATM},${PKG_SECTION})) +$(eval $(call PKG_template,IFSTAT,ifstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_IFSTAT},${PKG_SECTION})) +$(eval $(call PKG_template,LNSTAT,lnstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LNSTAT},${PKG_SECTION})) +$(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_ROUTEL},${PKG_SECTION})) +$(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_RTMON},${PKG_SECTION})) +$(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PKG_SECTION})) TCFLAGS+= -D_GNU_SOURCE XAKE_FLAGS+= CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \ diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 322d8328a..d3efd7f5d 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 72861f005746ee27984b2ee715ecc629 PKG_DESCR:= IPsec management tools PKG_SECTION:= net/security PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -PKG_URL:= http://ipsec-tools.sourceforge.net +PKG_BUILDDEP:= openssl +PKG_URL:= http://ipsec-tools.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/ipset/Makefile b/package/ipset/Makefile index ddb4e293b..650b42b73 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -9,21 +9,21 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 92bb09883dd8a77ec5cfbff1c8932b15 PKG_DESCR:= ip sets administration utility PKG_SECTION:= firewall -PKG_URL:= http://ipset.netfilter.org +PKG_URL:= http://ipset.netfilter.org/ PKG_SITES:= http://ipset.netfilter.org/ -PKG_SECTION_KMOD_IPSET:=kernel -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SUBPKGS:= IPSET KMOD_IPSET +PKGSD_KMOD_IPSET:= ipset kernel module +PKGSC_KMOD_IPSET:= kernel -PKG_DESCR_KMOD:= ipset kernel module +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD},${PKG_SECTION_KMOD_IPSET})) +$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_KMOD_IPSET},${PKGSC_KMOD_IPSET})) CONFIG_STYLE:= manual - XAKE_FLAGS+= PREFIX=/usr ALL_TARGET:= binaries INSTALL_TARGET:= binaries_install diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile index eb5d1bc8c..b6ce0993d 100644 --- a/package/iptables-snmp/Makefile +++ b/package/iptables-snmp/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= iptables-snmp PKG_VERSION:= 0.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= net-snmp PKG_MD5SUM:= 8370d2f0c899461a053da491400119d1 PKG_DESCR:= iptables support for net-snmp PKG_SECTION:= net/misc +PKG_BUILDDEP:= net-snmp PKG_URL:= http://www.nobiscuit.com/iptables-snmp/ PKG_SITES:= http://www.nobiscuit.com/iptables-snmp/ diff --git a/package/iptables/Makefile b/package/iptables/Makefile index d22f847a5..aac6179a0 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -22,6 +22,8 @@ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ +PKG_SUBPKGS:= IPTABLES IP6TABLES + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index e45ec244e..6c3bc7907 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -10,10 +10,9 @@ PKG_MD5SUM:= 377371c28ee3c21a76f7024920649ea8 PKG_DESCR:= A console-based network monitoring program. PKG_SECTION:= net PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses -PKG_URL:= http://iptraf.seul.org -PKG_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \ - ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/ +PKG_BUILDDEP:= ncurses +PKG_URL:= http://iptraf.seul.org/ +PKG_SITES:= ftp://iptraf.seul.org/pub/iptraf/ include ${TOPDIR}/mk/package.mk diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 70b0e256a..55894fd7c 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -10,17 +10,15 @@ PKG_MD5SUM:= 870db8e319f640c2bf446c30d0c24ef6 PKG_DESCR:= IRC text client PKG_SECTION:= chat PKG_DEPENDS:= glib libncurses -PKG_BUILDDEP+= glib ncurses -ifeq (${ADK_PACKAGE_IRSSI_WITH_SSL},y) -PKG_BUILDDEP+= openssl -endif +PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.irssi.org/ PKG_SITES:= http://www.irssi.org/files/ PKG_FLAVOURS:= WITH_SSL WITH_IPV6 -PKGFD_SSL:= SSL/TLS support -PKGFS_SSL:= libopenssl -PKGFD_IPV6:= IPv6 support +PKGFD_WITH_SSL:= enable SSL/TLS support +PKGFS_WITH_SSL:= libopenssl +PKGFB_WITH_SSL:= openssl +PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk diff --git a/package/iw/Makefile b/package/iw/Makefile index 69b8a2852..247116cc6 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 3b88743f9c6ce8a7e2f5fd7d18fdea42 PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) PKG_SECTION:= wifi PKG_DEPENDS:= libnl -PKG_BUILDDEP+= libnl +PKG_BUILDDEP:= libnl PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw PKG_SITES:= http://wireless.kernel.org/download/iw/ diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index a459673eb..06c6d8040 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 PKG_DESCR:= A Java Virtual Machine (JVM) implementation PKG_SECTION:= lang PKG_DEPENDS:= libffi zlib -PKG_BUILDDEP+= libffi zlib +PKG_BUILDDEP:= libffi zlib PKG_URL:= http://jamvm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index 34d1c72ea..4b91d88b3 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -10,8 +10,9 @@ PKG_MD5SUM:= 382ef33b339c299b56baf1296cda9785 PKG_DESCR:= The Independent JPEG Groups JPEG runtime library PKG_SECTION:= libs PKG_URL:= http://www.ijg.org/ -PKG_SITES:= http://www.ijg.org/files/ \ - ftp://ftp.uu.net/graphics/jpeg/ +PKG_SITES:= http://www.ijg.org/files/ + +PKG_SUBPKGS:= LIBJPEG DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile index f84afa463..f8b7bd0d6 100644 --- a/package/kbproto/Makefile +++ b/package/kbproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 4deef518a03bc94a7a25902bb7c98dd6 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kismet/Makefile b/package/kismet/Makefile index bca614414..cfcf5d908 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -6,24 +6,25 @@ include ${TOPDIR}/rules.mk PKG_NAME:= kismet PKG_VERSION:= 2010-01-R1 PKG_RELEASE:= 1 +PKG_MD5SUM:= a6d6edcf65d5bb2cb5de6472bcc16f19 PKG_DESCR:= Kismet PKG_SECTION:= wifi -PKG_BUILDDEP+= libpcap ncurses PKG_DEPENDS:= libpcap libncurses -PKG_MD5SUM:= a6d6edcf65d5bb2cb5de6472bcc16f19 +PKG_BUILDDEP:= libpcap ncurses PKG_URL:= http://www.kismetwireless.net/ PKG_SITES:= http://www.kismetwireless.net/code/ -PKG_DESCR_CLIENT:= Kismet client -PKG_DESCR_SERVER:= Kismet server -PKG_DESCR_DRONE:= Kismet drone +PKG_SUBPKGS:= KISMET KISMET_CLIENT KISMET_DRONE KISMET_SERVER +PKGSD_KISMET_CLIENT:= Kismet client +PKGSD_KISMET_SERVER:= Kismet server +PKGSD_KISMET_DRONE:= Kismet drone include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENT},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DRONE},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SERVER},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION})) CONFIGURE_ARGS+= --sysconfdir=/etc/kismet \ --disable-linuxwext diff --git a/package/knock/Makefile b/package/knock/Makefile index 75c8055b5..c7978ece1 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -9,17 +9,18 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ca09d61458974cff90a700aba6120891 PKG_DESCR:= A port-knocking client PKG_SECTION:= firewall +PKG_BUILDDEP:= libpcap PKG_URL:= http://www.zeroflux.org/projects/knock -PKG_BUILDDEP+= libpcap PKG_SITES:= http://www.zeroflux.org/proj/knock/files/ -PKG_DESCR_1:= A port-knocking server -PKG_DEPENDS_1:= libpcap +PKG_SUBPKGS:= KNOCK KNOCKD +PKGSD_KNOCKD:= A port-knocking server +PKGSS_KNOCKD:= libpcap include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_KNOCKD},${PKGSD_KNOCKD},${PKG_SECTION})) TCXXFLAGS+= ${TCPPFLAGS} ${TCFLAGS} CONFIGURE_ENV+= ac_cv_lib_pcap_pcap_open_live=yes diff --git a/package/krb5/Makefile b/package/krb5/Makefile index bb4e809c1..1cbaae817 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -10,14 +10,14 @@ PKG_MD5SUM:= e29a78b108c4687f7e7937110d1d0415 PKG_DESCR:= MIT kerberos server PKG_SECTION:= crypto PKG_DEPENDS:= libkrb5 libncurses libss libcom-err -PKG_BUILDDEP+= ncurses e2fsprogs -PKG_URL:= http://web.mit.edu/kerberos +PKG_BUILDDEP:= ncurses e2fsprogs +PKG_URL:= http://web.mit.edu/kerberos/ PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.8/ - PKG_NOPARALLEL:= 1 -PKG_DESCR_LIB:= MIT kerberos libraries -PKG_SECTION_LIB:= libs +PKG_SUBPKGS:= KRB5_SERVER LIBKRB5 +PKGSD_LIBKRB5:= MIT kerberos libraries +PKGSC_LIBKRB5:= libs DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar WRKSRC= ${WRKDIST}/src @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIST}/src include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB})) +$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index caae33207..852d40856 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c PKG_DESCR:= A layer 2 tunneling protocol network server (LNS) PKG_SECTION:= net/security PKG_DEPENDS:= libcli -PKG_BUILDDEP+= libcli +PKG_BUILDDEP:= libcli PKG_URL:= http://l2tpns.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=l2tpns/} diff --git a/package/lame/Makefile b/package/lame/Makefile index baaa3b966..4f18aa165 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -10,16 +10,17 @@ PKG_MD5SUM:= 719dae0ee675d0c16e0e89952930ed35 PKG_DESCR:= LAME MP3 encoder PKG_SECTION:= multimedia PKG_DEPENDS:= libncurses -PKG_URL:= http://lame.sourceforge.net +PKG_URL:= http://lame.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/} -PKG_DESCR_1:= LAME MP3 encoding library -PKG_SECTION_1:= libs +PKG_SUBPKGS:= LAME LIBLAME +PKGSD_LIBLAME:= LAME MP3 encoding library +PKGSC_LIBLAME:= libs include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LAME,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBLAME},${PKGSC_LIBLAME})) post-install: $(INSTALL_DIR) $(IDIR_LAME)/usr/bin diff --git a/package/less/Makefile b/package/less/Makefile index bf3976e3f..13784b8ff 100644 --- a/package/less/Makefile +++ b/package/less/Makefile @@ -10,13 +10,13 @@ PKG_MD5SUM:= 206f2f13b9b0a35e45df660fcb6af31d PKG_DESCR:= A text mode pager PKG_SECTION:= pager PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses -PKG_URL:= http://www.greenwoodsoftware.com/less +PKG_BUILDDEP:= ncurses +PKG_URL:= http://www.greenwoodsoftware.com/less/ PKG_SITES:= http://www.greenwoodsoftware.com/less/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LESS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: ${INSTALL_DIR} ${IDIR_LESS}/usr/bin diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 2f15c75be..79ab03131 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea PKG_DESCR:= Inter-Client Exchange library PKG_SECTION:= x11/libs -PKG_BUILDDEP+= xtrans xproto +PKG_BUILDDEP:= xtrans xproto PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile index d303d2b4a..749782019 100644 --- a/package/libIDL/Makefile +++ b/package/libIDL/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 531fbc1b40b80dd1d6f3b5e76b99067c PKG_DESCR:= libraries for Interface Definition Language files PKG_SECTION:= libs -PKG_URL:= http://www.gnome.org +PKG_URL:= http://www.gnome.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/ include $(TOPDIR)/mk/package.mk diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 26dc4559a..7256e80c8 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libSM PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libICE PKG_MD5SUM:= 1ee90d479298e48df7bb86a7ccbe00c9 PKG_DESCR:= X11 Session Management library PKG_SECTION:= x11/libs PKG_DEPENDS:= libuuid +PKG_BUILDDEP:= libICE PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libX11/Makefile b/package/libX11/Makefile index aba32b12a..4d7e7794e 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11/libs -PKG_BUILDDEP+= xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto +PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBX11 LIBX11_DEV + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index 3e05c8868..3eed56635 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXaw PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libXext libXmu libXpm PKG_MD5SUM:= 67662e6b2dceb2907159215c83364c5a PKG_DESCR:= X11 Athena Widget library PKG_SECTION:= x11/libs +PKG_BUILDDEP:= libXext libXmu libXpm PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile index 4481cb3ce..d81ed113f 100644 --- a/package/libXdamage/Makefile +++ b/package/libXdamage/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f8f19f747c8445213d5409ae8b8b2f0a PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol PKG_SECTION:= libs -PKG_BUILDDEP+= libXfixes damageproto +PKG_BUILDDEP:= libXfixes damageproto PKG_URL:= add project url PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 0352e419f..f7011ddad 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXext PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libX11 PKG_MD5SUM:= 6b61b3f657befded8ae66e04085c413e PKG_DESCR:= X client interface to extensions of the X protocol PKG_SECTION:= x11/libs +PKG_BUILDDEP:= libX11 PKG_SITES:= ${MASTER_SITE_XORG} ifeq ($(ADK_STATIC),y) diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile index 283a043ce..27ad3da19 100644 --- a/package/libXfixes/Makefile +++ b/package/libXfixes/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 86eb4b916cd5948c0e20d279107b3331 PKG_DESCR:= X Fixes Library PKG_SECTION:= libs -PKG_BUILDDEP+= fixesproto xextproto xproto libX11 +PKG_BUILDDEP:= fixesproto xextproto xproto libX11 PKG_URL:= http://xorg.freedesktop.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 5f31218e2..cc9241f67 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412 PKG_DESCR:= X font Library PKG_SECTION:= x11/libs PKG_DEPENDS:= libfreetype -PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc xtrans +PKG_BUILDDEP:= freetype fontcacheproto fontsproto libfontenc xtrans PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXft/Makefile b/package/libXft/Makefile index 637ba46b1..ea477afaa 100644 --- a/package/libXft/Makefile +++ b/package/libXft/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0a1e129b1d8b2d3905dc02a64255b781 PKG_DESCR:= X FreeType library PKG_SECTION:= x11/libs -PKG_BUILDDEP+= libXrender +PKG_BUILDDEP:= libXrender PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXi/Makefile b/package/libXi/Makefile index 3e4d50f51..de1a11f1a 100644 --- a/package/libXi/Makefile +++ b/package/libXi/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1c038312e4f9b61fe72e52d0f59a01d5 PKG_DESCR:= X Window System client interface to the XINPUT extension to the X protocol. PKG_SECTION:= x11/libs -PKG_BUILDDEP+= xproto xextproto libXext +PKG_BUILDDEP:= xproto xextproto libXext PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index 0a776b0ef..017065a19 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f49e3587cdc299707da0786a681f9c05 PKG_DESCR:= miscellaneous utility functions for X libraries PKG_SECTION:= x11/libs -PKG_BUILDDEP+= libXt +PKG_BUILDDEP:= libXt PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile index 4d7ea648a..a2fa2663d 100644 --- a/package/libXrender/Makefile +++ b/package/libXrender/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1791473c18a83a333a048b72d719fc55 PKG_DESCR:= X11 rendering library PKG_SECTION:= x11/libs -PKG_BUILDDEP+= renderproto +PKG_BUILDDEP:= renderproto PKG_SITES:= ${MASTER_SITE_XORG} ifeq ($(ADK_STATIC),y) diff --git a/package/libXt/Makefile b/package/libXt/Makefile index b60390b9b..e8048e1d6 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 28f627c7a5ca08c2413ce91d21c177d8 PKG_DESCR:= X Toolkit Intrinsics PKG_SECTION:= x11/libs -PKG_BUILDDEP+= libSM +PKG_BUILDDEP:= libSM PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXv/Makefile b/package/libXv/Makefile index 24cf35b75..1440bf47f 100644 --- a/package/libXv/Makefile +++ b/package/libXv/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXv PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libX11 videoproto libXext PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c PKG_DESCR:= X11 Xvideo extensions PKG_SECTION:= x11/libs +PKG_BUILDDEP:= libX11 videoproto libXext PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile index 959635986..c5a3dae8b 100644 --- a/package/libXxf86dga/Makefile +++ b/package/libXxf86dga/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ecb81708157e1a1eeaba0e124f0ade08 PKG_DESCR:= client library for the XFree86-DGA extension PKG_SECTION:= x11/libs -PKG_BUILDDEP+= xf86dgaproto libXext libXaw +PKG_BUILDDEP:= xf86dgaproto libXext libXaw PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile index 1465ee1ac..4e2f8ea0e 100644 --- a/package/libXxf86vm/Makefile +++ b/package/libXxf86vm/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 52b49483eccbdd1566b8c560fe7f76e8 PKG_DESCR:= add short description PKG_SECTION:= libs -PKG_BUILDDEP+= xf86vidmodeproto libXext +PKG_BUILDDEP:= xf86vidmodeproto libXext PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ include $(TOPDIR)/mk/package.mk diff --git a/package/libao/Makefile b/package/libao/Makefile index 02c411a0e..effc7d5e4 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b92cba3cbcf1ee9bc221118a85d23dcd PKG_DESCR:= A cross platform audio library PKG_SECTION:= libs PKG_DEPENDS:= esound -PKG_BUILDDEP+= esound +PKG_BUILDDEP:= esound PKG_URL:= http://www.xiph.org/ao PKG_SITES:= http://downloads.xiph.org/releases/ao/ diff --git a/package/libc/Makefile b/package/libc/Makefile index 29b30d546..9b85b82bc 100644 --- a/package/libc/Makefile +++ b/package/libc/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.0 PKG_RELEASE:= 2 PKG_SECTION:= base PKG_DESCR:= native C library + NO_DISTFILES:= 1 include $(TOPDIR)/mk/package.mk diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile index 780164b03..a55e6468e 100644 --- a/package/libdrm/Makefile +++ b/package/libdrm/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= dcbf9aa0497c84c7e4af15adb0021955 PKG_DESCR:= DRM library PKG_SECTION:= libs -PKG_BUILDDEP+= libpthread-stubs +PKG_BUILDDEP:= libpthread-stubs PKG_URL:= http://dri.freedesktop.org/wiki/ PKG_SITES:= http://dri.freedesktop.org/libdrm/ diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile index c9d2a5505..5f038aee5 100644 --- a/package/libfontenc/Makefile +++ b/package/libfontenc/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 0fa1988d08021225d18ced519a30d2b1 PKG_DESCR:= helps to deal with different encodings of fonts PKG_SECTION:= x11/libs PKG_DEPENDS:= zlib -PKG_BUILDDEP+= xproto zlib +PKG_BUILDDEP:= xproto zlib PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 20b5da9c8..f134ceb06 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 325294c12e7b99d82dee3a8bf8c2c28e PKG_DESCR:= GNU crypto library PKG_SECTION:= libs PKG_DEPENDS:= libgpg-error -PKG_BUILDDEP+= libgpg-error +PKG_BUILDDEP:= libgpg-error PKG_URL:= http://directory.fsf.org/project/libgcrypt PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ diff --git a/package/libgd/Makefile b/package/libgd/Makefile index 7b9d7c046..b49270804 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -6,14 +6,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gd PKG_VERSION:= 2.0.35 PKG_RELEASE:= 2 -PKG_BUILDDEP+= libpng jpeg PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede PKG_DESCR:= A library for the dynamic creation of images PKG_SECTION:= libs PKG_DEPENDS:= libjpeg libpng -PKG_URL:= http://www.libgd.org +PKG_BUILDDEP:= libpng jpeg +PKG_URL:= http://www.libgd.org/ PKG_SITES:= http://www.libgd.org/releases/ +PKG_SUBPKGS:= LIBGD + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 73b37eb9b..d653ae8a5 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1d2005268a2f096db28cf9cf77b3229a PKG_DESCR:= a helper library for common error codes and descriptions PKG_SECTION:= libs -PKG_URL:= http://www.gnupg.org +PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 1fbb35271..c180fed62 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7ab33ebd26687c744a37264a330bbe9a PKG_DESCR:= character set conversion library PKG_SECTION:= libs -PKG_URL:= http://www.gnu.org/software/libiconv +PKG_URL:= http://www.gnu.org/software/libiconv/ PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/} ifeq ($(ADK_STATIC),y) diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile index 0a0f1cf68..1b1d376ea 100644 --- a/package/libid3tag/Makefile +++ b/package/libid3tag/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e5808ad997ba32c498803822078748c3 PKG_DESCR:= an ID3 tag manipulation library PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP+= zlib +PKG_BUILDDEP:= zlib PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} include ${TOPDIR}/mk/package.mk diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index f15759356..736e1d2fd 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= libs PKG_URL:= http://www.oberhumer.com/opensource/lzo PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/ +PKG_SUBPKGS:= LIBLZO + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libmpc/Makefile b/package/libmpc/Makefile index 5343ae4a4..1d976b17e 100644 --- a/package/libmpc/Makefile +++ b/package/libmpc/Makefile @@ -6,8 +6,10 @@ include ${TOPDIR}/toolchain/mpc/Makefile.inc PKG_DESCR:= GNU multiprecision arithmetic library PKG_SECTION:= libs +PKG_BUILDDEP:= gmp mpfr PKG_URL:= http://www.multiprecision.org/ -PKG_BUILDDEP+= gmp mpfr + +PKG_SUBPKGS:= LIBMPC include ${TOPDIR}/mk/package.mk diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 679da1c05..12a168824 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c5e06418a89cc4209f677a776a798fd9 PKG_DESCR:= a low-level packet creation library PKG_SECTION:= libs PKG_DEPENDS:= libpcap -PKG_BUILDDEP+= libpcap +PKG_BUILDDEP:= libpcap PKG_URL:= http://sourceforge.net/projects/libnet-dev/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/libnet-${PKG_VERSION}/} diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile index 517d7d7b2..e0718b49f 100644 --- a/package/libnetfilter_conntrack/Makefile +++ b/package/libnetfilter_conntrack/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 3c4b4048c914f2694c3ca6de2bb457dc PKG_DESCR:= API to connection tracking state table PKG_SECTION:= libs PKG_DEPENDS:= libnfnetlink -PKG_BUILDDEP+= libnfnetlink +PKG_BUILDDEP:= libnfnetlink PKG_URL:= http://www.netfilter.org/projects/libnetfilter_conntrack/ PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_conntrack/files/ diff --git a/package/libnetfilter_log/Makefile b/package/libnetfilter_log/Makefile index 5232b612b..8fb6c91df 100644 --- a/package/libnetfilter_log/Makefile +++ b/package/libnetfilter_log/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= acdb188a1e7504e95636d0770ade393c PKG_DESCR:= API to packets that have been logged PKG_SECTION:= libs PKG_DEPENDS:= libnfnetlink -PKG_BUILDDEP+= libnfnetlink +PKG_BUILDDEP:= libnfnetlink PKG_URL:= http://www.netfilter.org/projects/libnetfilter_log/ PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_log/files/ diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile index d10464e00..00cc05462 100644 --- a/package/libnetfilter_queue/Makefile +++ b/package/libnetfilter_queue/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 2cde35e678ead3a8f9eb896bf807a159 PKG_DESCR:= API to packets that have been queued by the kernel packet filter PKG_SECTION:= libs PKG_DEPENDS:= libnfnetlink -PKG_BUILDDEP+= libnfnetlink +PKG_BUILDDEP:= libnfnetlink PKG_URL:= http://www.netfilter.org/projects/libnetfilter_queue/ PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_queue/files/ diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 6b25cea6b..123314e44 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= af35e8ef403a0ca95df2da94db856428 PKG_DESCR:= Network Intrusion Detection System library PKG_SECTION:= libs PKG_DEPENDS:= libnet libpcap glib -PKG_BUILDDEP+= libnet libpcap glib +PKG_BUILDDEP:= libnet libpcap glib PKG_URL:= http://libnids.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnids/} diff --git a/package/libol/Makefile b/package/libol/Makefile index 3b2067089..29c32add3 100644 --- a/package/libol/Makefile +++ b/package/libol/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= cbadf4b7ea276dfa85acc38a1cc5ff17 PKG_DESCR:= Support library for syslog-ng PKG_SECTION:= libs -PKG_URL:= http://www.balabit.com +PKG_URL:= http://www.balabit.com/ PKG_SITES:= http://www.balabit.com/downloads/files/libol/0.3/ include ${TOPDIR}/mk/package.mk diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile index 02cd4f89a..c6e21ae01 100644 --- a/package/libowfat/Makefile +++ b/package/libowfat/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 6bbee9a86506419657d87123b7a6f2c1 PKG_URL:= http://www.fefe.de/libowfat PKG_SITES:= http://dl.fefe.de/ +PKG_SUBPKGS:= DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 34ea80d0d..34ac1a204 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 9e2c5cbececde245e2d2f535bd49ce35 PKG_DESCR:= library implementing a small layer on top of PKCS11 API PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libltdl -PKG_BUILDDEP+= openssl libtool +PKG_BUILDDEP:= openssl libtool PKG_URL:= http://www.opensc-project.org/libp11 PKG_SITES:= http://www.opensc-project.org/files/libp11/ diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 5970d0d9e..62eac961e 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 89b62f8daaeeab1342e307d6d1411ff1 PKG_DESCR:= A library for reading/writing PNG images PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP+= zlib +PKG_BUILDDEP:= zlib PKG_URL:= http://www.libpng.org/pub/png/libpng.html PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} diff --git a/package/libpri/Makefile b/package/libpri/Makefile index 4a1e80329..101f82c98 100644 --- a/package/libpri/Makefile +++ b/package/libpri/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= dc1523d8ee027cd62f20fc6cc9727489 PKG_DESCR:= C implementation of the Primary Rate ISDN specification PKG_SECTION:= libs -PKG_URL:= http://www.asterisk.org +PKG_URL:= http://www.asterisk.org/ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/libpri/releases/ include ${TOPDIR}/mk/package.mk diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile index 028d40d3f..58c70f5dc 100644 --- a/package/libpthread-stubs/Makefile +++ b/package/libpthread-stubs/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 774eabaf33440d534efe108ef9130a7d PKG_URL:= http://xcb.freedesktop.org/ PKG_SITES:= http://xcb.freedesktop.org/dist/ +PKG_SUBPKGS:= + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 883c04a87..79eaadc6a 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -16,6 +16,7 @@ endif PKG_NAME:= libpthread PKG_DESCR:= POSIX threading library PKG_SECTION:= libs + NO_DISTFILES:= 1 ifeq ($(ADK_STATIC),y) diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 69bd9f6db..6c32cb10c 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b45ed565bdc3099023aa35830ec92997 PKG_DESCR:= Secure RPC library for NFSv4 PKG_SECTION:= libs PKG_DEPENDS:= libgssglue -PKG_BUILDDEP+= libgssglue +PKG_BUILDDEP:= libgssglue PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ include $(TOPDIR)/mk/package.mk diff --git a/package/libshout/Makefile b/package/libshout/Makefile index 479c8c57c..335147acb 100644 --- a/package/libshout/Makefile +++ b/package/libshout/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 4f75fc9901c724b712c371c9a1e782d3 PKG_DESCR:= Library which can be used to write a source client for streaming PKG_SECTION:= libs PKG_DEPENDS:= libvorbis libogg -PKG_BUILDDEP+= libvorbis +PKG_BUILDDEP:= libvorbis PKG_URL:= http://directory.fsf.org/project/libshout PKG_SITES:= http://downloads.us.xiph.org/releases/libshout/ diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 180a93715..beaea330e 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -15,6 +15,7 @@ endif PKG_NAME:= libstdcxx PKG_DESCR:= C++ support library PKG_SECTION:= libs + NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 2593708f7..d48c4bc38 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 14cc361500d2e768a8a6ec538ce3fecb PKG_DESCR:= an ASN.1 and DER structures manipulation library PKG_SECTION:= libs -PKG_URL:= http://www.gnupg.org +PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ include ${TOPDIR}/mk/package.mk diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index 6566b0f9d..ff31c858c 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -16,6 +16,7 @@ endif PKG_NAME:= libthread-db PKG_DESCR:= POSIX threads library for gdb/gdbserver PKG_SECTION:= libs + NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 645b8dae7..b06ba0058 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6 PKG_DESCR:= A library for reading/writing TIFF images PKG_SECTION:= libs -PKG_URL:= http://www.libtiff.org +PKG_URL:= http://www.libtiff.org/ PKG_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/ DISTFILES:= tiff-${PKG_VERSION}.tar.gz diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 1702106c4..4d8e4689e 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= d77eb15f464bf9d6e66259eaf78b2a4e PKG_DESCR:= a transport independent RPC library PKG_SECTION:= libs PKG_DEPENDS:= libgssglue -PKG_BUILDDEP+= libgssglue -PKG_URL:= http://sourceforge.net/projects/libtirpc +PKG_BUILDDEP:= libgssglue +PKG_URL:= http://sourceforge.net/projects/libtirpc/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libtirpc/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/libtool/Makefile b/package/libtool/Makefile index 1adc4881b..d23aa0a39 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -9,13 +9,16 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= b745d220e88163fcd9eea0a90ccf21b0 PKG_DESCR:= a generic dynamic object loading library PKG_SECTION:= lang -PKG_URL:= http://www.gnu.org/software/libtool +PKG_URL:= http://www.gnu.org/software/libtool/ PKG_SITES:= ${MASTER_SITE_GNU:=libtool/} +PKG_SUBPKGS:= LIBTOOL LIBLTDL +PKGSC_LIBLTDL:= libs + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBLTDL})) ifeq (${ADK_HOST_OPENBSD},y) XAKE_FLAGS+= AUTOCONF_VERSION=2.62 diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index ea0de0c28..419654fc9 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtorrent PKG_VERSION:= 0.12.5 PKG_RELEASE:= 1 -PKG_BUILDDEP+= openssl libsigc++ PKG_MD5SUM:= fe8155d364b220713074423100d4bf29 PKG_DESCR:= A bittorrent library PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsigc++ -PKG_URL:= http://libtorrent.rakshasa.no +PKG_BUILDDEP:= openssl libsigc++ +PKG_URL:= http://libtorrent.rakshasa.no/ PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ include ${TOPDIR}/mk/package.mk diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 5f6c09ea3..25cbd8566 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 8918dcf7428cd119d0c8275765ff2833 PKG_DESCR:= The Universal Plug and Play (UPnP) SDK library PKG_SECTION:= libs PKG_DEPENDS:= libpthread -PKG_URL:= http://pupnp.sourceforge.net +PKG_URL:= http://pupnp.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pupnp/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile index ce41c1d1d..fd651a5b9 100644 --- a/package/libusb-compat/Makefile +++ b/package/libusb-compat/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 570ac2ea085b80d1f74ddc7c6a93c0eb PKG_DESCR:= a library for accessing Linux USB devices PKG_SECTION:= libs -PKG_BUILDDEP+= libusb +PKG_BUILDDEP:= libusb PKG_URL:= http://libusb.wiki.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusb/} diff --git a/package/libusb/Makefile b/package/libusb/Makefile index 63e9f21be..795d2ee1a 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 37d34e6eaa69a4b645a19ff4ca63ceef PKG_DESCR:= a library for accessing Linux USB devices PKG_SECTION:= libs -PKG_URL:= http://libusb.wiki.sourceforge.net +PKG_URL:= http://libusb.wiki.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusb/} ifeq ($(ADK_STATIC),y) diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index d28f0cd5c..32682603f 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 1645975662a326969d2f42d5c04574aa PKG_DESCR:= virtualization API PKG_SECTION:= libs PKG_DEPENDS:= libxml2 libgnutls python -PKG_BUILDDEP+= libxml2 gnutls python +PKG_BUILDDEP:= libxml2 gnutls python PKG_URL:= http://www.libvirt.org/ PKG_SITES:= ftp://libvirt.org/libvirt/ diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 76e156ae4..c5ec6bdee 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -9,10 +9,12 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 478646358c49f34aedcce58948793619 PKG_DESCR:= The Vorbis General Audio Compression Codec library PKG_SECTION:= libs -PKG_BUILDDEP+= libogg +PKG_BUILDDEP:= libogg PKG_URL:= http://www.xiph.org/vorbis/ PKG_SITES:= http://downloads.xiph.org/releases/vorbis/ +PKG_SUBPKGS:= LIBVORBIS LIBVORBISENC + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 87e792291..2dc277b09 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a1384a9a48430397aff236f97e26ed05 PKG_DESCR:= X11 keyboard configuration extension library PKG_SECTION:= x11/libs -PKG_BUILDDEP+= kbproto libX11 +PKG_BUILDDEP:= kbproto libX11 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 511663c2b..f518d4cf5 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 7740a8ec23878a2f50120e1faa2730f2 PKG_DESCR:= XML C parser and toolkit PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP+= zlib +PKG_BUILDDEP:= zlib PKG_URL:= http://www.xmlsoft.org/ PKG_SITES:= http://xmlsoft.org/sources/ diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 3f18857f4..9f3b1faef 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -10,10 +10,9 @@ PKG_MD5SUM:= e83ec5d27fc4c10c6f612879bea9a153 PKG_DESCR:= XSLT Library PKG_SECTION:= libs PKG_DEPENDS:= libxml2 -PKG_BUILDDEP+= libxml2 +PKG_BUILDDEP:= libxml2 PKG_URL:= http://xmlsoft.org/XSLT -PKG_SITES:= http://xmlsoft.org/sources/ \ - ftp://fr.rpmfind.net/pub/libxml/ +PKG_SITES:= http://xmlsoft.org/sources/ include ${TOPDIR}/mk/package.mk diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index a6f75ac63..780b9b5b5 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -9,16 +9,18 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a lightweight web server PKG_SECTION:= www -PKG_DEPENDS:= libxml2 libsqlite libpcre -PKG_BUILDDEP+= pcre libxml2 sqlite -ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) -PKG_DEPENDS+= libopenssl -PKG_BUILDDEP+= openssl -endif -PKG_URL:= http://www.lighttpd.net +PKG_DEPENDS:= libxml2 libsqlite libpcre libopenssl +PKG_BUILDDEP:= pcre libxml2 sqlite openssl +PKG_URL:= http://www.lighttpd.net/ PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ PKG_MULTI:= 1 +PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ACCESSLOG LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH +PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI +PKG_SUBPKGS+= LIGHTTPD_MOD_PROXY LIGHTTPD_MOD_REDIRECT LIGHTTPD_MOD_REWRITE LIGHTTPD_MOD_SETENV +PKG_SUBPKGS+= LIGHTTPD_MOD_SIMPLE_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK +PKG_SUBPKGS+= LIGHTTPD_MOD_WEBDAV + include $(TOPDIR)/mk/package.mk define PKG_mod_template @@ -81,12 +83,8 @@ CONFIGURE_ARGS+= \ --without-mysql \ --with-pcre \ --without-valgrind \ - --with-webdav-props -ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) -CONFIGURE_ARGS+= --with-openssl='${STAGING_DIR}/usr' -else -CONFIGURE_ARGS+= --without-openssl -endif + --with-webdav-props \ + --with-openssl='${STAGING_DIR}/usr' post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} install -m0755 -d $(IDIR_LIGHTTPD)/etc diff --git a/package/links/Makefile b/package/links/Makefile index bae20042c..dae75bd35 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= links PKG_VERSION:= 2.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= openssl libpng jpeg gpm PKG_MD5SUM:= c9937f9ed0061f264973182f871fb667 PKG_DESCR:= web browser with graphic support PKG_SECTION:= browser PKG_DEPENDS:= libpng libjpeg libtiff gpm libopenssl -PKG_URL:= http://links.twibright.com +PKG_BUILDDEP:= openssl libpng jpeg gpm +PKG_URL:= http://links.twibright.com/ PKG_SITES:= http://links.twibright.com/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 6bee2916a..6ad57ae1a 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -8,23 +8,24 @@ PKG_VERSION:= 2.5.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758 PKG_DESCR:= ATM library and tools for Linux -PKG_SECTION:= route -PKG_URL:= http://linux-atm.sourceforge.net +PKG_SECTION:= libs +PKG_URL:= http://linux-atm.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/} PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !freebsd -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz +PKG_SUBPKGS:= LIBATM BR2684CTL +PKGSD_BR2684CTL:= br2684ctl ATM utility +PKGSS_BR2684CTL:= libatm +PKGSC_BR2684CTL:= route -PKG_DESCR_1:= br2684ctl -PKG_DEPENDS_1:= libatm -PKG_SECTION_1:= net +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BR2684CTL},${PKGSD_BR2684CTL},${PKGSC_BR2684CTL})) post-install: ${INSTALL_DIR} ${IDIR_LIBATM}/usr/lib diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile index a49e1fe34..1c7577ac2 100644 --- a/package/logrotate/Makefile +++ b/package/logrotate/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b3589bea6d8d5afc8a84134fddaae973 PKG_DESCR:= logfile rotation utility PKG_SECTION:= misc PKG_DEPENDS:= libpopt -PKG_BUILDDEP+= popt +PKG_BUILDDEP:= popt PKG_SITES:= https://fedorahosted.org/releases/l/o/logrotate/ include ${TOPDIR}/mk/package.mk diff --git a/package/lua/Makefile b/package/lua/Makefile index 59e50bbd8..59cb96791 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -9,20 +9,21 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= d0870f2de55d59c1c8419f36e8fac150 PKG_DESCR:= LUA programming language interpreter PKG_SECTION:= lang -PKG_BUILDDEP:= readline PKG_DEPENDS:= libreadline -PKG_MULTI:= 1 +PKG_BUILDDEP:= readline PKG_URL:= http://www.lua.org/ PKG_SITES:= http://www.lua.org/ftp/ +PKG_MULTI:= 1 -PKG_DESCR_LUAC:= LUA bytecode compiler -PKG_DESCR_LUAEX:= LUA script examples +PKG_SUBPKGS:= LUA LUAC LUA_EXAMPLES +PKGSD_LUAC:= LUA bytecode compiler +PKGSD_LUAEXAMPLES:= LUA script examples include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LUAC},${PKG_SECTION})) -$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LUAEX},${PKG_SECTION})) +$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LUAC},${PKG_SECTION})) +$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LUAEXAMPLES},${PKG_SECTION})) CONFIG_STYLE:= manual MAKE_FLAGS+= CFLAGS="${TCFLAGS} ${TCPPFLAGS} -DLUA_USE_LINUX -fPIC" \ diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 5120212a0..0aca2c6c9 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -13,17 +13,19 @@ PKG_DEPENDS:= libdevmapper libncurses PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ -PKG_DESCR_DM:= device-mapper utility -PKG_DESCR_LIBDM:= device-mapper library -PKG_SECTION_LIBDM:= libs +PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER +PKGSD_DEVICE_MAPPER:= device-mapper utility +PKGSD_LIBDEVMAPPER:= device-mapper library +PKGSC_LIBDEVMAPPER:= libs + DISTFILES:= LVM2.${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION})) -$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION_LIBDM})) +$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION})) +$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER})) CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 410c4e1e4..dd67a6dde 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -3,16 +3,16 @@ include ${TOPDIR}/rules.mk -PKG_NAME= lynx -PKG_VERSION= 2.8.7 -PKG_RELEASE= 1 -PKG_MD5SUM= e36d70f3f09b2d502055ca67f09e363c +PKG_NAME:= lynx +PKG_VERSION:= 2.8.7 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e36d70f3f09b2d502055ca67f09e363c PKG_DESCR:= Standard text browser PKG_SECTION:= browser PKG_DEPENDS:= libncurses libopenssl zlib -PKG_BUILDDEP+= ncurses openssl zlib +PKG_BUILDDEP:= ncurses openssl zlib PKG_URL:= http://lynx.isc.org/ -PKG_SITES= http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/ +PKG_SITES:= http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/ DISTFILES= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/lynx2-8-7 diff --git a/package/madplay/Makefile b/package/madplay/Makefile index 852865e20..01372dce8 100644 --- a/package/madplay/Makefile +++ b/package/madplay/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= madplay PKG_VERSION:= 0.15.2b PKG_RELEASE:= 1 -PKG_BUILDDEP+= libid3tag libmad PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1 PKG_DESCR:= MPEG audio player in fixed point PKG_SECTION:= multimedia PKG_DEPENDS:= libid3tag libmad +PKG_BUILDDEP:= libid3tag libmad PKG_URL:= http://www.underbit.com/products/mad PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \ ftp://ftp.mars.org/pub/mpeg/ diff --git a/package/mc/Makefile b/package/mc/Makefile index 1b89c5b09..4185af106 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -3,17 +3,17 @@ include ${TOPDIR}/rules.mk -PKG_NAME= mc -PKG_VERSION= 4.7.0.2 -PKG_RELEASE= 1 -PKG_MD5SUM= f48b2c8dd140aeb36f59d16a662f0779 +PKG_NAME:= mc +PKG_VERSION:= 4.7.0.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f48b2c8dd140aeb36f59d16a662f0779 PKG_DESCR:= norton commander clone PKG_SECTION:= misc -PKG_NOPARALLEL:= 1 PKG_DEPENDS:= glib libncurses -PKG_BUILDDEP+= glib ncurses +PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.midnight-commander.org/ -PKG_SITES= http://openadk.org/distfiles/ +PKG_SITES:= http://openadk.org/distfiles/ +PKG_NOPARALLEL:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/miau/Makefile b/package/miau/Makefile index ef7f42d66..b63ac5d34 100644 --- a/package/miau/Makefile +++ b/package/miau/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 76f794889d47ad277c25e9c5bbddefa4 PKG_DESCR:= miau is an IRC-bouncer/proxy PKG_SECTION:= chat -PKG_URL:= http://miau.sourceforge.net +PKG_URL:= http://miau.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=miau/} include ${TOPDIR}/mk/package.mk diff --git a/package/miax/Makefile b/package/miax/Makefile index 9117a4c86..276b202b3 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 44f0d2ef46ee2697d890b7b96846adc7 PKG_DESCR:= A console iax (asterisk) client PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt bluez libpthread -PKG_BUILDDEP+= bluez +PKG_BUILDDEP:= bluez PKG_URL:= http://sourceforge.net/projects/miax PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/ diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 03626aef2..7e02b75df 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -9,11 +9,8 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71 PKG_DESCR:= Perl without operating-specific functions PKG_SECTION:= lang -PKG_URL:= www.perl.org -PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ \ - ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0/ \ - ftp://ftp.gmd.de/mirrors/CPAN/src/5.0/ \ - ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ +PKG_URL:= http://www.perl.org/ +PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ DISTFILES:= perl-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/perl-${PKG_VERSION} diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 2065a9698..0c2ccc13b 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -7,18 +7,16 @@ PKG_NAME:= mini-httpd PKG_VERSION:= 1.19 PKG_RELEASE:= 10 PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f -PKG_DESCR:= A small HTTP server +PKG_DESCR:= A small HTTP server with SSL PKG_MULTI:= 1 PKG_SECTION:= www -ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),) PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -endif -PKG_URL:= http://www.acme.com/software/mini_httpd +PKG_BUILDDEP:= openssl +PKG_URL:= http://www.acme.com/software/mini_httpd/ PKG_SITES:= http://www.acme.com/software/mini_httpd/ -PKG_DESCR_1:= htpasswd utility -PKG_DESCR_2:= A small HTTP server with SSL support +PKG_SUBPKGS:= MINI_HTTPD MINI_HTTPD_HTPASSWD +PKGSD_HTPASSWD:= htpasswd utility DISTFILES:= mini_httpd-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION} @@ -26,16 +24,13 @@ WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION})) -$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION})) +$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_HTPASSWD},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - # with OpenSSL -ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) ${MAKE} -C ${WRKBUILD} \ CC="${TARGET_CC}" \ SSL_DEFS="-DUSE_SSL -DHAVE_OPENSSL" \ @@ -43,29 +38,8 @@ ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) SSL_LIBS="-L${STAGING_DIR}/usr/lib -lssl -lcrypto" \ all (cd ${WRKBUILD}; mv mini_httpd mini_httpd-openssl; ) - ${MAKE} -C ${WRKBUILD} clean -endif - # without SSL -ifneq (${ADK_PACKAGE_MINI_HTTPD},) - ${MAKE} -C ${WRKBUILD} \ - CC="${TARGET_CC}" \ - all -endif do-install: - # without SSL -ifneq (${ADK_PACKAGE_MINI_HTTPD},) - ${INSTALL_DIR} ${IDIR_MINI_HTTPD}/etc - ${INSTALL_DATA} ./files/mini_httpd.conf \ - ${IDIR_MINI_HTTPD}/etc/mini_httpd.conf - ${INSTALL_DIR} ${IDIR_MINI_HTTPD}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/mini_httpd ${IDIR_MINI_HTTPD}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/htpasswd \ - ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin/ -endif - # with OpenSSL -ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) ${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/etc ${INSTALL_DATA} ./files/mini_httpd-ssl.conf \ ${IDIR_MINI_HTTPD_OPENSSL}/etc/mini_httpd.conf @@ -73,6 +47,5 @@ ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) ${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl \ ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd -endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile index d52b4f45b..a9ad77793 100644 --- a/package/mini_sendmail/Makefile +++ b/package/mini_sendmail/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= fb1585d2ad81c519a26d83bfd783dee8 PKG_DESCR:= A small sendmail-compatible mail forwarder PKG_SECTION:= mail -PKG_URL:= http://www.acme.com/software/mini_sendmail +PKG_URL:= http://www.acme.com/software/mini_sendmail/ PKG_SITES:= http://www.acme.com/software/mini_sendmail/ DISTFILES:= mini_sendmail-${PKG_VERSION}.tar.gz diff --git a/package/miredo/Makefile b/package/miredo/Makefile index fafce8646..a9ced541a 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -9,12 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= bf49c1ddc068746760787d0cf76e40de PKG_DESCR:= A Teredo client and relay daemon PKG_SECTION:= ipv6 -ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif -PKG_URL:= http://www.remlab.net +PKG_URL:= http://www.remlab.net/ PKG_SITES:= http://www.remlab.net/files/miredo/ +PKG_SUBPKGS:= MIREDO MIREDO_SERVER + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk @@ -33,12 +32,6 @@ CONFIGURE_ARGS+= --disable-chroot \ XAKE_FLAGS+= CXXLINK="\$${LINK}" \ -ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y) -TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ -TLDFLAGS+= -nodefaultlibs -CONFIGURE_ENV+= LIBS="-luClibc++ -lc -lm" -endif - post-install: ${INSTALL_DIR} ${IDIR_MIREDO}/etc/miredo ${IDIR_MIREDO}/usr/sbin ${INSTALL_DIR} ${IDIR_MIREDO}/usr/lib diff --git a/package/mksh/Makefile b/package/mksh/Makefile index fe0288232..7ace9de29 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -9,15 +9,15 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0c3cd172b47eefcdf9a302baa42f5092 PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells -PKG_URL:= http://www.mirbsd.org +PKG_URL:= http://www.mirbsd.org/ 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 +DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.cpio.gz +WRKDIST= ${WRKDIR}/${PKG_NAME} + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/moc/Makefile b/package/moc/Makefile index ed7579e52..7e45410ce 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -11,9 +11,9 @@ PKG_DESCR:= console music player PKG_SECTION:= multimedia PKG_DEPENDS:= libmad libvorbis libcurl libflac ffmpeg libiconv PKG_DEPENDS+= libncurses libid3tag -PKG_BUILDDEP+= ncurses libvorbis curl libmad flac ffmpeg libiconv +PKG_BUILDDEP:= ncurses libvorbis curl libmad flac ffmpeg libiconv PKG_BUILDDEP+= libid3tag -PKG_URL:= http://moc.daper.net +PKG_URL:= http://moc.daper.net/ PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/unstable/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/monit/Makefile b/package/monit/Makefile index f5d334734..49f37c898 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -4,28 +4,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= monit -PKG_VERSION:= 5.0.3 +PKG_VERSION:= 5.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= dae7859ec10551fc941daeae60dee9d3 +PKG_MD5SUM:= 4bbd3845ae1cbab13ec211824e0486dc PKG_DESCR:= An utility for system services monitoring PKG_SECTION:= admin -PKG_DEPENDS:= libpthread -ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y) -PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -endif -PKG_URL:= http://mmonit.com/monit +PKG_DEPENDS:= libpthread libopenssl +PKG_BUILDDEP:= openssl +PKG_URL:= http://mmonit.com/monit/ PKG_SITES:= http://www.tildeslash.com/monit/dist/ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y) CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_DIR}/usr" -else -CONFIGURE_ARGS+= --without-ssl -endif post-install: ${INSTALL_DIR} ${IDIR_MONIT}/etc diff --git a/package/monit/patches/patch-configure b/package/monit/patches/patch-configure deleted file mode 100644 index 8f94b6a48..000000000 --- a/package/monit/patches/patch-configure +++ /dev/null @@ -1,86 +0,0 @@ ---- monit-5.0.3.orig/configure 2009-05-28 23:48:01.000000000 +0200 -+++ monit-5.0.3/configure 2009-06-13 12:57:55.000000000 +0200 -@@ -10206,81 +10206,13 @@ fi - # Architecture/OS detection - # ------------------------------------------------------------------------ - --# Backward compatibility until we get ride of arch settings --if test `uname` = "SunOS" --then -- ARCH="SOLARIS" -- CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS" -- test_kstat="true" -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_CPU_WAIT 1 --_ACEOF -- --elif test `uname` = "Linux" --then -- ARCH="LINUX" -- CFLAGS="$CFLAGS -D _REENTRANT" -- if test `uname -r | awk -F '.' '{print$1$2}'` -ge "26" -- then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_CPU_WAIT 1 --_ACEOF -- -- fi --elif test `uname` = "HP-UX" --then -- ARCH="HPUX" -- CFLAGS="$CFLAGS -D _REENTRANT" -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_CPU_WAIT 1 --_ACEOF -- --elif test `uname` = "OpenBSD" --then -- ARCH="OPENBSD" -- CFLAGS="$CFLAGS -D _REENTRANT" -- test_kvm="true" --elif test `uname` = "FreeBSD" --then -- ARCH="FREEBSD" -- CFLAGS="$CFLAGS -D _REENTRANT" -- test_kvm="true" --elif test `uname` = "NetBSD" --then -- ARCH="NETBSD" -- CFLAGS="$CFLAGS -D _REENTRANT" -- test_kvm="true" --elif test `uname` = "Darwin" --then -- ARCH="DARWIN" -- CFLAGS="$CFLAGS -DREENTRANT -no-cpp-precomp -DNEED_SOCKLEN_T_DEFINED" -- test_kvm="true" -- LIBS="$LIBS -framework System -multiply_defined suppress" --elif test `uname` = "AIX" --then -- ARCH="AIX" -- CFLAGS="$CFLAGS -D _REENTRANT" -- LIBS="$LIBS -lodm" -- # AIX v. 5.2 -- LIBS="$LIBS -lcfg" -- # AIX v. 5.3 -- LIBS="$LIBS -lperfstat" -+ARCH="LINUX" -+CFLAGS="$CFLAGS -D _REENTRANT" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_CPU_WAIT 1 - _ACEOF - --else -- { echo "$as_me:$LINENO: WARNING: Architecture not supported: \`uname\`." >&5 --echo "$as_me: WARNING: Architecture not supported: \`uname\`." >&2;} -- CFLAGS="$CFLAGS -D _REENTRANT" -- ARCH="UNKNOWN" --fi -- -- - # ------------------------------------------------------------------------ - # Resource code - # ------------------------------------------------------------------------ diff --git a/package/motion/Makefile b/package/motion/Makefile index a7a9f1bb5..27b097942 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 3a26c00f3250eacf6fa93c7a7e0249d9 PKG_DESCR:= Webcam motion sensing and logging PKG_SECTION:= multimedia PKG_DEPENDS:= libjpeg libpthread -PKG_BUILDDEP+= jpeg +PKG_BUILDDEP:= jpeg PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/} diff --git a/package/mpc/Makefile b/package/mpc/Makefile index 14e153491..ed59ee973 100644 --- a/package/mpc/Makefile +++ b/package/mpc/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 08af459a18388c35dd81de8f9f1534c9 PKG_DESCR:= music player client PKG_SECTION:= multimedia PKG_DEPENDS:= libmpdclient -PKG_BUILDDEP+= libmpdclient +PKG_BUILDDEP:= libmpdclient PKG_URL:= http://mpd.wikia.com/wiki/Client:Mpc PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 16de1b05f..db11c4b98 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -10,73 +10,50 @@ PKG_MD5SUM:= 3ee746cb9193acfd0e1bd7a8c54af1a6 PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia PKG_DEPENDS:= glib libstdcxx -PKG_BUILDDEP+= glib -ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),) -PKG_BUILDDEP+= alsa-lib -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_AO),) -PKG_BUILDDEP+= libao -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),) -PKG_BUILDDEP+= libid3tag libmad -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),) -PKG_BUILDDEP+= faad2 -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),) -PKG_BUILDDEP+= libvorbis libogg -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),) -PKG_BUILDDEP+= libvorbisidec -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),) -PKG_BUILDDEP+= flac -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),) -PKG_BUILDDEP+= libaudiofile -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),) -PKG_BUILDDEP+= lame libvorbis libshout -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),) -PKG_BUILDDEP+= curl -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),) -PKG_BUILDDEP+= libmms -endif -ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),) -PKG_BUILDDEP+= ffmpeg -endif +PKG_BUILDDEP:= glib PKG_URL:= http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} -PKG_FLAVOURS:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR \ - WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG \ - WITH_SHOUT WITH_CURL +PKG_FLAVOURS:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR +PKG_FLAVOURS+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG +PKG_FLAVOURS+= WITH_SHOUT WITH_CURL + PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib +PKGFB_WITH_ALSA:= alsa-lib PKGFD_WITH_AO:= enable Libao/ESD output PKGFS_WITH_AO:= libao +PKGFB_WITH_AO:= libao PKGFD_WITH_MP3:= enable MP3 support PKGFS_WITH_MP3:= libid3tag libmad +PKGFB_WITH_MP3:= libid3tag libmad PKGFD_WITH_MP4:= enable MP4 support PKGFS_WITH_MP4:= libfaad2 +PKGFB_WITH_MP4:= faad2 PKGFD_WITH_OGG:= enable OGG support PKGFS_WITH_OGG:= libvorbis libogg +PKGFB_WITH_OGG:= libvorbis libogg PKGFD_WITH_TREMOR:= enable fixpoint Vorbis/OGG support PKGFS_WITH_TREMOR:= libvorbisidec +PKGFB_WITH_TREMOR:= libvorbisidec PKGFD_WITH_FLAC:= enable FLAC support PKGFS_WITH_FLAC:= libflac +PKGFB_WITH_FLAC:= flac PKGFD_WITH_WAV:= enable WAVE support PKGFS_WITH_WAV:= libaudiofile +PKGFB_WITH_WAV:= libaudiofile PKGFD_WITH_MMS:= enable MMS support PKGFS_WITH_MMS:= libmms +PKGFB_WITH_MMS:= libmms PKGFD_WITH_FFMPEG:= enable FFMPEG support PKGFS_WITH_FFMPEG:= ffmpeg +PKGFB_WITH_FFMPEG:= ffmpeg PKGFD_WITH_SHOUT:= enable Shoutcast output support PKGFS_WITH_SHOUT:= libshout liblame libvorbis +PKGFB_WITH_SHOUT:= lame libvorbis libshout PKGFD_WITH_CURL:= enable CURL support PKGFS_WITH_CURL:= libcurl +PKGFB_WITH_CURL:= curl include ${TOPDIR}/mk/package.mk diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile index 2f6facdc3..5f7960371 100644 --- a/package/mpg123/Makefile +++ b/package/mpg123/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e7d810a75d22954169f1530a436aca4c PKG_DESCR:= mp3 console player PKG_SECTION:= multimedia PKG_DEPENDS:= libpthread alsa-lib libltdl -PKG_BUILDDEP+= alsa-lib +PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.mpg123.de/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mpg123/} diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 7b516a989..f4ea0a183 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -12,17 +12,15 @@ PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses PKG_DEPENDS+= libogg libpng libpthread libvorbis PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib -PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib +PKG_BUILDDEP:= alsa-lib libmad libvorbis faad2 ncurses zlib PKG_BUILDDEP+= libX11 libXv libpng libXext -ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y) -PKG_BUILDDEP+= DirectFB -endif -PKG_URL:= http://www.mplayerhq.hu +PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://openadk.org/distfiles/ PKG_FLAVOURS:= WITH_DIRECTFB -PKGFS_WITH_DIRECTFB:= directfb PKGFD_WITH_DIRECTFB:= enable DirectFB video output support +PKGFS_WITH_DIRECTFB:= directfb +PKGFB_WITH_DIRECTFB:= DirectFB PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle lemote diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 14f8bef91..94a9b01ab 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b PKG_DESCR:= IPv6 multicast routing daemon PKG_SECTION:= ipv6 -PKG_CXX:= MRD6 PKG_DEPENDS:= kmod-ipv6 PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_CXX:= MRD6 WRKBUILD= ${WRKSRC}/src diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 6f0e22f08..3acf1b8fb 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -4,14 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mt-daapd -PKG_VERSION:= 0.2.4.1 +PKG_VERSION:= 0.2.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8117141e8a88bfab54fe98b6bbd5cb3a +PKG_MD5SUM:= 67bef9fb14d487693b0dfb792c3f1b05 PKG_DESCR:= a multi-threaded DAAP daemon PKG_SECTION:= multimedia PKG_DEPENDS:= libgdbm libid3tag libpthread -PKG_BUILDDEP+= gdbm libid3tag -PKG_URL:= http://www.fireflymediaserver.org +PKG_BUILDDEP:= gdbm libid3tag +PKG_URL:= http://www.fireflymediaserver.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/} include ${TOPDIR}/mk/package.mk diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 7a186a35e..3b17ce96b 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -10,6 +10,7 @@ PKG_DESCR:= MTD utility PKG_SECTION:= fs PKG_TARGET_DEPENDS:= ag241 foxboard +PKG_DFLT_MTD:= y NO_DISTFILES:= 1 @@ -17,8 +18,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_MTD= y - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/mtr/Makefile b/package/mtr/Makefile index 4c901d8e7..26803c386 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 23baca52d0922c2ecba7eba05317868c PKG_DESCR:= ncurses traceroute/ping tool PKG_SECTION:= net PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses -PKG_URL:= http://www.bitwizard.nl/mtr +PKG_BUILDDEP:= ncurses +PKG_URL:= http://www.bitwizard.nl/mtr/ PKG_SITES:= ftp://ftp.bitwizard.nl/mtr/ include ${TOPDIR}/mk/package.mk diff --git a/package/mutt/Makefile b/package/mutt/Makefile index 110db512c..ec0a84175 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 027cdd9959203de0c3c64149a7ee351c PKG_DESCR:= Mail text client PKG_SECTION:= mail PKG_DEPENDS:= libncurses libopenssl -PKG_BUILDDEP+= ncurses openssl -PKG_URL:= http://www.mutt.org +PKG_BUILDDEP:= ncurses openssl +PKG_URL:= http://www.mutt.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mutt/} include ${TOPDIR}/mk/package.mk diff --git a/package/mysql/Makefile b/package/mysql/Makefile index 033ffebb7..fb3d1404c 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -10,10 +10,11 @@ PKG_MD5SUM:= d04c54d1cfbd8c6c8650c8d078f885b2 PKG_DESCR:= MySQL client library PKG_SECTION:= db PKG_DEPENDS:= libncurses zlib -PKG_BUILDDEP+= ncurses zlib readline +PKG_BUILDDEP:= ncurses zlib readline PKG_URL:= http://www.mysql.com/ PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/} +PKG_SUBPKGS:= LIBMYSQLCLIENT PKG_HOST_DEPENDS:= !cygwin include ${TOPDIR}/mk/package.mk diff --git a/package/nand/Makefile b/package/nand/Makefile index 33f9ddcf0..ec5984f6f 100644 --- a/package/nand/Makefile +++ b/package/nand/Makefile @@ -10,6 +10,7 @@ PKG_DESCR:= NAND utility PKG_SECTION:= fs PKG_TARGET_DEPENDS:= routerboard +PKG_DFLT_NAND:= y NO_DISTFILES:= 1 @@ -17,8 +18,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,NAND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_NAND= y - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/nano/Makefile b/package/nano/Makefile index afab4ffff..df45c05d4 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -10,11 +10,12 @@ PKG_MD5SUM:= 6304308afb1f7ef4a5e93eb99206632a PKG_DESCR:= An enhanced clone of the Pico editor PKG_SECTION:= editor PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses -PKG_URL:= http://www.nano-editor.org +PKG_BUILDDEP:= ncurses +PKG_URL:= http://www.nano-editor.org/ PKG_SITES:= http://www.nano-editor.org/dist/v2.2/ PKG_FLAVOURS:= TINY +PKGFD_TINY:= tiny nano include ${TOPDIR}/mk/package.mk diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 053d06fe2..f2659bfa7 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -12,13 +12,14 @@ PKG_SECTION:= libs PKG_URL:= http://www.gnu.org/software/ncurses/ PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/} -PKG_DESCR_LIB_DEV:= development files for libncurses -PKG_SECTION_LIB_DEV:= devel +PKG_SUBPKGS:= LIBNCURSES LIBNCURSES_DEV +PKGSD_LIBNCURSES_DEV:= development files for libncurses +PKGSC_LIBNCURSES_DEV:= devel include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV})) +$(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile index bf60a60cc..20000673b 100644 --- a/package/ndisc/Makefile +++ b/package/ndisc/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= cb8d70564b8d40aae95e19592c6be183 PKG_DESCR:= ICMPv6 Neighbour Discovery tools PKG_SECTION:= ipv6 -PKG_URL:= http://www.remlab.net +PKG_URL:= http://www.remlab.net/ PKG_SITES:= http://www.remlab.net/files/ndisc6/ +PKG_SUBPKGS:= NDISC6 RDISC6 TCPTRACEROUTE6 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/neon/Makefile b/package/neon/Makefile index ddb417224..3d14d58fd 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= ba1015b59c112d44d7797b62fe7bee51 PKG_DESCR:= HTTP and WebDAV library PKG_SECTION:= libs PKG_DEPENDS:= libpthread libxml2 libopenssl zlib -PKG_BUILDDEP+= libpthread libxml2 openssl zlib +PKG_BUILDDEP:= libpthread libxml2 openssl zlib PKG_URL:= http://webdav.org/neon/ PKG_SITES:= http://webdav.org/neon/ diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index ddb103bbe..7352a3d07 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -10,16 +10,17 @@ PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1 PKG_DESCR:= SNMP Agent PKG_SECTION:= net/misc PKG_DEPENDS:= libnetsnmp libelf -PKG_BUILDDEP+= libelf -PKG_NOPARALLEL:= 1 +PKG_BUILDDEP:= libelf PKG_URL:= http://www.net-snmp.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} +PKG_NOPARALLEL:= 1 -PKG_DESCR_UTILS:= SNMP utilities -PKG_DEPENDS_UTILS:= libnetsnmp libelf -PKG_DESCR_LIBS:= SNMP library -PKG_DEPENDS_LIBS:= libelf -PKG_SECTION_LIBS:= libs +PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP +PKGSD_SNMP_UTILS:= SNMP utilities +PKGSS_SNMP_UTILS:= libnetsnmp libelf +PKGSD_LIBNETSNMP:= SNMP library +PKGSS_LIBNETSNMP:= libelf +PKGSC_LIBNETSNMP:= libs PKG_FLAVOURS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support @@ -27,8 +28,8 @@ PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTILS},${PKG_DESCR_UTILS},${PKG_SECTION})) -$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIBS},${PKG_DESCR_LIBS},${PKG_SECTION_LIBS})) +$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SNMP_UTILS},${PKGSD_SNMP_UTILS},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBNETSNMP},${PKGSD_LIBNETSNMP},${PKGSC_LIBNETSNMP})) SNMP_TRANSPORTS_INCLUDED:= UDP TCP Callback Unix SNMP_TRANSPORTS_EXCLUDED:= Alias diff --git a/package/netperf/Makefile b/package/netperf/Makefile index a4fa41a90..6ee21da1d 100644 --- a/package/netperf/Makefile +++ b/package/netperf/Makefile @@ -10,8 +10,7 @@ PKG_MD5SUM:= 391a0d98954c72a6ad7f08b8a115e1ce PKG_DESCR:= Program and service to do network performance measurement. PKG_SECTION:= net PKG_URL:= http://www.netperf.org/netperf/ -PKG_SITES:= ftp://ftp.netperf.org/netperf/archive/ \ - ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ +PKG_SITES:= ftp://ftp.netperf.org/netperf/archive/ include ${TOPDIR}/mk/package.mk diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 941d3ac9f..b57a70b95 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,29 +4,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 1.2.1 -PKG_RELEASE:= 2 +PKG_VERSION:= 1.2.2 +PKG_RELEASE:= 1 PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs PKG_DEPENDS:= kmod-nfsd portmap - -ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y) -PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss -endif -ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y) -PKG_BUILDDEP+= libtirpc rpcbind -endif PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - PKG_FLAVOURS:= WITH_KERBEROS WITH_TIRPC PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue +PKGFB_WITH_KERBEROS:= libnfsidmap krb5 libevent libgssglue librpcsecgss PKGFD_WITH_TIRPC:= enable Transport Independent RPC PKGFS_WITH_TIRPC:= libtirpc rpcbind +PKGFB_WITH_TIRPC:= libtirpc rpcbind + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 22e84125b..35a043604 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -9,11 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net -PKG_CXX:= NMAP PKG_DEPENDS:= libdnet libpcap libpcre -PKG_BUILDDEP+= libdnet libpcap pcre -PKG_URL:= http://nmap.org +PKG_BUILDDEP:= libdnet libpcap pcre +PKG_URL:= http://nmap.org/ PKG_SITES:= http://download.insecure.org/nmap/dist/ +PKG_CXX:= NMAP DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/nss/Makefile b/package/nss/Makefile index e4795f261..a8b80def9 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -9,13 +9,13 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= da42596665f226de5eb3ecfc1ec57cd1 PKG_DESCR:= Network Security Services (NSS) library PKG_SECTION:= libs -PKG_BUILDDEP+= nspr zlib -PKG_NOPARALLEL:= 1 +PKG_BUILDDEP:= nspr zlib PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/ +PKG_NOPARALLEL:= 1 -PKG_TARGET_DEPENDS:= !foxboard PKG_HOST_DEPENDS:= !cygwin +PKG_TARGET_DEPENDS:= !foxboard WRKSRC= ${WRKDIST}/mozilla/security/nss diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile index 41d01c3f0..13a6b9370 100644 --- a/package/ntfs-3g/Makefile +++ b/package/ntfs-3g/Makefile @@ -3,15 +3,15 @@ include ${TOPDIR}/rules.mk -PKG_NAME= ntfs-3g -PKG_VERSION= 2010.1.16 -PKG_RELEASE= 1 -PKG_MD5SUM= e104c914e8d7d29ee83e63d46afbba25 +PKG_NAME:= ntfs-3g +PKG_VERSION:= 2010.1.16 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e104c914e8d7d29ee83e63d46afbba25 PKG_DESCR:= ntfs filesystem driver PKG_SECTION:= kernel PKG_DEPENDS:= kmod-fuse-fs PKG_URL:= http://tuxera.com -PKG_SITES= http://tuxera.com/opensource/ +PKG_SITES:= http://tuxera.com/opensource/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile index e52c40bb4..1a7f5e69c 100644 --- a/package/ntpclient/Makefile +++ b/package/ntpclient/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= cb98711f11769cdd22fc592844cef414 PKG_DESCR:= NTP client for setting system time from NTP servers PKG_SECTION:= ntp PKG_DEPENDS:= libpthread -PKG_URL:= http://doolittle.icarus.com/ntpclient +PKG_URL:= http://doolittle.icarus.com/ntpclient/ PKG_SITES:= http://doolittle.icarus.com/ntpclient/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz diff --git a/package/nut/Makefile b/package/nut/Makefile index a239af2cc..833f271e7 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -9,25 +9,19 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66 PKG_DESCR:= Network UPS Tools PKG_SECTION:= net/misc -ifneq (${ADK_PACKAGE_NUT_SSL},) -PKG_BUILDDEP+= openssl -endif -ifneq (${ADK_PACKAGE_NUT_USB},) -PKG_BUILDDEP+= libusb -endif -ifneq (${ADK_PACKAGE_NUT_SNMP},) -PKG_BUILDDEP+= net-snmp -endif -PKG_URL:= http://www.networkupstools.org +PKG_URL:= http://www.networkupstools.org/ PKG_SITES:= http://www.networkupstools.org/source/2.4/ PKG_FLAVOURS:= SSL SNMP USB -PKGFD_SSL:= enable SSL support -PKGFS_SSL:= libopenssl PKGFD_SNMP:= enable SNMP support PKGFS_SNMP:= libnetsnmp +PKGFB_SNMP:= net-snmp PKGFD_USB:= enable USB support PKGFS_USB:= libusb +PKGFB_USB:= libusb +PKGFD_SSL:= enable SSL support +PKGFS_SSL:= libopenssl +PKGFB_SSL:= openssl include ${TOPDIR}/mk/package.mk diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index 67399ba12..acc8b5b38 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -10,14 +10,15 @@ PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb PKG_DESCR:= bluetooth ftp application PKG_SECTION:= bluetooth PKG_DEPENDS:= openobex libiconv -PKG_BUILDDEP+= openobex libiconv +PKG_BUILDDEP:= openobex libiconv PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SUBPKGS:= OBEXFTP LIBOBEXFTP +PKGSD_LIBOBEXFTP:= obexftp library +PKGSC_LIBOBEXFTP:= libs -PKG_DESCR_LIB:= obexftp library -PKG_SECTION_LIB:= libs +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 ifeq ($(ADK_STATIC),y) PKG_OPTS:= libmix @@ -26,7 +27,7 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OBEXFTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBOBEXFTP,libobexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB},${PKG_SECTION_LIB},${PKG_OPTS})) +$(eval $(call PKG_template,LIBOBEXFTP,libobexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOBEXFTP},${PKGSC_LIBOBEXFTP},${PKG_OPTS})) ifeq ($(ADK_STATIC),y) XAKE_FLAGS+= STATIC_CFLAGS=-all-static diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 566a30f19..19a999d76 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -9,9 +9,12 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= acf15dbd0af521a6826541b567c6473a PKG_DESCR:= Optimized Link State Routing protocol PKG_SECTION:= wifi -PKG_MULTI:= 1 -PKG_URL:= http://www.olsr.org +PKG_URL:= http://www.olsr.org/ PKG_SITES:= http://www.olsr.org/releases/0.5/ +PKG_MULTI:= 1 + +PKG_SUBPKGS:= OLSRD OLSRD_MOD_DYN_GW OLSRD_MOD_HTTPINFO OLSRD_MOD_NAMESERVICE +PKG_SUBPKGS+= OLSRD_MOD_TAS include ${TOPDIR}/mk/package.mk @@ -40,10 +43,9 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -TCFLAGS+= -fPIC +TCFLAGS+= -fPIC do-build: - rm -rf ${WRKINST} mkdir -p ${WRKINST} ${MAKE} -C "${WRKBUILD}" \ ${TARGET_CONFIGURE_OPTS} \ diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index 8c2ef472e..0caddd110 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -10,10 +10,12 @@ PKG_MD5SUM:= 813d62d7afe7b2c2d8f3df0a6c9d9331 PKG_DESCR:= Open Crypto Development Kit library PKG_SECTION:= libs PKG_DEPENDS:= libgcrypt libgpg-error zlib -PKG_BUILDDEP+= libgcrypt libgpg-error zlib +PKG_BUILDDEP:= libgcrypt libgpg-error zlib PKG_URL:= http://www.gnu.org/software/gnutls/download.html PKG_SITES:= ftp://ftp.gnutls.org/pub/gnutls/opencdk/ +PKG_SUBPKGS:= LIBOPENCDK + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/openct/Makefile b/package/openct/Makefile index eb4b841d1..fb5cf15b5 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openct PKG_VERSION:= 0.6.16 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libtool libusb PKG_MD5SUM:= d8d8c63269985303a303a218c4b953d7 PKG_DESCR:= drivers for smart card readers PKG_SECTION:= crypto PKG_DEPENDS:= libltdl libusb -PKG_URL:= http://www.opensc-project.org/openct +PKG_BUILDDEP:= libtool libusb +PKG_URL:= http://www.opensc-project.org/openct/ PKG_SITES:= http://www.opensc-project.org/files/openct/ include ${TOPDIR}/mk/package.mk diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 5404170ee..f9a34f891 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -10,16 +10,17 @@ PKG_MD5SUM:= 90150b8c0d0192e10b30157e68844ddf PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsasl2 -PKG_BUILDDEP+= cyrus-sasl openssl libdb +PKG_BUILDDEP:= cyrus-sasl openssl libdb PKG_URL:= http://www.openldap.org/ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ -PKG_DESCR_LDAP_UTILS:= OpenLDAP utilities -PKG_DEPENDS_LDAP_UTILS:=libopenldap -PKG_SECTION_LDAP_UTILS:=net/misc -PKG_DESCR_SLAPD:= OpenLDAP server daemon -PKG_DEPENDS_SLAPD:= libopenldap -PKG_SECTION_SLAPD:= net/misc +PKG_SUBPKGS:= LIBOPENLDAP OPENLDAP_UTILS OPENLDAP_SLAPD +PKGSD_OPENLDAP_UTILS:= OpenLDAP utilities +PKGSS_OPENLDAP_UTILS:= libopenldap +PKGSC_OPENLDAP_UTILS:= net/misc +PKGSD_OPENLDAP_SLAPD:= OpenLDAP server daemon +PKGSS_OPENLDAP_SLAPD:= libopenldap +PKGSC_OPENLDAP_SLAPD:= net/misc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz @@ -29,8 +30,8 @@ PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LDAP_UTILS},${PKG_DESCR_LDAP_UTILS},${PKG_SECTION_LDAP_UTILS})) -$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SLAPD},${PKG_DESCR_SLAPD},${PKG_SECTION_SLAPD})) +$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_UTILS},${PKGSD_OPENLDAP_UTILS},${PKGSC_OPENLDAP_UTILS})) +$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_SLAPD},${PKGSD_OPENLDAP_SLAPD},${PKGSC_OPENLDAP_SLAPD})) PKG_CONFIGURE_OPTIONS+= \ --enable-slapd \ diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile index c2ddc7bac..0ed6754c9 100644 --- a/package/openntpd/Makefile +++ b/package/openntpd/Makefile @@ -9,11 +9,8 @@ PKG_RELEASE:= 18 PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3 PKG_DESCR:= NTP server daemon PKG_SECTION:= ntp -PKG_URL:= http://www.openntpd.org -PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ - ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \ - ftp://ftp.fr.openbsd.org/pub/OpenBSD/OpenNTPD/ \ - ftp://ftp.sunet.se/pub/OpenBSD/OpenNTPD/ +PKG_URL:= http://www.openntpd.org/ +PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ include ${TOPDIR}/mk/package.mk diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 19a2cf399..84cc3df8f 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol PKG_SECTION:= bluetooth -PKG_BUILDDEP+= bluez +PKG_BUILDDEP:= bluez PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 89a32d2fe..9218a8c5e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 98fa151e947941f9c3f27420fdf47c11 PKG_DESCR:= utilities to access smart cards PKG_SECTION:= crypto -PKG_BUILDDEP+= libtool -PKG_URL:= http://www.opensc-project.org/opensc +PKG_BUILDDEP:= libtool +PKG_URL:= http://www.opensc-project.org/opensc/ PKG_SITES:= http://www.opensc-project.org/files/opensc/ include ${TOPDIR}/mk/package.mk diff --git a/package/opensips/Makefile b/package/opensips/Makefile index a1cd0089e..e83add75f 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -6,15 +6,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:= opensips PKG_VERSION:= 1.6.1 PKG_RELEASE:= 1 +PKG_VARIANT:= tls PKG_MD5SUM:= e7e59910183ca8a213c76a7a80789ea1 PKG_DESCR:= a high-performance, configurable, free SIP server PKG_SECTION:= phone -PKG_MULTI:= 1 -PKG_VARIANT:= tls PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -PKG_URL:= http://opensips.org +PKG_BUILDDEP:= openssl +PKG_URL:= http://opensips.org/ PKG_SITES:= http://opensips.org/pub/opensips/$(PKG_VERSION)/src/ +PKG_MULTI:= 1 + +PKG_SUBPKGS:= OPENSIPS OPENSIPS_MOD_ACCOUNTING OPENSIPS_MOD_AUTH +PKG_SUBPKGS+= OPENSIPS_MOD_AUTH_DB OPENSIPS_MOD_AVPOPS OPENSIPS_MOD_DISPATCHER +PKG_SUBPKGS+= OPENSIPS_MOD_DIVERSION OPENSIPS_MOD_FLATSTORE OPENSIPS_MOD_GFLAGS +PKG_SUBPKGS+= OPENSIPS_MOD_GROUP OPENSIPS_MOD_MEDIAPROXY OPENSIPS_MOD_MSILO +PKG_SUBPKGS+= OPENSIPS_MOD_NATHELPER OPENSIPS_MOD_OPTIONS OPENSIPS_MOD_PDT +PKG_SUBPKGS+= OPENSIPS_MOD_PERMISSIONS OPENSIPS_MOD_PIKE OPENSIPS_MOD_SMS +PKG_SUBPKGS+= OPENSIPS_MOD_UAC OPENSIPS_MOD_UAC_REDIRECT OPENSIPS_MOD_URI +PKG_SUBPKGS+= OPENSIPS_MOD_XLOG DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-$(PKG_VARIANT)_src.tar.gz WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_VARIANT) diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 4e30924c3..1b89b4ae0 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -5,41 +5,46 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh PKG_VERSION:= 5.5p1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 88633408f4cb1eb11ec7e2ec58b519eb PKG_DESCR:= OpenSSH server PKG_SECTION:= net/security PKG_DEPENDS:= zlib libopenssl libpthread -PKG_BUILDDEP+= zlib openssl -ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y) -PKG_DEPENDS+= libkrb5 libcom-err -PKG_BUILDDEP+= krb5 -endif -ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y) -PKG_DEPENDS+= libheimdal libcom-err -PKG_BUILDDEP+= heimdal -endif -PKG_URL:= http://www.openssh.com +PKG_BUILDDEP:= zlib openssl +PKG_URL:= http://www.openssh.com/ PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ -PKG_DESCR_CLIENT:= OpenSSH client -PKG_DESCR_CLIENT_UTILS:=OpenSSH client utilities -PKG_DESCR_SFTP_CLIENT:= OpenSSH sftp client -PKG_DESCR_SFTP_SERVER:= OpenSSH sftp server +PKG_SUBPKGS:= OPENSSH_SERVER OPENSSH_CLIENT OPENSSH_CLIENT_UTILS +PKG_SUBPKGS+= OPENSSH_SFTP_CLIENT OPENSSH_SFTP_SERVER +PKGSD_OPENSSH_CLIENT:= OpenSSH client +PKGSD_OPENSSH_CLIENT_UTILS:= OpenSSH client utilities +PKGSD_OPENSSH_SFTP_CLIENT:= OpenSSH sftp client +PKGSD_OPENSSH_SFTP_SERVER:= OpenSSH sftp server + +PKG_CHOICES:= NOKRB WITH_KRB5 WITH_HEIMDAL +PKGCD_NOKRB:= no Kerberos support +PKGCD_WITH_KRB5:= with MIT Kerberos +PKGCS_WITH_KRB5:= libkrb5 libcom-err +PKGCB_WITH_KRB5:= krb5 +PKGCD_WITH_HEIMDAL:= with Heimdal Kerberos +PKGCS_WITH_HEIMDAL:= libheimdal libcom-err +PKGCB_WITH_HEIMDAL:= heimdal include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENT},${PKG_SECTION})) -$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENT_UTILS},${PKG_SECTION})) -$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFTP_CLIENT},${PKG_SECTION})) -$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFTP_SERVER},${PKG_SECTION})) +$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_CLIENT_UTILS},${PKG_SECTION})) +$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_OPENSSH_WITH_KERBEROS),y) +ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y) CONFIGURE_ARGS+= --with-kerberos5="${STAGING_DIR}/usr" -else -CONFIGURE_ARGS+= --without-kerberos5 endif +ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y) +CONFIGURE_ARGS+= --with-kerberos5="${STAGING_DIR}/usr" +endif + CONFIGURE_ENV+= LD='${TARGET_CC}' \ ac_cv_func_setlogin=no \ ac_cv_lib_nsl_yp_match=no diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile index ce523c517..06199ed39 100644 --- a/package/openssl-pkcs11/Makefile +++ b/package/openssl-pkcs11/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 840af6e54dc21445c54f74e15005ba4d PKG_DESCR:= pkcs11 engine for openssl PKG_SECTION:= crypto -PKG_BUILDDEP+= libp11 +PKG_BUILDDEP:= libp11 PKG_URL:= http://www.opensc-project.org/engine_pkcs11 PKG_SITES:= http://www.opensc-project.org/files/engine_pkcs11/ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 0ab3c2e7f..fcae8c659 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -10,16 +10,17 @@ PKG_MD5SUM:= e3873edfffc783624cfbdb65e2249cbd PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP+= zlib +PKG_BUILDDEP:= zlib PKG_URL:= http://www.openssl.org/ PKG_SITES:= http://www.openssl.org/source/ -PKG_DESCR_UTIL:= OpenSSL command line tool -PKG_SECTION_UTIL:= crypto -PKG_DEPENDS_UTIL:= libopenssl -PKG_DESCR_DEV:= development files for openssl -PKG_SECTION_DEV:= devel -PKG_DEPENDS_DEV:= libopenssl +PKG_SUBPKGS:= LIBOPENSSL LIBOPENSSL_DEV OPENSSL_UTIL +PKGSD_OPENSSL_UTIL:= OpenSSL command line tool +PKGSC_OPENSSL_UTIL:= crypto +PKGSS_OPENSSL_UTIL:= libopenssl +PKGSD_LIBOPENSSL_DEV:= development files for openssl +PKGSC_LIBOPENSSL_DEV:= devel +PKGSS_LIBOPENSSL_DEV:= libopenssl PKG_FLAVOURS:= WITH_EC PKGFD_WITH_EC:= enable Elliptic Curve crypto @@ -28,8 +29,8 @@ PKGSUB_WITH_EC:= libopenssl include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR_DEV},${PKG_SECTION_DEV})) -$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL})) +$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV})) +$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 3e261e521..967a951d4 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -15,10 +15,9 @@ PKG_DEPENDS+= kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport PKG_DEPENDS+= kmod-crypto-sha1 kmod-crypto-md5 PKG_DEPENDS+= kmod-crypto-null kmod-crypto-des kmod-crypto-aes PKG_DEPENDS+= kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc -PKG_BUILDDEP+= gmp +PKG_BUILDDEP:= gmp PKG_URL:= http://www.openswan.org/ PKG_SITES:= http://www.openswan.org/download/ - PKG_NOPARALLEL:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index bc98c1089..f28543afe 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -10,17 +10,15 @@ PKG_MD5SUM:= b273ed2b5ec8616fb9834cde8634bce7 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net/security PKG_DEPENDS:= kmod-tun libopenssl -PKG_BUILDDEP+= openssl -ifeq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),y) -PKG_BUILDDEP+= liblzo -endif -PKG_URL:= http://openvpn.net -PKG_SITES:= http://openvpn.net/release/ \ - ${MASTER_SITE_SOURCEFORGE:=openvpn/} +PKG_BUILDDEP:= openssl +PKG_URL:= http://openvpn.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openvpn/} +PKG_SUBPKGS:= OPENVPN OPENVPN_EASY_RSA PKG_FLAVOURS:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS PKGFD_WITH_LZO:= enable LZO compression support PKGFS_WITH_LZO:= liblzo +PKGFB_WITH_LZO:= liblzo PKGFD_WITH_MANAGEMENT:= enable management server support PKGFD_WITH_HTTPPROXY:= enable http proxy support PKGFD_WITH_SOCKS:= enable socks proxy support diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 108f78db2..956f3a1a3 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -10,12 +10,12 @@ PKG_MD5SUM:= 4e407093ac06200185d5a5e6437d7242 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx -PKG_BUILDDEP+= popt binutils -PKG_URL:= http://oprofile.sourceforge.net +PKG_BUILDDEP:= popt binutils +PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} -CFLINE_OPROFILE:= select BUSYBOX_EXPR PKG_TARGET_DEPENDS:= !foxboard +PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR include $(TOPDIR)/mk/package.mk diff --git a/package/osiris/Makefile b/package/osiris/Makefile index b7cb1ebc7..b07c1bbd8 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 1951c7dc0fe729af9ffaf58910340d12 PKG_DESCR:= Host Integrity Monitoring System (scanning agent) PKG_SECTION:= admin PKG_DEPENDS:= libopenssl libpthread -PKG_BUILDDEP+= openssl -PKG_URL:= http://osiris.shmoo.com +PKG_BUILDDEP:= openssl +PKG_URL:= http://osiris.shmoo.com/ PKG_SITES:= http://osiris.shmoo.com/data/ include ${TOPDIR}/mk/package.mk diff --git a/package/owfs/Makefile b/package/owfs/Makefile index 7df4bbf83..b260dcb24 100644 --- a/package/owfs/Makefile +++ b/package/owfs/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c287d96c629b5deb6c85e6a82eecdc8a PKG_DESCR:= software to access 1-wire devices PKG_SECTION:= misc -PKG_BUILDDEP+= fuse +PKG_BUILDDEP:= fuse PKG_URL:= http://owfs.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=owfs/} diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile index 0de71ee63..eb561bf70 100644 --- a/package/p910nd/Makefile +++ b/package/p910nd/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 10 PKG_MD5SUM:= 7bf752532d26c9106f8039db95df3a6b PKG_DESCR:= A small non-spooling printer server PKG_SECTION:= net/misc -PKG_URL:= http://www.etherboot.org/p910nd +PKG_URL:= http://www.etherboot.org/p910nd/ PKG_SITES:= http://www.etherboot.org/p910nd/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/palantir/Makefile b/package/palantir/Makefile index 210dcdfc7..18143c0a1 100644 --- a/package/palantir/Makefile +++ b/package/palantir/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 3a5b1fb340857f6d8e357bf39b77583e PKG_DESCR:= A multichannel interactive streaming solution PKG_SECTION:= multimedia PKG_DEPENDS:= libjpeg libpthread -PKG_BUILDDEP+= jpeg -PKG_URL:= http://www.fastpath.it/products/palantir +PKG_BUILDDEP:= jpeg +PKG_URL:= http://www.fastpath.it/products/palantir/ PKG_SITES:= http://www.fastpath.it/products/palantir/pub/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/pango/Makefile b/package/pango/Makefile index 3d84ecbb7..f2ce2392d 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= aa3dee16506275a36c6c9239c9e2dfdd PKG_DESCR:= pango library PKG_SECTION:= libs -PKG_URL:= http://www.pango.org +PKG_URL:= http://www.pango.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=/pango/1.28/} ifeq ($(ADK_STATIC),y) diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile index 600d7994d..118f1ee15 100644 --- a/package/parprouted/Makefile +++ b/package/parprouted/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 570f5deaf09600df8f80f589de79ecdb PKG_DESCR:= a proxy ARP daemon PKG_SECTION:= proxy PKG_DEPENDS:= libpthread -PKG_URL:= http://www.hazard.maks.net/parprouted +PKG_URL:= http://www.hazard.maks.net/parprouted/ PKG_SITES:= http://www.hazard.maks.net/parprouted/ include ${TOPDIR}/mk/package.mk diff --git a/package/parted/Makefile b/package/parted/Makefile index 3d237277b..cd8f73bd3 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d PKG_DESCR:= GNU parted PKG_SECTION:= fs PKG_DEPENDS:= libuuid libreadline libdevmapper libpthread -PKG_BUILDDEP+= e2fsprogs lvm readline +PKG_BUILDDEP:= e2fsprogs lvm readline PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} diff --git a/package/patch/Makefile b/package/patch/Makefile index 975da3970..909fdbf0d 100644 --- a/package/patch/Makefile +++ b/package/patch/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= dacfb618082f8d3a2194601193cf8716 PKG_DESCR:= GNU patch PKG_SECTION:= utils -PKG_URL:= http://www.gnu.org/software/patch +PKG_URL:= http://www.gnu.org/software/patch/ PKG_SITES:= ${MASTER_SITE_GNU:=patch/} include $(TOPDIR)/mk/package.mk diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 688d83c3a..c7df89545 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -10,10 +10,9 @@ PKG_MD5SUM:= d07da501bb11e6af40acd036536c2e9a PKG_DESCR:= PCI Utilities PKG_SECTION:= utils PKG_DEPENDS:= zlib -PKG_BUILDDEP+= zlib -PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils -PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ \ - ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ +PKG_BUILDDEP:= zlib +PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/ +PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ include ${TOPDIR}/mk/package.mk diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile index d99b1a7d1..3d987083b 100644 --- a/package/pcmciautils/Makefile +++ b/package/pcmciautils/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ee5837214d297661c8b8189055a351fc PKG_DESCR:= Utilities for PCMCIA subsystem PKG_SECTION:= utils -PKG_BUILDDEP+= sysfsutils +PKG_BUILDDEP:= sysfsutils PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/ diff --git a/package/pcre/Makefile b/package/pcre/Makefile index aabb33acf..9f6d88fad 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 214462e9718e3f9197cba114dc6b00b8 PKG_DESCR:= a Perl Compatible Regular Expression library PKG_SECTION:= libs -PKG_URL:= http://www.pcre.org +PKG_URL:= http://www.pcre.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} +PKG_SUBPKGS:= LIBPCRE + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index e055ccd70..efe299c71 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= fc3fd0e83090ecc81e5b32700fa246c2 PKG_DESCR:= middleware for smartcards PKG_SECTION:= crypto -PKG_BUILDDEP+= libusb libusb-compat PKG_DEPENDS:= libusb libusb-compat libpthread ccid +PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://pcsclite.alioth.debian.org/ PKG_SITES:= https://alioth.debian.org/frs/download.php/3279/ diff --git a/package/perl/Makefile b/package/perl/Makefile index f666c76fc..d1c16f5f5 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -9,13 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71 PKG_DESCR:= Perl without operating-specific functions PKG_SECTION:= lang -PKG_URL:= www.perl.org -PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ \ - ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0/ \ - ftp://ftp.gmd.de/mirrors/CPAN/src/5.0/ \ - ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ +PKG_URL:= http://www.perl.org +PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ -CFLINE_PERL:= depends on ADK_NATIVE +PKG_CFLINE_PERL:= depends on ADK_NATIVE include ${TOPDIR}/mk/package.mk diff --git a/package/php/Makefile b/package/php/Makefile index 2ceac7f85..be9a982ad 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -7,42 +7,27 @@ PKG_NAME:= php PKG_VERSION:= 5.3.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 4480d7c6d6b4a86de7b8ec8f0c2d1871 -PKG_DESCR:= PHP CLI +PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang -PKG_MULTI:= 1 PKG_DEPENDS:= libopenssl zlib -PKG_BUILDDEP+= openssl zlib -ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),) -PKG_BUILDDEP+= curl -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_GD),) -PKG_BUILDDEP+= libgd libpng -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),) -PKG_BUILDDEP+= gmp -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) -PKG_BUILDDEP+= openldap -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),) -PKG_BUILDDEP+= mysql -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),) -PKG_BUILDDEP+= pcre -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),) -PKG_BUILDDEP+= postgresql -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),) -PKG_BUILDDEP+= sqlite -endif -ifneq ($(ADK_PACKAGE_PHP_MOD_XML),) -PKG_BUILDDEP+= expat -endif -PHP_URL:= http://www.php.net +PKG_BUILDDEP:= openssl zlib +PHP_URL:= http://www.php.net/ PKG_SITES:= http://de.php.net/distributions/ +PKG_MULTI:= 1 + +PKG_SUBPKGS:= PHP PHP_CLI PHP_FASTCGI +PKGSD_PHP_FASTCGI:= PHP for FastCGI usage +PKGSD_PHP_CLI:= PHP CLI -PKG_DESCR_FCGI:= PHP for FastCGI usage +PKGSB_MOD_CURL:= curl +PKGSB_MOD_GD:= libgd libpng +PKGSB_MOD_GMP:= gmp +PKGSB_MOD_LDAP:= openldap +PKGSB_MOD_MYSQL:= mysql +PKGSB_MOD_PGSQL:= postgresql +PKGSB_MOD_PCRE:= pcre +PKGSB_MOD_SQLITE:= sqlite +PKGSB_MOD_XML:= expat PKG_HOST_DEPENDS:= !cygwin @@ -51,8 +36,8 @@ PKG_HOST_DEPENDS:= !cygwin include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FCGI},${PKG_SECTION})) +$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_CLI},${PKG_SECTION})) +$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_FASTCGI},${PKG_SECTION})) define PKG_mod_template diff --git a/package/picocom/Makefile b/package/picocom/Makefile index 9b33eaf52..592a6beba 100644 --- a/package/picocom/Makefile +++ b/package/picocom/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 08fcc5f6bb9e7676a2569386d5ea9f70 PKG_DESCR:= minimal dumb-terminal emulation program PKG_SECTION:= serial -PKG_URL:= http://efault.net/npat/hacks/picocom +PKG_URL:= http://efault.net/npat/hacks/picocom/ PKG_SITES:= http://efault.net/npat/hacks/picocom/dist/ include ${TOPDIR}/mk/package.mk diff --git a/package/pkg-config/Makefile b/package/pkg-config/Makefile index 7fc7e0af9..23229b956 100644 --- a/package/pkg-config/Makefile +++ b/package/pkg-config/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a3270bab3f4b69b7dc6dbdacbcae9745 PKG_DESCR:= a helper tool used when compiling applications and libraries. PKG_SECTION:= lang -PKG_BUILDDEP+= glib popt PKG_DEPENDS:= glib libpopt +PKG_BUILDDEP:= glib popt PKG_URL:= http://pkg-config.freedesktop.org/wiki/ PKG_SITES:= http://pkgconfig.freedesktop.org/releases/ diff --git a/package/pkgmaker b/package/pkgmaker deleted file mode 100644 index e391c680b..000000000 --- a/package/pkgmaker +++ /dev/null @@ -1,354 +0,0 @@ -unset MAKEFLAGS -export MAKEFLAGS=s -cd "$(dirname "$0")" -export TOPDIR=$(realpath ..) -if gmake --help >/dev/null 2>&1; then - export GMAKE=gmake -else - export GMAKE=make -fi -GMAKE="$GMAKE --no-print-directory" -(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) -typeset -L$x_cols pbar - -# check for trailing whitespace -#grep -H '[[:space:]]$' */Makefile && print "Found trailing whitespace, please fix" - -# build a cache of “ipkg package name” → “package conf option” for -# use with dependency resolution -rm -rf pkglist.d -mkdir pkglist.d -for dn in */Makefile; do - dn=${dn%/*} - pbar="Pass 1: $dn ..." - print -nu2 "$pbar\r" - cd $dn - - # ALL_PKGOPTS: all subpackage conf options - # PKGNAME_*: subpackage (ipkg) package name, by subpackage option - eval $($GMAKE dump="ALL_PKGOPTS \ - \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x})") - cd .. - - if [[ -z $ALL_PKGOPTS ]]; then - #print -u2 "Warning: $dn/Makefile contains no packages, skipped" - continue - fi - - for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase - eval sppn=\$PKGNAME_$spcu # sppn: subpackage (ipkg) name - # once mksh R40 is out, use its new associative arrays here! - print -r -- "$spcu" >pkglist.d/"$sppn" - done -done - -# build Config.in files and resolve dependencies -rm -f package_sections -rm -rf pkgconfigs.d -mkdir pkgconfigs.d -for dn in */Makefile; do - dn=${dn%/*} - pbar="Pass 2: $dn ..." - print -nu2 "$pbar\r" - mkdir pkgconfigs.d/$dn - cd $dn - - # PKG_NAME: package name (directory, free-format) - # PKG_FLAVOURS: all package flavours (boolean options), uppercase - # PKG_CHOICES: all package choices (boolean options), uppercase - # PKG_DESCR: package description (directory) - # PKG_URL: package homepage - # PKG_CXX: uppercase varname part to use for CFrustFrust checks - # ALL_PKGOPTS: all subpackage conf options - # PKGNAME_*: subpackage (ipkg) package name, by subpackage option - # PKGDESC_*: subpackage description, by subpackage option - # PKGDEPS_*: subpackage depends on ipkg packages, by subpkg option - # PKGDFLT_*: subpackage 'default {:-n}', by subpackage option - # CFLINE_*: one free-format Config.in line per subpackage option - # PKGFD_*: flavour description, per package flavour option - # PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies - eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_CHOICES PKG_DESCR PKG_SECTION PKG_URL PKG_MULTI PKG_CXX \ - ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ - PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} PKGSECT_\${x} CFLINE_\${x}) \ - \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x}) \ - \$(foreach x,\${PKG_FLAVOURS},PKGFS_\${x}) \ - \$(foreach x,\${PKG_FLAVOURS},PKGSUB_\${x}) \ - \$(foreach x,\${PKG_CHOICES},PKGCD_\${x}) \ - \$(foreach x,\${PKG_CHOICES},PKGCS_\${x}) \ - PKG_HOST_DEPENDS PKG_TARGET_DEPENDS") - - - # dnu: directory name, uppercase, y/-+/_X/ - typeset -u dnu=${dn//-/_} - dnu=${dnu//+/X} - - echo "pkgconfigs.d/$dn/Config.in ${PKG_SECTION:=none}" >>../package_sections - echo "$dn/Config.in.manual ${PKG_SECTION:=none}" >>../package_sections - - # skip if we take care of this one manually - [[ -s Config.in.manual ]] && { cd ..; continue; } - - exec 4>../pkgconfigs.d/$dn/Config.in - - # Handle master package (directory) - print -u4 "config ADK_COMPILE_$dnu" - if [[ -z $ALL_PKGOPTS ]]; then - # pseudo package, does not produce an ipkg package - ppnf=$PKG_NAME # ppnf: pseudopkg name, filled - if [[ -n $PKG_DESCR ]]; then - while (( ${#ppnf} < 23 )); do - ppnf=$ppnf. - done - ppnf="$ppnf $PKG_DESCR" - fi - print -u4 "\tprompt \"$ppnf\"" - fi - print -u4 \\ttristate - if [[ -n $ALL_PKGOPTS ]]; then - # real (master) package, contains 1+ ipkg (sub)packages - print -nu4 \\tdepends on - sp=' ' # local sp: space (or ' || ') - for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase - if [[ -n $PKG_MULTI ]]; then - if [[ $dnu != $spcu ]]; then - print -nu4 "${sp}ADK_PACKAGE_$spcu" - sp=' || ' - else - print -nu4 "${sp}ADK_HAVE_DOT_CONFIG" - sp=' || ' - fi - else - print -nu4 "${sp}ADK_PACKAGE_$spcu" - sp=' || ' - fi - done - print -u4 - fi - print -u4 \\tdefault n - - # Handle NOT/ONLY_FOR_PLATFORM alikes - phd= # phd: PKG_HOST_DEPENDS expand. - if [[ -n $PKG_HOST_DEPENDS ]]; then - phd='\tdepends on' - if [[ $PKG_HOST_DEPENDS = *\!* ]]; then - sp=' !' - else - sp=' ' - fi - for x in $PKG_HOST_DEPENDS; do - typeset -u x=${x#!} - phd="$phd${sp}ADK_HOST_$x" - if [[ $PKG_HOST_DEPENDS = *\!* ]]; then - sp=' && !' - else - sp=' || ' - fi - done - fi - ptd= # ptd: PKG_TARGET_DEPENDS exp. - if [[ -n $PKG_TARGET_DEPENDS ]]; then - ptd='\tdepends on' - sp=' ' # local sp: space (or ' || ') - if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then - sp=' !' - else - sp=' ' - fi - for x in $PKG_TARGET_DEPENDS; do - typeset -l x=${x#!} - #XXX cache this with mksh R40+ - found=0 - while read friendlyname sym; do - [[ $friendlyname = $x ]] || continue - found=1 - break - done <../../target/target.lst - if (( !found )); then - print -u2 "$dn: Target '$x' not found!" - exit 1 - fi - ptd="$ptd${sp}$sym" - if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then - sp=' && !' - else - sp=' || ' - fi - done - fi - - # Handle subpackages / multipackages - for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase - eval sppn=\$PKGNAME_$spcu # sppn: subpackage (ipkg) name - eval desc=\$PKGDESC_$spcu # desc: subpackage description - : ${desc:=$PKG_DESCR} # take from main pkg if empty - eval sect=\$PKGSECT_$spcu # sect: subpackage section - : ${sect:=$PKG_SECTION} # take from main pkg if empty - eval deps=\$PKGDEPS_$spcu # deps: subpackage dependencies - eval dflt=\$PKGDFLT_$spcu # dflt: config 'default' opt. - eval xline=\$CFLINE_$spcu # xline: one free-format line - - echo "pkgconfigs.d/$dn/Config.in.$sppn $sect" >>../package_sections - exec 4>../pkgconfigs.d/$dn/Config.in.$sppn - h=4 - - print -u$h config ADK_PACKAGE_$spcu - spnf=$sppn # spnf: subpackage name, filled - if [[ -n ${desc:-$PKG_NAME} ]]; then - while (( ${#spnf} < 23 )); do - spnf=$spnf. - done - spnf="$spnf ${desc:-$PKG_NAME}" - fi - print -u$h "\tprompt \"$spnf\"" - print -u$h \\ttristate - if [[ -n $PKG_MULTI ]]; then - if [[ $spcu != $dnu ]]; then - print -u$h "\tdepends on ADK_PACKAGE_$dnu" - fi - fi - [[ -n $phd ]] && print -u$h "$phd" - [[ -n $ptd ]] && print -u$h "$ptd" - print -u$h "\tdefault ${dflt:-n}" - for dep in $deps; do # dep: ipkg name of one rundep. - # skip dependencies on uclibc++ and libstdcxx iff - # we produce these automatically - [[ -n $PKG_CXX && $dep = @(uclibc++|libstdcxx) ]] && \ - continue - case $dep { - (kmod-*) - # produce dependency on kernel package - # which have special name→sym mangling - typeset -u udep=${dep//-/_} - print -u$h "\tselect ADK_KPACKAGE_$udep" - ;; - (*) - # produce dependency on regular package - # where the symbol is cached (see above) - if [[ ! -f ../pkglist.d/"$dep" ]]; then - print -u2 "Warning: $PKG_NAME: unreachable dependency '$dep'" - continue - fi - print -u$h '\tselect' \ - ADK_PACKAGE_$(<../pkglist.d/"$dep") - ;; - } - done - print -u$h \\tselect ADK_COMPILE_$dnu - [[ -n $xline ]] && print -u$h "\t$xline" - if [[ -n $desc$PKG_URL ]]; then - # produce (optional) help text - print -u$h \\thelp - [[ -n $desc ]] && print -u$h "\t $desc" - [[ -n $desc && -n $PKG_URL ]] && print -u$h '\t ' - [[ -n $PKG_URL ]] && print -u$h "\t WWW: $PKG_URL" - fi - done - - # Handle CFrustFrust library selection, if necessary - [[ -n $PKG_CXX ]] && cat >&4 <&4 <&4 - [[ -n $PKG_CHOICES ]] && cat >&4 <>../pkgconfigs.d/$dn/Config.in.$sub && fh=5 - print -u$fh - print -u$fh config ADK_PACKAGE_${dnu}_$pfcu - print -u$fh "\tbool \"${pfd:-$PKG_NAME -> flavour $pfcu}\"" - print -u$fh \\tdefault n - print -u$fh \\tdepends on ADK_COMPILE_$dnu - for pfso in $pfs; do - typeset -u pfso=${pfso#!} - print -u$fh \\tselect ADK_PACKAGE_${pfso} - done - print -u$fh \\thelp - print -u$fh "\t flavour ADK_PACKAGE_${dnu}_$pfcu for $PKG_NAME" - done - cd .. -done - -# return good if given file exists and is non-empty -non_empty_file() { - [[ -f "$1" ]] || return 1 - [[ -n "$(cat "$1")" ]] || return 1 - return 0 -} - -# print the verbose section name for a given section tag -lookup_section_string() { - str="$(grep ^$1\ sections.lst | cut -d ' ' -f '2-')" - [[ -n $str ]] && { echo $str; return; } - echo $1 -} - -# print the first prompt's first word's value in a given Config.in file -get_first_prompt() { - prompt="$(grep "prompt " $1 |head -1| sed -n 's/.*"\([^ \.]*\)[ \.].*"/\1/p')" - [[ -n $prompt ]] && echo $prompt -} - -# prepare Config.in list for sorting -while read config_in section; do - pbar="Pass 3: $config_in ..." - print -nu2 "$pbar\r" - - non_empty_file $config_in || continue - prompt="$(get_first_prompt $config_in)" - [[ -n $prompt ]] || continue - echo "$prompt $config_in $(lookup_section_string $section)" -done package_section_list - -# create the Config.in.auto from the sorted list from above -cursec="" -sort -k 3 -k 1 -f package_section_list | while read name file section; do - if [[ $cursec != $section ]]; then - [[ -n $cursec ]] && print "endmenu\n" - - print "menu \"$section\"" - cursec="$section" - fi - print "source \"package/$file\"" - print -u3 "source \"package/${file%.*}\"" -done >Config.in.auto 3>Config.in.auto.pre -print "endmenu\n" >>Config.in.auto -grep pkgconfigs.d Config.in.auto.pre | sort | uniq > Config.in.auto.global -rm -f package_sections package_section_list Config.in.auto.pre diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index 0b9c6c1ae..3e4460c87 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -4,25 +4,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pmacct -PKG_VERSION:= 0.12.2 +PKG_VERSION:= 0.12.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1c656ea9ca13455c54e8efb9f8299b3d +PKG_MD5SUM:= 7e4196c0f87f1382a8eed4eb1bdecdc1 PKG_DESCR:= IP accounting daemons PKG_SECTION:= net/misc PKG_DEPENDS:= libpcap -PKG_BUILDDEP+= libpcap -ifneq ($(ADK_COMPILE_PMACCT_MYSQL),) -PKG_BUILDDEP+= mysql -endif -ifneq ($(ADK_COMPILE_PMACCT_PGSQL),) -PKG_BUILDDEP+= postgresql -endif -ifneq ($(ADK_COMPILE_PMACCT_SQLITE),) -PKG_BUILDDEP+= sqlite -endif +PKG_BUILDDEP:= libpcap PKG_URL:= http://www.pmacct.net/ PKG_SITES:= http://www.pmacct.net/ +PKG_SUBPKGS:= NFACCTD PMACCTD SFACCTD PMACCT_CLIENT + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,NFACCTD,nfacctd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/popt/Makefile b/package/popt/Makefile index 0e3a0362b..f8d43aac0 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -10,10 +10,12 @@ PKG_MD5SUM:= c61ef795fa450eb692602a661ec8d7f1 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs PKG_DEPENDS:= libiconv -PKG_BUILDDEP+= libiconv -PKG_URL:= http://rpm5.org +PKG_BUILDDEP:= libiconv +PKG_URL:= http://rpm5.org/ PKG_SITES:= http://rpm5.org/files/popt/ +PKG_SUBPKGS:= LIBPOPT + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/portmap/Makefile b/package/portmap/Makefile index 28f3e4b7f..e885b20a0 100644 --- a/package/portmap/Makefile +++ b/package/portmap/Makefile @@ -9,11 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ac108ab68bf0f34477f8317791aaf1ff PKG_DESCR:= RPC portmapper PKG_SECTION:= net/misc -ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) -PKG_DEPENDS:= libwrap -PKG_BUILDDEP+= tcp_wrappers -endif -PKG_URL:= http://neil.brown.name/portmap +PKG_URL:= http://neil.brown.name/portmap/ PKG_SITES:= http://neil.brown.name/portmap/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 2b178e2e6..834817160 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -9,12 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ae7f305eb9388b187e8f07dee0cec55c PKG_DESCR:= PostgreSQL database library PKG_SECTION:= db -PKG_BUILDDEP+= zlib +PKG_BUILDDEP:= zlib PKG_URL:= http://www.postgresql.org -PKG_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \ - ftp://ftp8.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \ - ftp://ftp.be.postgresql.org/pub/postgresql/source/v${PKG_VERSION}/ \ - ftp://ftp.tw.postgresql.org/pub/postgresql/source/v${PKG_VERSION}/ +PKG_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ + +PKG_SUBPKGS:= LIBPQ include ${TOPDIR}/mk/package.mk diff --git a/package/ppp/Makefile b/package/ppp/Makefile index a04d5b798..df995bfa3 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -9,10 +9,13 @@ PKG_RELEASE:= 4 PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57 PKG_DESCR:= Point-to-Point Protocol software PKG_SECTION:= ppp -PKG_MULTI:= 1 PKG_DEPENDS:= kmod-ppp -PKG_URL:= http://ppp.samba.org +PKG_URL:= http://ppp.samba.org/ PKG_SITES:= ftp://ftp.samba.org/pub/ppp/ +PKG_MULTI:= 1 + +PKG_SUBPKGS:= PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS +PKG_SUBPKGS+= PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS PKG_DEPENDS_PPPOE:= kmod-pppoe PKG_DEPENDS_UMTS:= comgt diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 8930056c4..2d912c99f 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b38df9c431041922c997c1148bedf591 PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) server PKG_SECTION:= ppp PKG_DEPENDS:= ppp kmod-crypto kmod-mppe kmod-ppp -PKG_URL:= http://www.poptop.org +PKG_URL:= http://www.poptop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} include ${TOPDIR}/mk/package.mk diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile index bfc137378..ef55349b5 100644 --- a/package/privoxy/Makefile +++ b/package/privoxy/Makefile @@ -11,8 +11,8 @@ PKG_MD5SUM:= 6571dc9524e945e79c2af62fefe7b107 PKG_DESCR:= web proxy with advanced filtering capabilities PKG_SECTION:= proxy PKG_DEPENDS:= libpthread libpcre -PKG_BUILDDEP+= pcre -PKG_URL:= http://www.privoxy.org +PKG_BUILDDEP:= pcre +PKG_URL:= http://www.privoxy.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ijbswa/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-${PKG_VARIANT}-src.tar.gz diff --git a/package/procmail/Makefile b/package/procmail/Makefile index dfea50341..3bd2b7da3 100644 --- a/package/procmail/Makefile +++ b/package/procmail/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1678ea99b973eb77eda4ecf6acae53f1 PKG_DESCR:= Mail processing tools PKG_SECTION:= mail -PKG_URL:= http://www.procmail.org +PKG_URL:= http://www.procmail.org/ PKG_SITES:= http://www.procmail.org/ include ${TOPDIR}/mk/package.mk diff --git a/package/procps/Makefile b/package/procps/Makefile index 3e4a90250..cba4846d2 100644 --- a/package/procps/Makefile +++ b/package/procps/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= f490bca772b16472962c7b9f23b1e97d PKG_DESCR:= The /proc file system utilities PKG_SECTION:= utils PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses -PKG_URL:= http://procps.sourceforge.net +PKG_BUILDDEP:= ncurses +PKG_URL:= http://procps.sourceforge.net/ PKG_SITES:= http://procps.sourceforge.net/ include ${TOPDIR}/mk/package.mk diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile index 6f446e646..6cfa849ac 100644 --- a/package/proftpd/Makefile +++ b/package/proftpd/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 97ad29f31f4fe633a9f8d021bab2df20 PKG_DESCR:= A very configurable FTP server PKG_SECTION:= www -PKG_NOPARALLEL:= 1 PKG_URL:= http://www.proftpd.org/ PKG_SITES:= ftp://ftp.proftpd.org/distrib/source/ +PKG_NOPARALLEL:= 1 include $(TOPDIR)/mk/package.mk diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile index 85f30e5f7..214be62ab 100644 --- a/package/ptunnel/Makefile +++ b/package/ptunnel/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b45f73875f2af48f101816672f83a5fe PKG_DESCR:= Tunnel TCP connections over ICMP packets PKG_SECTION:= net/security PKG_DEPENDS:= libpcap libpthread -PKG_BUILDDEP+= libpcap +PKG_BUILDDEP:= libpcap PKG_URL:= http://www.cti.ecp.fr/~beauxir5/ptunnel/ PKG_SITES:= http://www.cti.ecp.fr/~beauxir5/ptunnel/ diff --git a/package/python/Makefile b/package/python/Makefile index 32f7de0e4..7f8ab7c4f 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f1317dbb2398374d6691edd5bff1b91d PKG_DESCR:= Python scripting language PKG_SECTION:= lang -PKG_URL:= http://www.python.org +PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/3.1.1/ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin diff --git a/package/python2/Makefile b/package/python2/Makefile index 02e54ba93..459e37eb5 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 17dcac33e4f3adb69a57c2607b6de246 PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang -PKG_URL:= http://www.python.org +PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin diff --git a/package/qingy/Makefile b/package/qingy/Makefile index f1016d8a8..ba6bd7a92 100644 --- a/package/qingy/Makefile +++ b/package/qingy/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 34f40172a71e9a6c2c77ddce11d2a63a PKG_DESCR:= a DirectFB getty replacement PKG_SECTION:= x11/apps PKG_DEPENDS:= directfb libxscrnsaver -PKG_BUILDDEP+= DirectFB libXScrnSaver +PKG_BUILDDEP:= DirectFB libXScrnSaver PKG_URL:= http://qingy.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=qingy/} diff --git a/package/quagga/Makefile b/package/quagga/Makefile index caad9ad89..119f3c636 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -9,31 +9,32 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 350fb150be526cdfc4d2b093cb4d69a7 PKG_DESCR:= A routing software package PKG_SECTION:= route -PKG_BUILDDEP+= readline ncurses -PKG_MULTI:= 1 +PKG_BUILDDEP:= readline ncurses PKG_URL:= http://www.quagga.net/ PKG_SITES:= http://www.quagga.net/download/ +PKG_MULTI:= 1 + +PKG_SUBPKGS:= QUAGGA QUAGGA_BGPD QUAGGA_OSPFD QUAGGA_OSPF6D +PKG_SUBPKGS+= QUAGGA_RIPNGD QUAGGA_RIPD QUAGGA_VTYSH +PKGSD_QUAGGA_BGPD:= BGP daemon +PKGSD_QUAGGA_OSPFD:= OSPF daemon +PKGSD_QUAGGA_OSPF6D:= OSPF IPv6 daemon +PKGSD_QUAGGA_RIPNGD:= RIPng daemon +PKGSD_QUAGGA_RIPD:= RIP daemon +PKGSD_QUAGGA_VTYSH:= vtysh utility PKG_FLAVOURS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support -PKG_DESCR_1:= BGP daemon -PKG_DESCR_2:= OSPF daemon -PKG_DESCR_3:= OSPF IPv6 daemon -PKG_DESCR_4:= RIPng daemon -PKG_DESCR_5:= RIP daemon -PKG_DESCR_6:= vtysh utility - - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) -$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION})) -$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION})) -$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION})) -$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION})) -$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION})) +$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_BGPD},${PKG_SECTION})) +$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_OSPFD},${PKG_SECTION})) +$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_OSPF6D},${PKG_SECTION})) +$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_RIPNGD},${PKG_SECTION})) +$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_RIPD},${PKG_SECTION})) +$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_VTYSH},${PKG_SECTION})) CONFIGURE_ENV+= quagga_cv_ipforward_method="proc" CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ diff --git a/package/raddump/Makefile b/package/raddump/Makefile index 19819b202..c43d6ccaf 100755 --- a/package/raddump/Makefile +++ b/package/raddump/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= f8c29c67141ea78bb6ae8b97d5149480 PKG_DESCR:= interprets captured RADIUS packets PKG_SECTION:= ppp PKG_DEPENDS:= libpcap libopenssl -PKG_BUILDDEP+= openssl libpcap +PKG_BUILDDEP:= openssl libpcap PKG_URL:= http://sourceforge.net/projects/raddump PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=raddump/} diff --git a/package/radvd/Makefile b/package/radvd/Makefile index 3f52ff986..e4fbeee04 100644 --- a/package/radvd/Makefile +++ b/package/radvd/Makefile @@ -10,9 +10,8 @@ PKG_MD5SUM:= 78598b60ed9d64920739189c3dc0934d PKG_DESCR:= Routing Advertisement Daemon for IPv6 PKG_SECTION:= ipv6 PKG_DEPENDS:= kmod-ipv6 -PKG_URL:= http://www.litech.org/radvd -PKG_SITES:= http://v6web.litech.org/radvd/dist/ \ - http://download.sourcemage.org/mirror/ +PKG_URL:= http://www.litech.org/radvd/ +PKG_SITES:= http://v6web.litech.org/radvd/dist/ PKG_HOST_DEPENDS:= !freebsd diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile index fd022fe54..72b576cf6 100644 --- a/package/randrproto/Makefile +++ b/package/randrproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 15266124b9e2dfcfb25ce6cba24cdd66 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile index 4dfd18dea..831bb5173 100644 --- a/package/rarpd/Makefile +++ b/package/rarpd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 04e2ca849e758d0b88c8281775ec3b58 PKG_DESCR:= Reverse ARP Daemon PKG_SECTION:= net/misc PKG_DEPENDS:= libnet -PKG_BUILDDEP+= libnet +PKG_BUILDDEP:= libnet PKG_SITES:= ftp://ftp.dementia.org/pub/net-tools/ include ${TOPDIR}/mk/package.mk diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 13bf70d98..0997d3db9 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -3,13 +3,13 @@ include ${TOPDIR}/rules.mk -PKG_NAME= rdate -PKG_VERSION= 20070817 -PKG_RELEASE= 2 -PKG_MD5SUM= 9a6489d7de4311678a3fab001bb503df +PKG_NAME:= rdate +PKG_VERSION:= 20070817 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 9a6489d7de4311678a3fab001bb503df PKG_DESCR:= A small rdate and NTP client PKG_SECTION:= ntp -PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/} +PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/} WRKDIST= ${WRKDIR}/${PKG_NAME} diff --git a/package/readline/Makefile b/package/readline/Makefile index 7895198a5..3126e9a33 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -10,9 +10,11 @@ PKG_MD5SUM:= fc2f7e714fe792db1ce6ddc4c9fb4ef3 PKG_DESCR:= Command line editing library PKG_SECTION:= libs PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses +PKG_BUILDDEP:= ncurses PKG_SITES:= ${MASTER_SITE_GNU:=readline/} +PKG_SUBPKGS:= LIBREADLINE + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/reaim/Makefile b/package/reaim/Makefile index b06011ddd..2c33a918e 100644 --- a/package/reaim/Makefile +++ b/package/reaim/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 647d2ab72ec454f89294accfb3182c09 PKG_DESCR:= A transparent AIM / MSN proxy PKG_SECTION:= chat PKG_DEPENDS:= iptables -PKG_URL:= http://reaim.sourceforge.net +PKG_URL:= http://reaim.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/} include ${TOPDIR}/mk/package.mk diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile index f2a7beae7..1a5d77ec4 100644 --- a/package/renderproto/Makefile +++ b/package/renderproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 0.11 PKG_RELEASE:= 1 PKG_MD5SUM:= 57216f25b9a5edc561b83a7484cb17e8 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile index 770d1b203..01f66fead 100644 --- a/package/resourceproto/Makefile +++ b/package/resourceproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 587333b4995a3e11ebe4c8ba2742efaf PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile index dc56c66f9..079a64f2e 100644 --- a/package/rng-tools/Makefile +++ b/package/rng-tools/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= crypto PKG_URL:= http://gkernel.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} -CFLINE_RNG_TOOLS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_CFLINE_RNG_TOOLS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC include $(TOPDIR)/mk/package.mk diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile index 29b480f29..403564bb7 100644 --- a/package/rp-pppoe/Makefile +++ b/package/rp-pppoe/Makefile @@ -10,9 +10,11 @@ PKG_MD5SUM:= d58a13cc4185bca6121a606ff456dec0 PKG_DESCR:= PPPoE (PPP over Ethernet) tools PKG_SECTION:= ppp PKG_DEPENDS:= ppp -PKG_URL:= http://www.roaringpenguin.com +PKG_URL:= http://www.roaringpenguin.com/ PKG_SITES:= http://www.roaringpenguin.com/files/download/ +PKG_SUBPKGS:= PPPOE_CLIENT PPPOE_RELAY PPPOE_SERVER PPPOE_SNIFF + WRKSRC= ${WRKDIST}/src include ${TOPDIR}/mk/package.mk diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index a25bb0281..535c1b6c1 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 1a77ddb1aaea8099ab19c351eeb26316 PKG_DESCR:= converts RPC program numbers into universal addresses PKG_SECTION:= net/misc PKG_DEPENDS:= libtirpc -PKG_BUILDDEP+= libtirpc +PKG_BUILDDEP:= libtirpc PKG_URL:= http://sourceforge.net/projects/rpcbind/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rpcbind/} diff --git a/package/rpm/Makefile b/package/rpm/Makefile index 88a0954a1..ef8256231 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -9,14 +9,14 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 224715646325df4cd3904e3ac9e16186 PKG_DESCR:= Package Manager PKG_SECTION:= base -PKG_BUILDDEP+= nss libdb -PKG_URL:= http://www.rpm.org +PKG_BUILDDEP:= nss libdb +PKG_URL:= http://www.rpm.org/ PKG_SITES:= http://rpm.org/releases/rpm-4.7.x/ -DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.bz2 - -PKG_TARGET_DEPENDS:= !foxboard PKG_HOST_DEPENDS:= !cygwin +PKG_TARGET_DEPENDS:= !foxboard + +DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index 8a73aa105..1a025f37e 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -10,9 +10,11 @@ PKG_MD5SUM:= 5e4305c612bc3cccbaf802c275c81a11 PKG_DESCR:= Round-Robin Database (RRD) collecting daemon PKG_SECTION:= admin PKG_DEPENDS:= librrd -PKG_BUILDDEP+= rrdtool +PKG_BUILDDEP:= rrdtool PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rrdcollect/} +PKG_SUBPKGS:= RRDCOLLECT RRDCOLLECT_EXAMPLE + ifneq (${ADK_PACKAGE_LIBRRD},) RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng endif diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index 36d642daf..e3549d5e0 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -10,10 +10,11 @@ PKG_MD5SUM:= 19b24f7184a8dbf7b48c1bbb565ad9fb PKG_DESCR:= Round Robin Database (RRD) management library and tools PKG_SECTION:= libs PKG_DEPENDS:= libart libfreetype libpng zlib -PKG_BUILDDEP+= libxml2 cgilib freetype libart libpng +PKG_BUILDDEP:= libxml2 cgilib freetype libart libpng PKG_URL:= http://oss.oetiker.ch/ PKG_SITES:= http://oss.oetiker.ch/rrdtool/pub/ +PKG_SUBPKGS:= LIBRRD RRDCGI RRDTOOL PKG_SECTION_RRDCGI:= misc PKG_SECTION_RRDTOOL:= misc diff --git a/package/rrs/Makefile b/package/rrs/Makefile index cd5144daf..ba32293f0 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -9,68 +9,29 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0 PKG_DESCR:= A reverse (connecting) remote shell, with SSL support. PKG_SECTION:= net/misc -PKG_CXX:= RRS -PKG_BUILDDEP+= zlib -ifneq ($(ADK_PACKAGE_RRS),) -PKG_BUILDDEP+= openssl -endif -PKG_URL:= http://www.cycom.se/dl/rrs +PKG_DEPENDS:= zlib libopenssl +PKG_BUILDDEP:= zlib openssl +PKG_URL:= http://www.cycom.se/dl/rrs/ PKG_SITES:= http://www.cycom.se/uploads/36/19/ - -PKG_DEPENDS:= libopenssl zlib -PKG_DEPENDS_NOSSL:= zlib - -ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y) -PKG_DEPENDS_NOSSL+= uclibc++ -else -PKG_DEPENDS_NOSSL+= libstdcxx -endif +PKG_CXX:= RRS include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,RRS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -BUILD_STYLE:= manual +BUILD_STYLE:= manual INSTALL_STYLE:= manual -ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y) -PKG_FLAGS=-fno-builtin -fno-rtti -nostdinc++ -fPIC -PKG_LDFLAGS=-nodefaultlibs -luClibc++ -lc -lm -else -PKG_FLAGS=-fPIC -PKG_LDFLAGS=-shared -endif - do-build: -ifneq (${ADK_PACKAGE_RRS},) ${MAKE} -C ${WRKBUILD} \ CC="${TARGET_CC}" \ CFLAGS="${TARGET_CFLAGS} -I${STAGING_DIR}/usr/include ${PKG_FLAGS}" \ LDFLAGS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib ${PKG_LDFLAGS} -lutil -lssl -lcrypto -lz" \ generic - { cd ${WRKBUILD}; mv rrs rrs-ssl; } - -${MAKE} -C ${WRKBUILD} \ - clean -endif -ifneq (${ADK_PACKAGE_RRS_NOSSL},) - ${MAKE} -C ${WRKBUILD} \ - CC="${TARGET_CC}" \ - CFLAGS="${TARGET_CFLAGS} -I${STAGING_DIR}/usr/include ${PKG_FLAGS}" \ - LDFLAGSNOSSL="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib ${PKG_LDFLAGS} -lutil" \ - generic-nossl - { cd ${WRKBUILD}; mv rrs rrs-nossl; } -endif do-install: -ifneq (${ADK_PACKAGE_RRS},) ${INSTALL_DIR} ${IDIR_RRS}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/rrs-ssl ${IDIR_RRS}/usr/bin/rrs -endif -ifneq (${ADK_PACKAGE_RRS_NOSSL},) - ${INSTALL_DIR} ${IDIR_RRS_NOSSL}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/rrs-nossl ${IDIR_RRS_NOSSL}/usr/bin/rrs -endif + ${INSTALL_BIN} ${WRKBUILD}/rrs ${IDIR_RRS}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rsync/Makefile b/package/rsync/Makefile index b0ce107d9..f41b4382c 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= b53525900817cf1ba7ad3a516ab5bfe9 PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc PKG_DEPENDS:= libpopt -PKG_BUILDDEP+= popt -PKG_URL:= http://rsync.samba.org +PKG_BUILDDEP:= popt +PKG_URL:= http://rsync.samba.org/ PKG_SITES:= http://rsync.samba.org/ftp/rsync/ include ${TOPDIR}/mk/package.mk diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index 85f828290..303c6037c 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= e701095e1824b7e512a17000f4c0a783 PKG_DESCR:= console torrent application PKG_SECTION:= p2p PKG_DEPENDS:= libncurses libtorrent libcurl -PKG_BUILDDEP+= ncurses libtorrent curl -PKG_URL:= http://libtorrent.rakshasa.no +PKG_BUILDDEP:= ncurses libtorrent curl +PKG_URL:= http://libtorrent.rakshasa.no/ PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ include ${TOPDIR}/mk/package.mk diff --git a/package/ruby/Makefile b/package/ruby/Makefile index d82665427..dc6ec4ed0 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -9,9 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0f6d7630f26042e00bc59875755cf879 PKG_DESCR:= interpreter for the ruby language PKG_SECTION:= lang -PKG_NOPARALLEL:= 1 -PKG_URL:= http://www.ruby-lang.org +PKG_URL:= http://www.ruby-lang.org/ PKG_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/ +PKG_NOPARALLEL:= 1 + PKG_HOST_DEPENDS:= !freebsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-p429.tar.gz diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index b56e219e6..0d504387d 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 49bb52c99e002bf85eb41d8385d903b5 PKG_DESCR:= x-term with unicode support PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 fontconfig libxft libxml2 -PKG_BUILDDEP+= libX11 fontconfig libXft libxml2 +PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/ diff --git a/package/samba/Makefile b/package/samba/Makefile index f3addd17f..67f9924eb 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7c8d2a34b649380d5df838c3e030dbec PKG_DESCR:= NetBIOS/SMB file and print server PKG_SECTION:= net/fs -PKG_URL:= http://www.samba.org +PKG_URL:= http://www.samba.org/ PKG_SITES:= http://samba.org/samba/ftp/stable/ +PKG_SUBPKGS:= SAMBA SAMBA_CLIENT SAMBA_PASSWD + WRKSRC= ${WRKDIST}/source3 include ${TOPDIR}/mk/package.mk diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 218a097c7..2f1a5bacf 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -10,13 +10,27 @@ PKG_MD5SUM:= a0cfdfdebca2feb4f2ba5d3418b15a42 PKG_DESCR:= Scanner access now easy PKG_SECTION:= misc PKG_DEPENDS:= libpthread -PKG_BUILDDEP+= libpthread libusb +PKG_BUILDDEP:= libpthread libusb +PKG_URL:= http://www.sane-project.org/ +PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ PKG_MULTI:= 1 -PKG_URL:= http://www.sane-project.org -PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ \ - ftp://ftp3.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ \ - ftp://ftp4.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ \ - ftp://ftp5.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ + +PKG_SUBPKGS:= SANE_BACKENDS SANE_BACKEND_NET SANE_BACKEND_ABATON SANE_BACKEND_AGFAFOCUS +PKG_SUBPKGS+= SANE_BACKEND_APPLE SANE_BACKEND_ARTEC_EPLUS48U SANE_BACKEND_ARTEC SANE_BACKEND_AS6E +PKG_SUBPKGS+= SANE_BACKEND_AVISION SANE_BACKEND_BH SANE_BACKEND_CANON630U SANE_BACKEND_CANON +PKG_SUBPKGS+= SANE_BACKEND_COOLSCAN2 SANE_BACKEND_COOLSCAN SANE_BACKEND_DC25 SANE_BACKEND_DMC +PKG_SUBPKGS+= SANE_BACKEND_EPSON SANE_BACKEND_FUJITSU SANE_BACKEND_GENESYS SANE_BACKEND_GT68XX +PKG_SUBPKGS+= SANE_BACKEND_HP3500 SANE_BACKEND_HP4200 SANE_BACKEND_HP5400 SANE_BACKEND_HP +PKG_SUBPKGS+= SANE_BACKEND_IBM SANE_BACKEND_LEO SANE_BACKEND_LEXMARK SANE_BACKEND_MA1509 +PKG_SUBPKGS+= SANE_BACKEND_MATSUSHITA SANE_BACKEND_MICROTEK2 SANE_BACKEND_MICROTEK +PKG_SUBPKGS+= SANE_BACKEND_MUSTEK SANE_BACKEND_MUSTEK_USB SANE_BACKEND_MUSTEK_USB2 +PKG_SUBPKGS+= SANE_BACKEND_NEC SANE_BACKEND_NIASH SANE_BACKEND_PIE SANE_BACKEND_PIXMA +PKG_SUBPKGS+= SANE_BACKEND_PLUSTEK_PP SANE_BACKEND_PLUSTEK SANE_BACKEND_RICOH +PKG_SUBPKGS+= SANE_BACKEND_S9036 SANE_BACKEND_SCEPTRE SANE_BACKEND_SHARP SANE_BACKEND_SM3600 +PKG_SUBPKGS+= SANE_BACKEND_SM3840 SANE_BACKEND_SNAPSCAN SANE_BACKEND_SP15C SANE_BACKEND_ST400 +PKG_SUBPKGS+= SANE_BACKEND_STV680 SANE_BACKEND_TAMARACK SANE_BACKEND_TECO1 SANE_BACKEND_TECO2 +PKG_SUBPKGS+= SANE_BACKEND_TECO3 SANE_BACKEND_TEST SANE_BACKEND_U12 SANE_BACKEND_UMAX1220U +PKG_SUBPKGS+= SANE_BACKEND_UMAX_PP SANE_BACKEND_UMAX include ${TOPDIR}/mk/package.mk diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile index 4277fb7c7..207ef5299 100644 --- a/package/sangam-atm/Makefile +++ b/package/sangam-atm/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= sangam-atm PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 3843f3e670967fe81561770ac960c1cd -PKG_DESCR:= sangam-atm DSL modem driver for TI AR7 boards +PKG_DESCR:= DSL modem driver for TI AR7 boards PKG_SECTION:= kernel PKG_DEPENDS:= kmod-fw-loader kmod-atm PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile index 29bfad43b..4ae1dcadf 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -10,11 +10,9 @@ PKG_MD5SUM:= 7b8187ea718ebe47f22805b921b909ab PKG_DESCR:= Portscan logger PKG_SECTION:= net/security PKG_DEPENDS:= libpcap libnet libnids -PKG_BUILDDEP+= libpcap libnids libnet -PKG_URL:= http://www.openwall.com/scanlogd -PKG_SITES:= http://www.openwall.com/scanlogd/ \ - ftp://ftp.wiretapped.net/pub/openwall/ \ - http://distro.ibiblio.org/pub/linux/distributions/openwall/ +PKG_BUILDDEP:= libpcap libnids libnet +PKG_URL:= http://www.openwall.com/scanlogd/ +PKG_SITES:= http://www.openwall.com/scanlogd/ include ${TOPDIR}/mk/package.mk diff --git a/package/screen/Makefile b/package/screen/Makefile index 1f7b023f2..2214c37b8 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 PKG_DESCR:= A window manager for the terminal session PKG_SECTION:= misc PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses -PKG_URL:= http://www.gnu.org/software/screen +PKG_BUILDDEP:= ncurses +PKG_URL:= http://www.gnu.org/software/screen/ PKG_SITES:= ${MASTER_SITE_GNU:=screen/} include ${TOPDIR}/mk/package.mk diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile index 19496f2c5..4549d2f67 100644 --- a/package/scrnsaverproto/Makefile +++ b/package/scrnsaverproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 0ed88bdd6945ba207c4f734af48e7e25 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index f3980c7f3..37c0b9a98 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -11,10 +11,12 @@ PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs PKG_DEPENDS:= libpng libtiff libjpeg libsdl PKG_BUILDDEP:= libpng libtiff jpeg sdl -PKG_URL:= http://www.libsdl.org +PKG_URL:= http://www.libsdl.org/ PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/ -PKG_DESCR_LIB_DEV:= development files for sdlimage -PKG_SECTION_LIB_DEV:= devel + +PKG_SUBPKGS:= LIBSDL_IMAGE LIBSDL_IMAGE_DEV +PKGSD_LIBSDL_IMAGE_DEV:=development files for sdlimage +PKGSC_LIBSDL_IMAGE_DEV:=devel DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION} @@ -22,7 +24,7 @@ WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV})) +$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKGSD_LIBSDL_IMAGE_DEV},${PKGSC_LIBSDL_IMAGE_DEV})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 483022ec7..9fb10463a 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -10,11 +10,13 @@ PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs PKG_DEPENDS:= libusb alsa-lib libpthread tslib -PKG_BUILDDEP+= libusb alsa-lib tslib -PKG_URL:= http://www.libsdl.org +PKG_BUILDDEP:= libusb alsa-lib tslib +PKG_URL:= http://www.libsdl.org/ PKG_SITES:= http://www.libsdl.org/release/ -PKG_DESCR_LIB_DEV:= development files for libsdl -PKG_SECTION_LIB_DEV:= devel + +PKG_SUBPKGS:= LIBSDL LIBSDL_DEV +PKGSD_LIBSDL_DEV:= development files for libsdl +PKGSC_LIBSDL_DEV:= devel DISTFILES:= SDL-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION} @@ -22,7 +24,7 @@ WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV})) +$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/section.lst b/package/section.lst new file mode 100644 index 000000000..55340301f --- /dev/null +++ b/package/section.lst @@ -0,0 +1,46 @@ +base Base System +bluetooth Bluetooth +browser Browser / Editor / Pager +editor Browser / Editor / Pager +pager Browser / Editor / Pager +chat IRC / ICQ / JABBER +comp Computing +archive Compression and Archivers +crypto Cryptography +db Databases +debug Debugging / Analyzing +devel Development / Headers +dns DNS / DHCP +dhcp DNS / DHCP +firewall Firewall / Routing / Bridging +kernel External Kernel Modules +route Firewall / Routing / Bridging +bridge Firewall / Routing / Bridging +fs Filesystem / Blockdevice utilities +ipv6 IPv6 +lang Programming / Languages +libs Libraries +mail Mail +misc Misc +multimedia Multimedia +net Networking +net/fs Network Filesystems +net/misc Networking Misc +net/security Network Security +ntp NTP +p2p P2P +phone Telephony +ppp PPP / PPTP / RADIUS +proxy Proxy +scm SCM +serial Serial communications & terminal emulation +shells Shells +admin System Administration +utils Utilities +www HTTP / FTP +wifi Wireless +x11/apps X applications +x11/drivers X server and drivers +x11/server X server and drivers +x11/libs X libraries +x11/fonts X fonts diff --git a/package/sections.lst b/package/sections.lst deleted file mode 100644 index 05fe0cb58..000000000 --- a/package/sections.lst +++ /dev/null @@ -1,53 +0,0 @@ -admin System Administration -archive Compression and Archivers -base Base System -bluetooth Bluetooth -browser Browser / Editor / Pager -editor Browser / Editor / Pager -pager Browser / Editor / Pager -chat IRC / ICQ / JABBER -comp Computing -console Console Utilities -crypto Cryptography -db Databases -debug Debugging / Analyzing -devel Development / Headers -dns DNS / DHCP -dhcp DNS / DHCP -firewall Firewall / Routing / Bridging -kernel External Kernel Modules -route Firewall / Routing / Bridging -bridge Firewall / Routing / Bridging -fs Filesystem / Blockdevice utilities -ipv6 IPv6 -lang Programming / Languages -libs Libraries -mail Mail -misc Misc -multimedia Multimedia -net Networking -net/fs Network Filesystems -net/misc Networking Misc -net/security Network Security -none Unclassified -ntp NTP -p2p P2P -phone Telephony -ppp PPP / PPTP / RADIUS -proxy Proxy -scm SCM -serial Serial communications & terminal emulation -shells Shells -sound Sound -sys System -text Text -utils Utilities -video Video -web World Wide Web -www HTTP / FTP -wifi Wireless -x11/apps X applications -x11/drivers X server and drivers -x11/server X server and drivers -x11/libs X libraries -x11/fonts X fonts diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 3107667f4..f13830610 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2aa91c43d01d2dfc9fbc1116e3063ae1 PKG_DESCR:= display drivers (serial, parallel, USB) PKG_SECTION:= serial -PKG_BUILDDEP+= libgd libusb +PKG_BUILDDEP:= libgd libusb PKG_URL:= http://serdisplib.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/} diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index a5c56b84b..40eb3e5a5 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 45e5a44803181e2bf3361d562060c904 PKG_DESCR:= a SIP (Session Initiation Protocol) proxy PKG_SECTION:= proxy PKG_DEPENDS:= libosip2 libpthread -PKG_BUILDDEP+= libosip2 +PKG_BUILDDEP:= libosip2 PKG_URL:= http://siproxd.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=siproxd/} diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 0e6b9d292..ac11b5520 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -10,10 +10,9 @@ PKG_MD5SUM:= c4eb8e282902e75f4f040f09ea9d99d5 PKG_DESCR:= a SIP stress and diagnostics utility PKG_SECTION:= net PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -PKG_URL:= http://sipsak.org -PKG_SITES:= http://download.berlios.de/sipsak/ \ - http://ftp.iptel.org/pub/sipsak/ +PKG_BUILDDEP:= openssl +PKG_URL:= http://sipsak.org/ +PKG_SITES:= http://download.berlios.de/sipsak/ include ${TOPDIR}/mk/package.mk diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile index fc2d67823..13bac7bc4 100644 --- a/package/sispmctl/Makefile +++ b/package/sispmctl/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 2457f76cd129f880634f3381be0aeb76 PKG_DESCR:= control application for power sockets PKG_SECTION:= utils PKG_DEPENDS:= libusb libusb-compat -PKG_BUILDDEP+= libusb libusb-compat -PKG_URL:= http://sispmctl.sourceforge.net +PKG_BUILDDEP:= libusb libusb-compat +PKG_URL:= http://sispmctl.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/} include ${TOPDIR}/mk/package.mk diff --git a/package/snort/Makefile b/package/snort/Makefile index aa14d88c2..e14ce7d7a 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -9,11 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e6a8bc5aa1ebe4d2100533d7709c4a9e PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS) PKG_SECTION:= net/security -PKG_NOPARALLEL:= 1 PKG_DEPENDS:= libnet libpcap libpcre -PKG_BUILDDEP+= libnet libpcap pcre +PKG_BUILDDEP:= libnet libpcap pcre PKG_URL:= http://www.snort.org/ PKG_SITES:= http://dl.snort.org/snort-current/ +PKG_NOPARALLEL:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/socat/Makefile b/package/socat/Makefile index 93dda9a99..0e5750123 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 82967132b5a8ca4d07e54370fdcb2662 PKG_DESCR:= A multipurpose relay (SOcket CAT) PKG_SECTION:= net/misc PKG_DEPENDS:= libpthread libopenssl -PKG_BUILDDEP+= openssl -PKG_URL:= http://www.dest-unreach.org/socat +PKG_BUILDDEP:= openssl +PKG_URL:= http://www.dest-unreach.org/socat/ PKG_SITES:= http://www.dest-unreach.org/socat/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/speex/Makefile b/package/speex/Makefile index a345b1a97..873ad347a 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c4438b22c08e5811ff10e2b06ee9b9ae PKG_DESCR:= an open source patent-free speech compression codec PKG_SECTION:= libs -PKG_URL:= http://speex.org +PKG_URL:= http://speex.org/ PKG_SITES:= http://downloads.us.xiph.org/releases/speex/ +PKG_SUBPKGS:= LIBSPEEX + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 9fa748083..45c2bf6f5 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -9,10 +9,12 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0faf8fc8ccff5297513c6532b2b4ce23 PKG_DESCR:= embeddable SQL database PKG_SECTION:= db -PKG_BUILDDEP+= ncurses readline +PKG_BUILDDEP:= ncurses readline PKG_URL:= http://www.sqlite.org/ PKG_SITES:= http://www.sqlite.org/ +PKG_SUBPKGS:= LIBSQLITE SQLITE_CLI + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/squid/Makefile b/package/squid/Makefile index 109e2ce95..29b038734 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -10,12 +10,15 @@ PKG_MD5SUM:= c70ef1198e6a6c1ae80bc57cd3592e36 PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy PKG_DEPENDS:= libopenssl libpthread -PKG_BUILDDEP+= openssl -PKG_URL:= http://www.squid-cache.org +PKG_BUILDDEP:= openssl +PKG_URL:= http://www.squid-cache.org/ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.1/ PKG_MULTI:= 1 -#PKG_CXX:= SQUID +PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA +PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_PASSWORD +PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_IP_USER SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP +PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKEAUTH PKG_HOST_DEPENDS:= !netbsd !cygwin AUTH_MODULES:= basic digest ntlm @@ -72,12 +75,6 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)) $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group)) $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)) -#ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y) -#CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ -# -I${STAGING_DIR}/usr/include/uClibc++" \ -# LIBS="-nodefaultlibs -luClibc++ -ldl -lm" -#endif - CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ ac_cv_sizeof_short=2 \ ac_cv_sizeof_int=4 \ @@ -135,13 +132,6 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --enable-digest-auth-helpers="${DIGEST_AUTH_HELPERS}" \ --enable-external-acl-helpers="${EXTERNAL_ACL_HELPERS}" -#ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -#post-configure: -# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ -# ${WRKBUILD}/libtool -#endif - post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_SQUID}/etc/squid ${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf \ diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index 7f497bc26..be5ab32f6 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 4039b50566a33a4077883ea974e476d5 PKG_DESCR:= A PPP over SSL vpn tool PKG_SECTION:= net/security PKG_DEPENDS:= libopenssl ppp -PKG_BUILDDEP+= openssl ppp +PKG_BUILDDEP:= openssl ppp PKG_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/strace/Makefile b/package/strace/Makefile index 0e5e5a625..92addc429 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -11,10 +11,10 @@ PKG_DESCR:= System call trace program PKG_SECTION:= debug PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - PKG_TARGET_DEPENDS:= !foxboard +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 79f4afc5b..fc9444cfe 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -15,28 +15,22 @@ PKG_DEPENDS+= kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport PKG_DEPENDS+= kmod-crypto-sha1 kmod-crypto-md5 PKG_DEPENDS+= kmod-crypto-null kmod-crypto-des kmod-crypto-aes PKG_DEPENDS+= kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc -ifeq (${ADK_PACKAGE_STRONGSWAN_WITH_OPENSSL},y) -PKG_BUILDDEP+= openssl -endif -ifeq (${ADK_PACKAGE_STRONGSWAN_WITH_GNUTLS},y) -PKG_BUILDDEP+= gnutls -endif -ifeq (${ADK_PACKAGE_STRONGSWAN_WITH_GMP},y) -PKG_BUILDDEP+= gmp -endif PKG_URL:= http://strongswan.org/index.htm PKG_SITES:= http://download.strongswan.org/ PKG_CHOICES:= WITH_GMP WITH_OPENSSL WITH_GNUTLS PKGCD_WITH_GMP:= use GMP for crypto PKGCS_WITH_GMP:= libgmp +PKGCB_WITH_GMP:= gmp PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_GNUTLS:= use GnuTLS for crypto PKGCS_WITH_GNUTLS:= libgnutls +PKGCB_WITH_GNUTLS:= gnutls ifeq (${ADK_PACKAGE_STRONGSWAN_WITH_OPENSSL},y) -CFLINE_STRONGSWAN:= select ADK_PACKAGE_OPENSSL_WITH_EC +PKG_CFLINE_STRONGSWAN:= select ADK_PACKAGE_OPENSSL_WITH_EC endif include $(TOPDIR)/mk/package.mk diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 7851bd2a4..e255d4e95 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= ae008ac355581c90494fba86cbfc3413 PKG_DESCR:= revision control program PKG_SECTION:= scm PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite neon -PKG_BUILDDEP+= apr-util expat apr zlib libiconv sqlite neon +PKG_BUILDDEP:= apr-util expat apr zlib libiconv sqlite neon PKG_SITES:= http://subversion.tigris.org/downloads/ PKG_URL:= http://subversion.apache.org/ diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index 3289f0097..3aae8652f 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= a3cbfdb6e1e5beea181a7349749719f3 PKG_DESCR:= A powerful syslog daemon PKG_SECTION:= admin PKG_DEPENDS:= libol libwrap -PKG_BUILDDEP+= libol tcp_wrappers -PKG_URL:= http://www.balabit.com +PKG_BUILDDEP:= libol tcp_wrappers +PKG_URL:= http://www.balabit.com/ PKG_SITES:= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/ include ${TOPDIR}/mk/package.mk diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile index d04433f08..fb042c6b0 100644 --- a/package/tcp_wrappers/Makefile +++ b/package/tcp_wrappers/Makefile @@ -9,8 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e6fa25f71226d090f34de3f6b122fb5a PKG_DESCR:= IP based access control PKG_SECTION:= libs -PKG_NOPARALLEL:= 1 PKG_SITES:= ftp://ftp.porcupine.org/pub/security/ +PKG_NOPARALLEL:= 1 + +PKG_SUBPKGS:= LIBWRAP DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index f728e2b25..2eed511aa 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= d0dd58bbd6cd36795e05c6f1f74420b0 PKG_DESCR:= A tool for network monitoring and data acquisition PKG_SECTION:= net PKG_DEPENDS:= libpcap -PKG_BUILDDEP+= libpcap +PKG_BUILDDEP:= libpcap PKG_URL:= http://www.tcpdump.org/ PKG_SITES:= http://www.tcpdump.org/release/ diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile index b0e85a79a..a1fa2db00 100644 --- a/package/tcsh/Makefile +++ b/package/tcsh/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c47de903e3d52f6824c8dd0c91eeb477 PKG_DESCR:= alternative csh PKG_SECTION:= shells PKG_DEPENDS:= libncurses -PKG_BUILDDEP+= ncurses +PKG_BUILDDEP:= ncurses PKG_URL:= http://www.tcsh.org/Welcome PKG_SITES:= ftp://ftp.astron.com/pub/tcsh/ diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 895593f68..3825cadcc 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= ee0b1a3366c6e379cae34be6fa5dcb15 PKG_DESCR:= VPN tunnel daemon PKG_SECTION:= net/security PKG_DEPENDS:= zlib liblzo libopenssl kmod-tun -PKG_BUILDDEP+= zlib liblzo openssl -PKG_URL:= http://www.tinc-vpn.org +PKG_BUILDDEP:= zlib liblzo openssl +PKG_URL:= http://www.tinc-vpn.org/ PKG_SITES:= http://www.tinc-vpn.org/packages/ include ${TOPDIR}/mk/package.mk diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index d384eab1e..925ac1bb7 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 2b2862ba33d2939e4572688d442ba415 PKG_DESCR:= Tinyproxy is a lightweight HTTP and HTTPS proxy. PKG_SECTION:= proxy -PKG_URL:= https://www.banu.com/tinyproxy +PKG_URL:= https://www.banu.com/tinyproxy/ PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.6/ include ${TOPDIR}/mk/package.mk diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile index 73be4f1bd..1f46c4c67 100644 --- a/package/tmsnc/Makefile +++ b/package/tmsnc/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 337dae91d4775e03b6681f61db56d2a7 PKG_DESCR:= a textbased MSN client PKG_SECTION:= chat -PKG_URL:= http://tmsnc.sourceforge.net +PKG_URL:= http://tmsnc.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/} include ${TOPDIR}/mk/package.mk diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 9f9f37277..e6f1ddb90 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -10,54 +10,23 @@ PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996 PKG_DESCR:= small C++ application server PKG_SECTION:= www PKG_DEPENDS:= cxxtools zlib libiconv libpthread -PKG_BUILDDEP+= cxxtools zlib libiconv -ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},) -PKG_BUILDDEP+= openssl -else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},) -PKG_BUILDDEP+= gnutls -endif -PKG_URL:= http://www.tntnet.org +PKG_BUILDDEP:= cxxtools zlib libiconv +PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ -#PKG_CXX:= TNTNET include ${TOPDIR}/mk/package.mk -ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},) -PKG_DEPENDS+= libopenssl -else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},) -PKG_DEPENDS+= libgnutls -endif - $(eval $(call PKG_template,TNTNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E -TLDFLAGS+= -nodefaultlibs -luClibc++ -liconv -lpthread -lcxxtools -lm -ldl -else -TLDFLAGS+= -liconv -lpthread -lcxxtools -lm -ldl -endif - CONFIGURE_ARGS+= --without-epoll \ --without-sdk \ --without-cgi \ - --without-sendfile -ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y) -CONFIGURE_ARGS+= --with-ssl=openssl -else ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y) -CONFIGURE_ARGS+= --with-ssl=gnutls -else -CONFIGURE_ARGS+= --without-ssl -endif + --without-sendfile \ + --without-ssl + CONFIGURE_ENV+= CXXFLAGS='${TCXXFLAGS}' \ ac_cv_path_cxxtools_config=${STAGING_DIR}/usr/bin -#ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -#post-configure: -# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ -# ${WRKBUILD}/libtool -#endif - post-install: ${INSTALL_DIR} ${IDIR_TNTNET}/www ${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet diff --git a/package/tor/Makefile b/package/tor/Makefile index 41dde662c..f7af0bfa6 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -10,9 +10,9 @@ PKG_MD5SUM:= cb5629b2709ada82d34c22fef3ed77a9 PKG_DESCR:= An anonymous Internet communication system PKG_SECTION:= proxy PKG_DEPENDS:= libevent libopenssl zlib libpthread -PKG_BUILDDEP+= libevent openssl zlib -PKG_URL:= http://tor.eff.org -PKG_SITES:= http://tor.eff.org/dist/ \ +PKG_BUILDDEP:= libevent openssl zlib +PKG_URL:= http://tor.eff.org/ +PKG_SITES:= http://tor.eff.org/dist/ include ${TOPDIR}/mk/package.mk diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile index af82cb4e1..4ef0d742b 100644 --- a/package/trafshow/Makefile +++ b/package/trafshow/Makefile @@ -10,7 +10,6 @@ PKG_MD5SUM:= 0b2f0bb23b7832138b7d841437b9e182 PKG_DESCR:= traffic analyzing tool PKG_SECTION:= net PKG_SITES:= http://www.sfr-fresh.com/linux/misc/ - PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/tslib/Makefile b/package/tslib/Makefile index 2ebd83179..ff0afe6c9 100644 --- a/package/tslib/Makefile +++ b/package/tslib/Makefile @@ -10,8 +10,7 @@ PKG_MD5SUM:= 92b2eb55b1e4ef7e2c0347069389390e PKG_DESCR:= touchscreen library PKG_SECTION:= libs PKG_URL:= http://tslib.berlios.de/ -PKG_SITES:= http://download.berlios.de/tslib/ \ - http://download2.berlios.de/tslib/ +PKG_SITES:= http://download.berlios.de/tslib/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/twm/Makefile b/package/twm/Makefile index 7e2a70482..9412aeb5d 100644 --- a/package/twm/Makefile +++ b/package/twm/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 109979bd39d48bd761e7939b30006a48 PKG_DESCR:= X.Org twm application PKG_SECTION:= x11/apps PKG_DEPENDS:= xorg-server -PKG_BUILDDEP+= xorg-server -PKG_URL:= http://xorg.freedesktop.org +PKG_BUILDDEP:= xorg-server +PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ PKG_TARGET_DEPENDS:= !foxboard diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 6d358b317..760258bdd 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -9,12 +9,12 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1ceef3209cca88be8f1bd9de99735954 PKG_DESCR:= A standard c++ library for embedded systems PKG_SECTION:= libs -PKG_URL:= http://cxx.uclibc.org +PKG_URL:= http://cxx.uclibc.org/ PKG_SITES:= http://cxx.uclibc.org/src/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -CFLINE_UCLIBCXX:= depends on ADK_TARGET_LIB_UCLIBC +PKG_CFLINE_UCLIBCXX:= depends on ADK_TARGET_LIB_UCLIBC include ${TOPDIR}/mk/package.mk diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index ba9f9b379..ad9739f8c 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -7,15 +7,17 @@ include $(TOPDIR)/toolchain/uClibc/Makefile.inc PKG_DESCR:= embedded C library PKG_SECTION:= base PKG_OPTS:= noremove -PKG_DESCR_LIB_DEV:= development files for uclibc -PKG_SECTION_LIB_DEV:= devel + +PKG_SUBPKGS:= UCLIBC UCLIBC_DEV +PKGSD_UCLIBC_DEV:= development files for uclibc +PKGSC_UCLIBC_DEV:= devel NO_DISTFILES:= 1 include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV},${PKG_OPTS})) +$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_UCLIBC_DEV},${PKGSC_UCLIBC_DEV},${PKG_OPTS})) CONFIG_STYLE:= manual BUILD_STYLE:= manual diff --git a/package/udev/Makefile b/package/udev/Makefile index 609106ac3..4292c16a2 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -12,9 +12,9 @@ PKG_SECTION:= utils PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/hotplug/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_CFLINE_UDEV:= depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC -CFLINE_UDEV:= depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC\n\t +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile index 4ba2052f9..0c370e896 100644 --- a/package/udp-broadcast-relay/Makefile +++ b/package/udp-broadcast-relay/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a32f983b7063d6ac670e6b22be9b9d24 PKG_DESCR:= listens for packets on a specified UDP broadcast port PKG_SECTION:= net/misc -PKG_URL:= http://www.joachim-breitner.de/udp-broadcast-relay +PKG_URL:= http://www.joachim-breitner.de/udp-broadcast-relay/ PKG_SITES:= http://www.joachim-breitner.de/udp-broadcast-relay/files/ include ${TOPDIR}/mk/package.mk diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index ab516d1e8..6993fed64 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -9,26 +9,22 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 21143aecf8e39008d143a0fb0f742b0c PKG_DESCR:= Netfilter userspace logging daemon PKG_SECTION:= firewall -PKG_MULTI:= 1 -PKG_NOPARALLEL:= 1 PKG_DEPENDS:= iptables libnetfilter-conntrack libnetfilter-log -PKG_BUILDDEP+= iptables libnetfilter_conntrack libnetfilter_log -ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),) -PKG_BUILDDEP+= mysql -endif -ifneq ($(ADK_PACKAGE_ULOGD_MOD_PGSQL),) -PKG_BUILDDEP+= postgresql -endif -ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),) -PKG_BUILDDEP+= sqlite -endif +PKG_BUILDDEP:= iptables libnetfilter_conntrack libnetfilter_log PKG_URL:= http://www.netfilter.org/projects/ulogd/ PKG_SITES:= http://www.netfilter.org/projects/ulogd/files/ +PKG_MULTI:= 1 +PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SUBPKGS:= ULOGD ULOGD_MOD_MYSQL ULOGD_MOD_PCAP ULOGD_MOD_PGSQL ULOGD_MOD_SQLITE ULOGD_MOD_EXTRA +PKGSB_MOD_MYSQL:= mysql +PKGSB_MOD_PGSQL:= postgresql +PKGSB_MOD_SQLITE:= sqlite PKG_HOST_DEPENDS:= !cygwin +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile index a8779fcd2..66b2b09f7 100644 --- a/package/updatedd/Makefile +++ b/package/updatedd/Makefile @@ -9,8 +9,12 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 95655596eb6e0e381d60a458f6a45fee PKG_DESCR:= A tool to update dynamic dns services. PKG_SECTION:= dns -PKG_MULTI:= 1 PKG_SITES:= http://savannah.nongnu.org/download/updatedd/ +PKG_MULTI:= 1 + +PKG_SUBPKGS:= UPDATEDD UPDATEDD_MOD_CHANGEIP UPDATEDD_MOD_DYNDNS UPDATEDD_MOD_EURODYNDNS +PKG_SUBPKGS+= UPDATEDD_MOD_HN UPDATEDD_MOD_NOIP UPDATEDD_MOD_ODS UPDATEDD_MOD_OVH +PKG_SUBPKGS+= UPDATEDD_MOD_REGFISH UPDATEDD_MOD_TZO DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index fd79c90bb..21ec416ed 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -10,9 +10,11 @@ PKG_MD5SUM:= 34979f675d2bcb3e1b45012fa830a53f PKG_DESCR:= A program to list USB devices PKG_SECTION:= utils PKG_DEPENDS:= libusb libusb-compat libpthread -PKG_BUILDDEP+= libusb libusb-compat +PKG_BUILDDEP:= libusb libusb-compat PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-usb/} +PKG_SUBPKGS:= LSUSB + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile index db71ffad0..1d0d2d7b9 100644 --- a/package/ussp-push/Makefile +++ b/package/ussp-push/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 5c44983ee27809867041feff6bb4423a PKG_DESCR:= OBEX push command PKG_SECTION:= bluetooth PKG_DEPENDS:= openobex -PKG_BUILDDEP+= openobex +PKG_BUILDDEP:= openobex PKG_SITES:= http://xmailserver.org/ include ${TOPDIR}/mk/package.mk diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index c6fcaad95..a974ea4fa 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -9,26 +9,27 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4c810430e86d53b6ea5e7ae279b39186 PKG_DESCR:= Linux utilities PKG_SECTION:= fs -PKG_BUILDDEP+= e2fsprogs ncurses +PKG_BUILDDEP:= e2fsprogs ncurses PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.17/} -PKG_DESCR_FDISK:= Partition table manipulation utility -PKG_DESCR_SFDISK:= Scriptable Partition table manipulation utility -PKG_DESCR_SWAP:= Swap space management utilities -PKG_DEPENDS_SWAP:= libblkid -PKG_DESCR_LOOP:= Loop devices management utilities -PKG_DEPENDS_LOOP:= kmod-blk-dev-loop -PKG_DESCR_MCOOKIE:= Generate magic cookies for xauth -PKG_SECT_MCOOKIE:= x11/apps +PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE +PKGSD_FDISK:= Partition table manipulation utility +PKGSD_SFDISK:= Scriptable Partition table manipulation utility +PKGSD_SWAP_UTILS:= Swap space management utilities +PKGSS_SWAP_UTILS:= libblkid +PKGSD_LOSETUP:= Loop devices management utilities +PKGSS_LOSETUP:= kmod-blk-dev-loop +PKGSD_MCOOKIE:= Generate magic cookies for xauth +PKGSC_MCOOKIE:= x11/apps include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FDISK},${PKG_SECTION})) -$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFDISK},${PKG_SECTION})) -$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SWAP},${PKG_DESCR_SWAP},${PKG_SECTION})) -$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LOOP},${PKG_DESCR_LOOP},${PKG_SECTION})) -$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_MCOOKIE},${PKG_SECT_MCOOKIE})) +$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKG_SECTION})) +$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKG_SECTION})) +$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP},${PKGSD_SWAP},${PKG_SECTION})) +$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOOP},${PKGSD_LOOP},${PKG_SECTION})) +$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE})) CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-schedutils \ diff --git a/package/uvd/Makefile b/package/uvd/Makefile index 92a6b07a2..448f9c375 100644 --- a/package/uvd/Makefile +++ b/package/uvd/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.1 PKG_RELEASE:= 2 PKG_DESCR:= udp server for version information PKG_SECTION:= base -PKG_URL:= http://www.openadk.org +PKG_URL:= http://www.openadk.org/ NO_DISTFILES:= 1 diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 24e99390d..ffc76e9c3 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f03522a4687cf76c676c9494fcc0a517 PKG_DESCR:= memory management debugging PKG_SECTION:= debug -PKG_URL:= http://valgrind.org +PKG_URL:= http://valgrind.org/ PKG_SITES:= http://valgrind.org/downloads/ PKG_TARGET_DEPENDS:= x86 x86_64 diff --git a/package/vgp/Makefile b/package/vgp/Makefile index 9420bc8bb..5b134075e 100755 --- a/package/vgp/Makefile +++ b/package/vgp/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= b8c25b5dfcb944f78bbc584be9c230c7 PKG_DESCR:= vgp is a daemon working like Cisco HSRP PKG_SECTION:= net/misc -PKG_URL:= http://vgpd.freaknet.org +PKG_URL:= http://vgpd.freaknet.org/ PKG_SITES:= http://vgpd.freaknet.org/files/ include ${TOPDIR}/mk/package.mk diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile index c28b0a4da..42b9a044d 100644 --- a/package/videoproto/Makefile +++ b/package/videoproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.3.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 888543493cd69c6c78002ac59c3f077f PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile index 01202e94b..4899b3591 100644 --- a/package/vilistextum/Makefile +++ b/package/vilistextum/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vilistextum PKG_VERSION:= 2.6.9 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libiconv PKG_MD5SUM:= 5ba56ffdc56758da716bb46c3e0f517e PKG_DESCR:= html to ascii converter PKG_SECTION:= mail PKG_DEPENDS:= libiconv +PKG_BUILDDEP:= libiconv PKG_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/ include ${TOPDIR}/mk/package.mk diff --git a/package/vim/Makefile b/package/vim/Makefile index cc3bb6e4d..d9b2bfdfb 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -3,16 +3,16 @@ include ${TOPDIR}/rules.mk -PKG_NAME= vim -PKG_VERSION= 7.2 -PKG_RELEASE= 2 -PKG_BUILDDEP+= ncurses -PKG_MD5SUM= f0901284b338e448bfd79ccca0041254 +PKG_NAME:= vim +PKG_VERSION:= 7.2 +PKG_RELEASE:= 2 +PKG_MD5SUM:= f0901284b338e448bfd79ccca0041254 PKG_DESCR:= The text editor PKG_SECTION:= editor PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses PKG_URL:= http://www.vim.org/ -PKG_SITES= ftp://ftp.vim.org/pub/vim/unix/ +PKG_SITES:= ftp://ftp.vim.org/pub/vim/unix/ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 WRKDIST= ${WRKDIR}/vim72 diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile index 7cdc7ba14..72aefd342 100644 --- a/package/vnc-reflector/Makefile +++ b/package/vnc-reflector/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c3f88bc62f228b335c25c07f9744ab0c PKG_DESCR:= specialized VNC server which acts as a proxy PKG_SECTION:= proxy PKG_DEPENDS:= libjpeg zlib -PKG_BUILDDEP+= jpeg zlib +PKG_BUILDDEP:= jpeg zlib PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vnc-reflector/} DISTFILES:= vnc_reflector-${PKG_VERSION}.tar.gz diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index 72fa69459..0c4fd12ef 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 4378f9551d5b077e1770bbe09995afb3 PKG_DESCR:= client for cisco3000 VPN Concentrator. PKG_SECTION:= net/security PKG_DEPENDS:= libgcrypt libgpg-error kmod-tun -PKG_BUILDDEP+= libgcrypt libgpg-error +PKG_BUILDDEP:= libgcrypt libgpg-error PKG_URL:= http://www.unix-ag.uni-kl.de/~massar/vpnc/ PKG_SITES:= http://www.unix-ag.uni-kl.de/~massar/vpnc/ diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 20a71844b..61e1f80da 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e4eb190af270ae65d57a84274a38ec31 PKG_DESCR:= a fast and secure FTP server PKG_SECTION:= www -PKG_URL:= http://vsftpd.beasts.org +PKG_URL:= http://vsftpd.beasts.org/ PKG_SITES:= ftp://vsftpd.beasts.org/users/cevans/ include ${TOPDIR}/mk/package.mk diff --git a/package/vtun/Makefile b/package/vtun/Makefile index 781e54be1..8c437aec4 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c342ffe77055d4248a38f0b380f28c1b PKG_DESCR:= A VPN tunnel daemon PKG_SECTION:= net/misc PKG_DEPENDS:= zlib libopenssl liblzo kmod-tun -PKG_BUILDDEP+= zlib openssl liblzo +PKG_BUILDDEP:= zlib openssl liblzo PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/} PKG_HOST_DEPENDS:= !freebsd diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index 25169868a..fb55d5b4c 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -3,15 +3,15 @@ include ${TOPDIR}/rules.mk -PKG_NAME= wdfs -PKG_VERSION= 1.4.2 -PKG_RELEASE= 2 -PKG_MD5SUM= 628bb44194d04c1cf8aacc446ed0a230 +PKG_NAME:= wdfs +PKG_VERSION:= 1.4.2 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 628bb44194d04c1cf8aacc446ed0a230 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= fs PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse-fs neon glib -PKG_BUILDDEP+= openssl fuse neon glib -PKG_SITES= http://noedler.de/projekte/wdfs/ +PKG_BUILDDEP:= openssl fuse neon glib +PKG_SITES:= http://noedler.de/projekte/wdfs/ include ${TOPDIR}/mk/package.mk diff --git a/package/weechat/Makefile b/package/weechat/Makefile index ca77c5672..ff95435f3 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 0c4f6e7196703c6eca12217f254612aa PKG_DESCR:= Lightweight IRC client PKG_SECTION:= chat PKG_DEPENDS:= libncurses libiconv -PKG_BUILDDEP+= ncurses libiconv +PKG_BUILDDEP:= ncurses libiconv PKG_URL:= http://www.weechat.org/ PKG_SITES:= http://www.weechat.org/files/src/ diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index 629982ef8..d726a0779 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31 PKG_DESCR:= a complete and embeddable captive portal PKG_SECTION:= wifi PKG_DEPENDS:= iptables -PKG_URL:= http://dev.wifidog.org +PKG_URL:= http://dev.wifidog.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} include ${TOPDIR}/mk/package.mk diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile index 1a7d78847..126479da3 100644 --- a/package/wondershaper/Makefile +++ b/package/wondershaper/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 7 PKG_MD5SUM:= bbc5a3a4485ab286e337ce8550e7b990 PKG_DESCR:= WonderShaper is a tc based traffic shaping tool. PKG_SECTION:= firewall -PKG_URL:= http://lartc.org/wondershaper +PKG_URL:= http://lartc.org/wondershaper/ PKG_SITES:= http://lartc.org/wondershaper/ include ${TOPDIR}/mk/package.mk diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index b46e31db6..104e98c5e 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -10,13 +10,7 @@ PKG_MD5SUM:= 0e2cb7e4c35667351d8b7ec28c783e6a PKG_DESCR:= WPA Supplicant with support for WPA and WPA2 PKG_SECTION:= wifi PKG_DEPENDS:= libnl -PKG_BUILDDEP+= libnl -ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL},y) -PKG_BUILDDEP+= openssl -endif -ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},y) -PKG_BUILDDEP+= gnutls -endif +PKG_BUILDDEP:= libnl PKG_SITES:= http://hostap.epitest.fi/releases/ WRKSRC= ${WRKDIST}/${PKG_NAME} @@ -24,8 +18,10 @@ WRKSRC= ${WRKDIST}/${PKG_NAME} PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_GNUTLS:= use GnuTLS for crypto PKGCS_WITH_GNUTLS:= libgnutls +PKGCB_WITH_GNUTLS:= gnutls include ${TOPDIR}/mk/package.mk diff --git a/package/xauth/Makefile b/package/xauth/Makefile index 26ebb1426..150f2e813 100644 --- a/package/xauth/Makefile +++ b/package/xauth/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 2eb3cc3e4421e1b747c4ac16aac20cda PKG_DESCR:= X authority file utility PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 libxext libxmu -PKG_BUILDDEP+= libX11 libXext libXmu +PKG_BUILDDEP:= libX11 libXext libXmu PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 67bcf625e..1e3665010 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 8d29695e8faf5fcdce568c66eaeaa5ee PKG_SITES:= http://xcb.freedesktop.org/dist/ +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile index df4b324c2..e33f78c66 100644 --- a/package/xcmiscproto/Makefile +++ b/package/xcmiscproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= bacfb0f3cb4d6e1a71770307bfdba129 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile index 8d61db142..eb21715cf 100644 --- a/package/xextproto/Makefile +++ b/package/xextproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 7.1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 6c55283718dbeb826bcf899b9e89faba PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile index 487ade6c2..f5f2b22dd 100644 --- a/package/xf86-input-evtouch/Makefile +++ b/package/xf86-input-evtouch/Makefile @@ -10,13 +10,13 @@ PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13 PKG_DESCR:= X11 driver for touchscreen PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server kmod-input-evdev -PKG_BUILDDEP+= xorg-server +PKG_BUILDDEP:= xorg-server PKG_SITES:= http://www.conan.de/touchscreen/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - PKG_TARGET_DEPENDS:= alix1c +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_INPUT_EVTOUCH,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index 085ddffd1..dbd52876d 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= fc836be5364d80604cb11f4daacceb23 PKG_DESCR:= X11 driver for keyboard PKG_SECTION:= x11/drivers -PKG_BUILDDEP+= xorg-server PKG_DEPENDS:= xorg-server +PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} PKG_TARGET_DEPENDS:= alix1c lemote ibmx40 shuttle diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index d926a190a..cfaa9619e 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= a662883fd9709c3dad7fb113ad8d2908 PKG_DESCR:= X11 driver for mouse PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server -PKG_BUILDDEP+= xorg-server +PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} PKG_TARGET_DEPENDS:= alix1c lemote ibmx40 shuttle diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index 742a62df6..705eb8ff3 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-video-cirrus PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= xorg-server PKG_MD5SUM:= c63a29917c48d0c317445991fc36d09a PKG_DESCR:= X11 driver for Cirrus VGA chips PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server +PKG_BUILDDEP:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ PKG_TARGET_DEPENDS:= x86_qemu x86_64_qemu diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile index 7da4c871e..7d3ca9f76 100644 --- a/package/xf86-video-fbdev/Makefile +++ b/package/xf86-video-fbdev/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c297e40b93b3636a72189cfac43d1a87 PKG_DESCR:= X11 driver for Linux Framebuffer devices PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server -PKG_BUILDDEP+= xorg-server +PKG_BUILDDEP:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ PKG_TARGET_DEPENDS:= alix1c lemote ibmx40 diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index 7cb85e12f..e41a83584 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= a673c0f88037d12fbb96d9fefc82785b PKG_DESCR:= X11 driver for AMD Geode VGA chip PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server -PKG_BUILDDEP+= xorg-server +PKG_BUILDDEP:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ PKG_TARGET_DEPENDS:= alix1c diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index d1a70117e..024eb0985 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b1926dc68cc10209fc2200729fb6162b PKG_DESCR:= X11 driver for Intel VGA chip PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libdrm -PKG_BUILDDEP+= xorg-server libdrm +PKG_BUILDDEP:= xorg-server libdrm PKG_SITES:= http://www.x.org/releases/X11R7.5/src/driver/ PKG_TARGET_DEPENDS:= ibmx40 diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile index e372928ff..1150824b3 100644 --- a/package/xf86-video-siliconmotion/Makefile +++ b/package/xf86-video-siliconmotion/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 39da891cd368960443613e7a61398216 PKG_DESCR:= X11 driver for Silicon Motion VGA chips PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server -PKG_BUILDDEP+= xorg-server +PKG_BUILDDEP:= xorg-server PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/ PKG_TARGET_DEPENDS:= lemote diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile index c3e7e5e86..77558173b 100644 --- a/package/xf86dga/Makefile +++ b/package/xf86dga/Makefile @@ -6,9 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86dga PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libXxf86dga PKG_MD5SUM:= ac30b5705f487554c5de0b466e846c31 +PKG_BUILDDEP:= libXxf86dga PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile index 34009118f..ba8dda7c7 100644 --- a/package/xf86dgaproto/Makefile +++ b/package/xf86dgaproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 1fe79dc07857ad3e1fb8b8f2bdd70d1b PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86driproto/Makefile b/package/xf86driproto/Makefile index 27e3dca18..77a292ac8 100644 --- a/package/xf86driproto/Makefile +++ b/package/xf86driproto/Makefile @@ -8,6 +8,8 @@ PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 309d552732666c3333d7dc63e80d042f PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SUBPKGS:= + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile index 2f1d5a8c3..86e7d3a55 100644 --- a/package/xf86vidmodeproto/Makefile +++ b/package/xf86vidmodeproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 934b400f2f8d1bcab20bb056e0910291 PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 7dfe22149..5f702689e 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c2308b46ee707597ac50aae418d321b8 PKG_DESCR:= Utilities for XFS filesystems PKG_SECTION:= fs PKG_DEPENDS:= libuuid libpthread -PKG_BUILDDEP+= e2fsprogs +PKG_BUILDDEP:= e2fsprogs PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index 868678b4d..37ab2be35 100644 --- a/package/xinetd/Makefile +++ b/package/xinetd/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 567382d7972613090215c6c54f9b82d9 PKG_DESCR:= a powerful and secure superserver PKG_SECTION:= net/misc -PKG_URL:= http://www.xinetd.org +PKG_URL:= http://www.xinetd.org/ PKG_SITES:= http://www.xinetd.org/ include $(TOPDIR)/mk/package.mk diff --git a/package/xinit/Makefile b/package/xinit/Makefile index 6a1461826..8c5b5da5c 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb PKG_DESCR:= X Window System initializer PKG_SECTION:= x11/apps PKG_DEPENDS:= xorg-server mcookie xauth xset -PKG_BUILDDEP+= xorg-server -PKG_URL:= http://xorg.freedesktop.org +PKG_BUILDDEP:= xorg-server +PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ PKG_TARGET_DEPENDS:= !foxboard diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index e53b1cd6e..55e556908 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f049d15f1e9d95776a940f222df9404b PKG_DESCR:= X keyboard config PKG_SECTION:= x11/libs -PKG_BUILDDEP+= xkbcomp +PKG_BUILDDEP:= xkbcomp PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/ include $(TOPDIR)/mk/package.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index cf009036e..351d96371 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,27 +9,24 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11/server -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ - libfontenc xkeyboard-config xkbcomp libxau libxaw \ - libxmu libxpm libxrender libxt libxxf86dga libxext \ - libxdmcp libxv libsm libice libx11 -PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ - scrnsaverproto resourceproto fontsproto videoproto \ - compositeproto evieext libxkbfile libXfont pixman \ - libpciaccess openssl xf86dgaproto -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) -PKG_BUILDDEP+= xf86driproto glproto dri2proto MesaLib -endif -PKG_URL:= http://www.x.org +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile +PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw +PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 +PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto +PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto +PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman +PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto +PKG_URL:= http://www.x.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ PKG_TARGET_DEPENDS:= !foxboard - -CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA +PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA PKG_FLAVOURS:= WITH_DRI PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support +PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib include $(TOPDIR)/mk/package.mk diff --git a/package/xproto/Makefile b/package/xproto/Makefile index a3c76afe2..5aa23ad20 100644 --- a/package/xproto/Makefile +++ b/package/xproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 7.0.16 PKG_RELEASE:= 1 PKG_MD5SUM:= 6e6b6510ccd568f82093ebd7ae58700b PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk diff --git a/package/xterm/Makefile b/package/xterm/Makefile index fe9aa5e83..35a302662 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -13,9 +13,10 @@ PKG_DEPENDS:= xorg-server libxaw PKG_URL:= http://invisible-island.net/xterm/xterm.html PKG_SITES:= ftp://invisible-island.net/xterm/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz PKG_TARGET_DEPENDS:= !foxboard !foxg20 !ag241 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XTERM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile index 280b98219..b2715edd6 100644 --- a/package/xtrans/Makefile +++ b/package/xtrans/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.2.5 PKG_RELEASE:= 1 PKG_MD5SUM:= b2f47d49faf1f24e8294b624b21b9b93 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile index 124e263a7..18b21d9f3 100644 --- a/package/xvinfo/Makefile +++ b/package/xvinfo/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= cc00d609136ecc0b6b571dc42740a675 PKG_DESCR:= Print out X-Video extension adaptor information PKG_SECTION:= x11/apps PKG_DEPENDS:= xorg-server -KG_BUILDDEP+= xorg-server +PKG_BUILDDEP:= xorg-server PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 58957b639..a05e9caf2 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -9,12 +9,13 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= be1e89810e66150f5b0327984d8625a0 PKG_DESCR:= implementation of the deflate compression method PKG_SECTION:= libs -PKG_URL:= http://www.zlib.net -PKG_SITES:= http://www.zlib.net/ \ - ${MASTER_SITE_SOURCEFORGE:=zlib/} +PKG_URL:= http://www.zlib.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=zlib/} + +PKG_SUBPKGS:= ZLIB ZLIB_DEV +PKGSD_ZLIB_DEV:= development files for zlib +PKGSC_ZLIB_DEV:= devel -PKG_DESCR_LIB_DEV:= development files for zlib -PKG_SECTION_LIB_DEV:= devel DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 ifeq ($(ADK_STATIC),y) diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh index f5d2db07f..816bdfc02 100644 --- a/scripts/split-cfg.sh +++ b/scripts/split-cfg.sh @@ -2,6 +2,7 @@ # material, please see the LICENCE file in the top-level directory. # Note: this is slow, but it's not the "progress stuff" which cau- # ses the slow-down. +set -x TOPDIR=$1 TARGET=$2 diff --git a/target/target.lst b/target/target.lst index 00c245c6a..490f36eca 100644 --- a/target/target.lst +++ b/target/target.lst @@ -1,16 +1,16 @@ -native ADK_LINUX_NATIVE -alix1c ADK_LINUX_X86_ALIX1C -alix2d ADK_LINUX_X86_ALIX2D +native ADK_LINUX_NATIVE +alix1c ADK_LINUX_X86_ALIX1C +alix2d ADK_LINUX_X86_ALIX2D alix2d13 ADK_LINUX_X86_ALIX2D13 -alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_ALIX2D13 -wrap ADK_LINUX_X86_WRAP -ibmx40 ADK_LINUX_X86_IBMX40 +alix ADK_LINUX_X86_ALIX1C ADK_LINUX_X86_ALIX2D ADK_LINUX_X86_ALIX2D13 +wrap ADK_LINUX_X86_WRAP +ibmx40 ADK_LINUX_X86_IBMX40 foxboard ADK_LINUX_CRIS_FOXBOARD -foxg20 ADK_LINUX_ARM_FOXG20 -lemote ADK_LINUX_MIPS64_LEMOTE -ag241 ADK_LINUX_MIPS_AG241 -zaurus ADK_LINUX_XSCALE_ZAURUS -shuttle ADK_LINUX_X86_64_SHUTTLE +foxg20 ADK_LINUX_ARM_FOXG20 +lemote ADK_LINUX_MIPS64_LEMOTE +ag241 ADK_LINUX_MIPS_AG241 +zaurus ADK_LINUX_XSCALE_ZAURUS +shuttle ADK_LINUX_X86_64_SHUTTLE x86_64_rescue ADK_LINUX_X86_64_RESCUE x86_rescue ADK_LINUX_X86_RESCUE mipsel_rescue ADK_LINUX_MIPSEL_RESCUE @@ -23,7 +23,7 @@ ppc_toolchain ADK_LINUX_PPC_TOOLCHAIN sparc_toolchain ADK_LINUX_SPARC_TOOLCHAIN x86_toolchain ADK_LINUX_X86_TOOLCHAIN x86_64_toolchain ADK_LINUX_X86_64_TOOLCHAIN -toolchain ADK_LINUX_ARM_TOOLCHAIN || ADK_LINUX_ARMEL_TOOLCHAIN || ADK_LINUX_MIPS_TOOLCHAIN || ADK_LINUX_MIPSEL_TOOLCHAIN || ADK_LINUX_PPC_TOOLCHAIN || ADK_LINUX_SPARC_TOOLCHAIN || ADK_LINUX_X86_64_TOOLCHAIN || ADK_LINUX_X86_TOOLCHAIN +toolchain ADK_LINUX_ARM_TOOLCHAIN ADK_LINUX_ARMEL_TOOLCHAIN ADK_LINUX_MIPS_TOOLCHAIN ADK_LINUX_MIPSEL_TOOLCHAIN ADK_LINUX_PPC_TOOLCHAIN ADK_LINUX_SPARC_TOOLCHAIN ADK_LINUX_X86_64_TOOLCHAIN ADK_LINUX_X86_TOOLCHAIN arm_qemu ADK_LINUX_ARM_QEMU mips_qemu ADK_LINUX_MIPS_QEMU mipsel_qemu ADK_LINUX_MIPSEL_QEMU @@ -32,9 +32,9 @@ mips64el_qemu ADK_LINUX_MIPS64EL_QEMU cris_qemu ADK_LINUX_CRIS_QEMU x86_qemu ADK_LINUX_X86_QEMU x86_64_qemu ADK_LINUX_X86_64_QEMU -qemu ADK_LINUX_ARM_QEMU || ADK_LINUX_MIPS_QEMU || ADK_LINUX_MIPSEL_QEMU || ADK_LINUX_MIPS64_QEMU || ADK_LINUX_MIPS64EL_QEMU || ADK_LINUX_CRIS_QEMU || ADK_LINUX_X86_QEMU || ADK_LINUX_X86_64_QEMU -rb4xx ADK_LINUX_MIPS_RB4XX -rb532 ADK_LINUX_MIPS_RB532 -routerboard ADK_LINUX_MIPS_RB4XX || ADK_LINUX_MIPS_RB532 -x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP || ADK_LINUX_X86_ALIX2D13 || ADK_LINUX_X86_IBMX40 -x86_64 ADK_LINUX_X86_64_QEMU || ADK_LINUX_X86_64_RESCUE || ADK_LINUX_X86_64_SHUTTLE +qemu ADK_LINUX_ARM_QEMU ADK_LINUX_MIPS_QEMU ADK_LINUX_MIPSEL_QEMU ADK_LINUX_MIPS64_QEMU ADK_LINUX_MIPS64EL_QEMU ADK_LINUX_CRIS_QEMU ADK_LINUX_X86_QEMU ADK_LINUX_X86_64_QEMU +rb4xx ADK_LINUX_MIPS_RB4XX +rb532 ADK_LINUX_MIPS_RB532 +routerboard ADK_LINUX_MIPS_RB4XX ADK_LINUX_MIPS_RB532 +x86 ADK_LINUX_X86_QEMU ADK_LINUX_X86_RESCUE ADK_LINUX_X86_ALIX1C ADK_LINUX_X86_ALIX2D ADK_LINUX_X86_WRAP ADK_LINUX_X86_ALIX2D13 ADK_LINUX_X86_IBMX40 +x86_64 ADK_LINUX_X86_64_QEMU ADK_LINUX_X86_64_RESCUE ADK_LINUX_X86_64_SHUTTLE diff --git a/tools/Makefile b/tools/Makefile index 7c5931319..b828f6765 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk -TARGETS:=mkcrypt cpio +TARGETS:=adk mkcrypt cpio TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/adk/Makefile b/tools/adk/Makefile new file mode 100644 index 000000000..28d8787ce --- /dev/null +++ b/tools/adk/Makefile @@ -0,0 +1,11 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +${TOPDIR}/bin/tools/depmaker: + $(HOSTCC) -o $(TOPDIR)/bin/tools/depmaker depmaker.c + +install: ${TOPDIR}/bin/tools/depmaker + +include $(TOPDIR)/mk/tools.mk diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c new file mode 100644 index 000000000..c0e434590 --- /dev/null +++ b/tools/adk/depmaker.c @@ -0,0 +1,233 @@ +/* + * depmaker - create package/Depends.mk for OpenADK buildsystem + * + * Copyright (C) 2010 Waldemar Brodkorb + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define MAXLINE 512 +#define MAXPATH 128 + +static int prefix = 0; + +static int check_symbol(char *symbol) { + + FILE *config; + char buf[MAXLINE]; + char *sym; + int ret; + + if ((sym = malloc(strlen(symbol) + 2)) != NULL) + memset(sym, 0, strlen(symbol) + 2); + else { + perror("Can not allocate memory."); + exit(EXIT_FAILURE); + } + + strncat(sym, symbol, strlen(symbol)); + strncat(sym, "=", 1); + if ((config = fopen(".config", "r")) == NULL) { + perror("Can not open file \".config\"."); + exit(EXIT_FAILURE); + } + + ret = 1; + while (fgets(buf, MAXLINE, config) != NULL) { + if (strncmp(buf, sym, strlen(sym)) == 0) + ret = 0; + } + + free(sym); + if (fclose(config) != 0) + perror("Closing file stream failed"); + + return(ret); +} + +/*@null@*/ +static char *parse_line(char *package, char *pkgvar, char *string, int checksym) { + + char *key, *value, *dep, *key_sym, *pkgdeps; + char temp[MAXLINE]; + + string[strlen(string)-1] = '\0'; + if ((key = strtok(string, ":=")) == NULL) { + perror("Can not get key from string."); + exit(EXIT_FAILURE); + } + + if (checksym == 1) { + /* extract symbol */ + if ((key_sym = malloc(MAXLINE)) != NULL) + memset(key_sym, 0, MAXLINE); + else { + perror("Can not allocate memory."); + exit(EXIT_FAILURE); + } + if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_%s_", pkgvar) < 0) + perror("Can not create string variable."); + + strncat(key_sym, key+6, strlen(key)-6); + if (check_symbol(key_sym) != 0) { + free(key_sym); + return(NULL); + } + free(key_sym); + } + + if ((pkgdeps = malloc(MAXLINE)) != NULL) + memset(pkgdeps, 0, MAXLINE); + else { + perror("Can not allocate memory."); + exit(EXIT_FAILURE); + } + + value = strtok(NULL, "=\t"); + dep = strtok(value, " "); + while (dep != NULL) { + if (prefix == 0) { + prefix = 1; + if (snprintf(temp, MAXLINE, "%s-compile: %s-compile", package, dep) < 0) + perror("Can not create string variable."); + } else { + if (snprintf(temp, MAXLINE, " %s-compile", dep) < 0) + perror("Can not create string variable."); + } + strncat(pkgdeps, temp, strlen(temp)); + dep = strtok(NULL, " "); + } + return(pkgdeps); +} + +int main() { + + DIR *pkgdir; + struct dirent *pkgdirp; + FILE *pkg; + char buf[MAXLINE]; + char path[MAXPATH]; + char *string, *pkgvar, *pkgdeps, *tmp; + int i; + + /* read Makefile's for all packages */ + pkgdir = opendir("package"); + while ((pkgdirp = readdir(pkgdir)) != NULL) { + /* skip dotfiles */ + if (strncmp(pkgdirp->d_name, ".", 1) > 0) { + if (snprintf(path, MAXLINE, "package/%s/Makefile", pkgdirp->d_name) < 0) + perror("Can not create string variable."); + pkg = fopen(path, "r"); + if (pkg == NULL) + continue; + + /* transform to uppercase variable name */ + pkgvar = strndup(pkgdirp->d_name, strlen(pkgdirp->d_name)); + for (i=0; i<(int)strlen(pkgvar); i++) { + if (pkgvar[i] == '+') + pkgvar[i] = 'X'; + if (pkgvar[i] == '-') + pkgvar[i] = '_'; + pkgvar[i] = toupper(pkgvar[i]); + } + + /* exclude manual maintained packages from package/Makefile */ + if (!(strncmp(pkgdirp->d_name, "eglibc", 6) == 0) && + !(strncmp(pkgdirp->d_name, "libc", 4) == 0) && + !(strncmp(pkgdirp->d_name, "libpthread", 10) == 0) && + !(strncmp(pkgdirp->d_name, "uclibc++", 8) == 0) && + !(strncmp(pkgdirp->d_name, "uclibc", 6) == 0) && + !(strncmp(pkgdirp->d_name, "glibc", 5) == 0)) { + /* print result to stdout */ + printf("package-$(ADK_COMPILE_%s) += %s\n", pkgvar, pkgdirp->d_name); + } + + if ((pkgdeps = malloc(MAXLINE)) != NULL) + memset(pkgdeps, 0, MAXLINE); + else { + perror("Can not allocate memory."); + exit(EXIT_FAILURE); + } + prefix = 0; + + /* generate build dependencies */ + while (fgets(buf, MAXLINE, pkg) != NULL) { + if ((tmp = malloc(MAXLINE)) != NULL) + memset(tmp, 0 , MAXLINE); + else { + perror("Can not allocate memory."); + exit(EXIT_FAILURE); + } + + /* just read variables prefixed with PKG */ + if (strncmp(buf, "PKG", 3) == 0) { + + string = strstr(buf, "PKG_BUILDDEP:="); + if (string != NULL) { + tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0); + if (tmp != NULL) { + strncat(pkgdeps, tmp, strlen(tmp)); + } + } + + string = strstr(buf, "PKG_BUILDDEP+="); + if (string != NULL) { + tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0); + if (tmp != NULL) + strncat(pkgdeps, tmp, strlen(tmp)); + } + + string = strstr(buf, "PKGFB_"); + if (string != NULL) { + tmp = parse_line(pkgdirp->d_name, pkgvar, string, 1); + if (tmp != NULL) + strncat(pkgdeps, tmp, strlen(tmp)); + } + + string = strstr(buf, "PKGCB_"); + if (string != NULL) { + tmp = parse_line(pkgdirp->d_name, pkgvar, string, 1); + if (tmp != NULL) + strncat(pkgdeps, tmp, strlen(tmp)); + } + + string = strstr(buf, "PKGSB_"); + if (string != NULL) { + tmp = parse_line(pkgdirp->d_name, pkgvar, string, 1); + if (tmp != NULL) + strncat(pkgdeps, tmp, strlen(tmp)); + } + } + free(tmp); + } + if (strlen(pkgdeps) != 0) + printf("%s\n", pkgdeps); + free(pkgdeps); + free(pkgvar); + if (fclose(pkg) != 0) + perror("Closing file stream failed"); + } + } + if (closedir(pkgdir) != 0) + perror("Closing directory stream failed"); + + return(0); +} diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c new file mode 100644 index 000000000..667707d0b --- /dev/null +++ b/tools/adk/pkgmaker.c @@ -0,0 +1,797 @@ +/* + * pkgmaker - create package meta-data for OpenADK buildsystem + * + * Copyright (C) 2010 Waldemar Brodkorb + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "sortfile.h" +#include "strmap.h" + +#define MAXLINE 4096 +#define MAXVALUE 168 +#define MAXVAR 64 +#define MAXPATH 320 +#define HASHSZ 32 + +static int nobinpkgs; + +static void fatal_error(const char *message) { + + fprintf(stderr, "Fatal error. %s\n", message); + exit(1); +} + +static int parse_var_hash(char *buf, const char *varname, StrMap *strmap) { + + char *key, *value, *string; + + string = strstr(buf, varname); + if (string != NULL) { + string[strlen(string)-1] = '\0'; + key = strtok(string, ":="); + value = strtok(NULL, "=\t"); + if (value != NULL) + strmap_put(strmap, key, value); + return(0); + } + return(1); +} + +static int parse_var(char *buf, const char *varname, char *pvalue, char **result) { + + char *pkg_var; + char *key, *value, *string; + char pkg_str[MAXVAR]; + + if ((pkg_var = malloc(MAXLINE)) != NULL) + memset(pkg_var, 0, MAXLINE); + else { + perror("Can not allocate memory"); + exit(EXIT_FAILURE); + } + + if (snprintf(pkg_str, MAXVAR, "%s:=", varname) < 0) + perror("can not create path variable."); + string = strstr(buf, pkg_str); + if (string != NULL) { + string[strlen(string)-1] = '\0'; + key = strtok(string, ":="); + value = strtok(NULL, "=\t"); + if (value != NULL) { + strncat(pkg_var, value, strlen(value)); + *result = strdup(pkg_var); + } else { + nobinpkgs = 1; + *result = NULL; + } + free(pkg_var); + return(0); + } else { + if (snprintf(pkg_str, MAXVAR, "%s+=", varname) < 0) + perror("can not create path variable."); + string = strstr(buf, pkg_str); + if (string != NULL) { + string[strlen(string)-1] = '\0'; + key = strtok(string, "+="); + value = strtok(NULL, "=\t"); + if (pvalue != NULL) + strncat(pkg_var, pvalue, strlen(pvalue)); + strncat(pkg_var, " ", 1); + if (value != NULL) + strncat(pkg_var, value, strlen(value)); + *result = strdup(pkg_var); + free(pkg_var); + return(0); + } + } + free(pkg_var); + return(1); +} + +/* +static void iter_debug(const char *key, const char *value, const void *obj) { + fprintf(stderr, "HASHMAP key: %s value: %s\n", key, value); +} +*/ + +static int hash_str(char *string) { + + int i; + int hash; + + hash = 0; + for (i=0; i<(int)strlen(string); i++) { + hash += string[i]; + } + return(hash); +} + +static void iter(const char *key, const char *value, const void *obj) { + + FILE *config, *section; + int hash; + char *valuestr, *pkg, *subpkg; + char buf[MAXPATH]; + char infile[MAXPATH]; + char outfile[MAXPATH]; + + valuestr = strdup(value); + config = fopen("package/Config.in.auto", "a"); + if (config == NULL) + fatal_error("Can not open file package/Config.in.auto"); + + hash = hash_str(valuestr); + snprintf(infile, MAXPATH, "package/pkglist.d/sectionlst.%d", hash); + snprintf(outfile, MAXPATH, "package/pkglist.d/sectionlst.%d.sorted", hash); + + if (access(infile, F_OK) == 0) { + valuestr[strlen(valuestr)-1] = '\0'; + fprintf(config, "menu \"%s\"\n", valuestr); + sortfile(infile, outfile); + /* avoid duplicate section entries */ + unlink(infile); + section = fopen(outfile, "r"); + while (fgets(buf, MAXPATH, section) != NULL) { + buf[strlen(buf)-1] = '\0'; + if (buf[strlen(buf)-1] == '@') { + buf[strlen(buf)-1] = '\0'; + fprintf(config, "source \"package/%s/Config.in.manual\"\n", buf); + } else { + subpkg = strtok(buf, "|"); + pkg = strtok(NULL, "|"); + fprintf(config, "source \"package/pkgconfigs.d/%s/Config.in.%s\"\n", pkg, subpkg); + } + } + fprintf(config, "endmenu\n\n"); + fclose(section); + } + fclose(config); +} + +static char *print_target_depline(char *value, int neg, char *sp, FILE *cfg) { + + char *val; + char *np; + char *sptr; + + sptr = NULL; + np = ""; + val = strdup(value); + /* strtok_r is required here */ + val = strtok_r(val, " ", &sptr); + while (val != NULL) { + if (neg == 1) np = "!"; + fprintf(cfg, "%s%s%s", sp, np, val); + val = strtok_r(NULL, " ", &sptr); + if (neg == 1) + sp = " && "; + else + sp = " || "; + } + return(val); +} + +static char *tolowerstr(char *string) { + + int i; + char *str; + + /* transform to lowercase variable name */ + str = strdup(string); + for (i=0; i<(int)strlen(str); i++) { + if (str[i] == '_') + str[i] = '-'; + str[i] = tolower(str[i]); + } + return(str); +} + +static char *toupperstr(char *string) { + + int i; + char *str; + + /* transform to uppercase variable name */ + str = strdup(string); + for (i=0; i<(int)strlen(str); i++) { + if (str[i] == '+') + str[i] = 'X'; + if (str[i] == '-') + str[i] = '_'; + /* remove negation here, useful for package host depends */ + if (str[i] == '!') + str[i] = '_'; + str[i] = toupper(str[i]); + } + return(str); +} + + +int main() { + + DIR *pkgdir, *pkglistdir; + struct dirent *pkgdirp; + FILE *pkg, *cfg, *target, *menuglobal, *section; + char hvalue[MAXVALUE]; + char buf[MAXPATH]; + char tbuf[MAXPATH]; + char path[MAXPATH]; + char spath[MAXPATH]; + char dir[MAXPATH]; + char variable[2*MAXVAR]; + char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd; + char *pkg_name, *pkg_depends, *pkg_section, *pkg_descr, *pkg_url; + char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi; + char *pkg_host_depends, *pkg_target_depends, *pkg_flavours, *pkg_choices, *pseudo_name; + char *packages, *pkg_name_u, *pkgs; + char *saveptr, *p_ptr, *s_ptr; + int result, neg; + StrMap *pkgmap, *targetmap, *sectionmap; + + pkg_name = NULL; + pkg_descr = NULL; + pkg_section = NULL; + pkg_url = NULL; + pkg_depends = NULL; + pkg_flavours = NULL; + pkg_choices = NULL; + pkg_subpkgs = NULL; + pkg_target_depends = NULL; + pkg_host_depends = NULL; + pkg_cxx = NULL; + pkg_dflt = NULL; + pkg_cfline = NULL; + pkg_multi = NULL; + + p_ptr = NULL; + s_ptr = NULL; + + unlink("package/Config.in.auto"); + /* open global sectionfile */ + menuglobal = fopen("package/Config.in.auto.global", "w"); + if (menuglobal == NULL) + fatal_error("global section file not writable."); + + /* read section list and create a hash table */ + section = fopen("package/section.lst", "r"); + if (section == NULL) + fatal_error("section listfile is missing"); + + sectionmap = strmap_new(HASHSZ); + while (fgets(tbuf, MAXPATH, section) != NULL) { + key = strtok(tbuf, "\t"); + value = strtok(NULL, "\t"); + strmap_put(sectionmap, key, value); + } + fclose(section); + + /* read target list and create a hash table */ + target = fopen("target/target.lst", "r"); + if (target == NULL) + fatal_error("target listfile is missing."); + + targetmap = strmap_new(HASHSZ); + while (fgets(tbuf, MAXPATH, target) != NULL) { + key = strtok(tbuf, "\t"); + value = strtok(NULL, "\t"); + strmap_put(targetmap, key, value); + } + fclose(target); + + if (mkdir("package/pkgconfigs.d", S_IRWXU) > 0) + fatal_error("creation of package/pkgconfigs.d failed."); + if (mkdir("package/pkglist.d", S_IRWXU) > 0) + fatal_error("creation of package/pkglist.d failed."); + + /* read Makefile's for all packages */ + pkgdir = opendir("package"); + while ((pkgdirp = readdir(pkgdir)) != NULL) { + /* skip dotfiles */ + if (strncmp(pkgdirp->d_name, ".", 1) > 0) { + if (snprintf(path, MAXPATH, "package/%s/Makefile", pkgdirp->d_name) < 0) + fatal_error("can not create path variable."); + pkg = fopen(path, "r"); + if (pkg == NULL) + continue; + + /* skip manually maintained packages */ + if (snprintf(path, MAXPATH, "package/%s/Config.in.manual", pkgdirp->d_name) < 0) + fatal_error("can not create path variable."); + if (!access(path, F_OK)) { + while (fgets(buf, MAXPATH, pkg) != NULL) { + if ((parse_var(buf, "PKG_SECTION", NULL, &pkg_section)) == 0) + continue; + } + + memset(hvalue, 0 , MAXVALUE); + result = strmap_get(sectionmap, pkg_section, hvalue, sizeof(hvalue)); + if (result == 1) { + if (snprintf(spath, MAXPATH, "package/pkglist.d/sectionlst.%d", hash_str(hvalue)) < 0) + fatal_error("can not create path variable."); + section = fopen(spath, "a"); + if (section != NULL) { + fprintf(section, "%s@\n", pkgdirp->d_name); + fclose(section); + } + } else + fatal_error("Can not find section description for package."); + + fclose(pkg); + continue; + } + + nobinpkgs = 0; + + /* create output directories */ + if (snprintf(dir, MAXPATH, "package/pkgconfigs.d/%s", pkgdirp->d_name) < 0) + fatal_error("can not create dir variable."); + if (mkdir(dir, S_IRWXU) > 0) + fatal_error("can not create directory."); + + /* allocate memory */ + hkey = malloc(MAXVAR); + memset(hkey, 0, MAXVAR); + memset(variable, 0, 2*MAXVAR); + + pkgmap = strmap_new(HASHSZ); + + /* parse package Makefile */ + while (fgets(buf, MAXPATH, pkg) != NULL) { + /* just read variables prefixed with PKG */ + if (strncmp(buf, "PKG", 3) == 0) { + if ((parse_var(buf, "PKG_NAME", NULL, &pkg_name)) == 0) + continue; + if (pkg_name != NULL) + pkg_name_u = toupperstr(pkg_name); + else + pkg_name_u = toupperstr(pkgdirp->d_name); + + snprintf(variable, MAXVAR, "PKG_CFLINE_%s", pkg_name_u); + if ((parse_var(buf, variable, pkg_cfline, &pkg_cfline)) == 0) + continue; + snprintf(variable, MAXVAR, "PKG_DFLT_%s", pkg_name_u); + if ((parse_var(buf, variable, NULL, &pkg_dflt)) == 0) + continue; + if ((parse_var(buf, "PKG_HOST_DEPENDS", NULL, &pkg_host_depends)) == 0) + continue; + if ((parse_var(buf, "PKG_TARGET_DEPENDS", NULL, &pkg_target_depends)) == 0) + continue; + if ((parse_var(buf, "PKG_DESCR", NULL, &pkg_descr)) == 0) + continue; + if ((parse_var(buf, "PKG_SECTION", NULL, &pkg_section)) == 0) + continue; + if ((parse_var(buf, "PKG_URL", NULL, &pkg_url)) == 0) + continue; + if ((parse_var(buf, "PKG_CXX", NULL, &pkg_cxx)) == 0) + continue; + if ((parse_var(buf, "PKG_MULTI", NULL, &pkg_multi)) == 0) + continue; + if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0) + continue; + if ((parse_var(buf, "PKG_FLAVOURS", pkg_flavours, &pkg_flavours)) == 0) + continue; + if ((parse_var_hash(buf, "PKGFD_", pkgmap)) == 0) + continue; + if ((parse_var_hash(buf, "PKGFS_", pkgmap)) == 0) + continue; + if ((parse_var(buf, "PKG_CHOICES", pkg_choices, &pkg_choices)) == 0) + continue; + if ((parse_var_hash(buf, "PKGCD_", pkgmap)) == 0) + continue; + if ((parse_var_hash(buf, "PKGCS_", pkgmap)) == 0) + continue; + if ((parse_var(buf, "PKG_SUBPKGS", pkg_subpkgs, &pkg_subpkgs)) == 0) + continue; + if ((parse_var_hash(buf, "PKGSD_", pkgmap)) == 0) + continue; + if ((parse_var_hash(buf, "PKGSS_", pkgmap)) == 0) + continue; + if ((parse_var_hash(buf, "PKGSC_", pkgmap)) == 0) + continue; + } + } + + /* end of package Makefile parsing */ + if (fclose(pkg) != 0) + perror("Failed to close file stream for Makefile"); + + /* + if (pkg_name != NULL) + fprintf(stderr, "Package name is %s\n", pkg_name); + if (pkg_section != NULL) + fprintf(stderr, "Package section is %s\n", pkg_section); + if (pkg_descr != NULL) + fprintf(stderr, "Package description is %s\n", pkg_descr); + if (pkg_depends != NULL) + fprintf(stderr, "Package dependencies are %s\n", pkg_depends); + if (pkg_subpkgs != NULL) + fprintf(stderr, "Package subpackages are %s\n", pkg_subpkgs); + if (pkg_flavours != NULL) + fprintf(stderr, "Package flavours are %s\n", pkg_flavours); + if (pkg_choices != NULL) + fprintf(stderr, "Package choices are %s\n", pkg_choices); + if (pkg_url != NULL) + fprintf(stderr, "Package homepage is %s\n", pkg_url); + if (pkg_cfline != NULL) + fprintf(stderr, "Package cfline is %s\n", pkg_cfline); + if (pkg_multi != NULL) + fprintf(stderr, "Package multi is %s\n", pkg_multi); + + strmap_enum(pkgmap, iter_debug, NULL); + */ + + /* generate master source Config.in file */ + if (snprintf(path, MAXPATH, "package/pkgconfigs.d/%s/Config.in", pkgdirp->d_name) < 0) + fatal_error("path variable creation failed."); + fprintf(menuglobal, "source \"%s\"\n", path); + /* recreating file is faster than truncating with w+ */ + unlink(path); + cfg = fopen(path, "w"); + if (cfg == NULL) + continue; + + pkgs = NULL; + if (pkg_subpkgs != NULL) + pkgs = strdup(pkg_subpkgs); + + fprintf(cfg, "config ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name)); + fprintf(cfg, "\ttristate\n"); + if (nobinpkgs == 0) { + fprintf(cfg, "\tdepends on "); + if (pkgs != NULL) { + if (pkg_multi != NULL) + if (strncmp(pkg_multi, "1", 1) == 0) + fprintf(cfg, "ADK_HAVE_DOT_CONFIG || "); + token = strtok(pkgs, " "); + fprintf(cfg, "ADK_PACKAGE_%s", token); + token = strtok(NULL, " "); + while (token != NULL) { + fprintf(cfg, " || ADK_PACKAGE_%s", token); + token = strtok(NULL, " "); + } + fprintf(cfg, "\n"); + } else { + fprintf(cfg, "ADK_PACKAGE_%s\n", toupperstr(pkgdirp->d_name)); + } + } + //else { + // fprintf(cfg, "\tprompt \"%s\"\n", pkgdirp->d_name); + //} + fprintf(cfg, "\tdefault n\n"); + fclose(cfg); + free(pkgs); + + /* skip packages without binary package output */ + if (nobinpkgs == 1) + continue; + + /* generate binary package specific Config.in files */ + if (pkg_subpkgs != NULL) + packages = tolowerstr(pkg_subpkgs); + else + packages = strdup(pkgdirp->d_name); + + token = strtok_r(packages, " ", &p_ptr); + while (token != NULL) { + strncat(hkey, "PKGSC_", 6); + strncat(hkey, toupperstr(token), strlen(token)); + memset(hvalue, 0 , MAXVALUE); + result = strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue)); + memset(hkey, 0 , MAXVAR); + if (result == 1) + pkg_section = strdup(hvalue); + + strncat(hkey, "PKGSD_", 6); + strncat(hkey, toupperstr(token), strlen(token)); + memset(hvalue, 0 , MAXVALUE); + result = strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue)); + memset(hkey, 0 , MAXVAR); + if (result == 1) + pkg_descr = strdup(hvalue); + + pseudo_name = malloc(MAXLINE); + memset(pseudo_name, 0, MAXLINE); + strncat(pseudo_name, token, strlen(token)); + while (strlen(pseudo_name) < 20) + strncat(pseudo_name, ".", 1); + + if (snprintf(path, MAXPATH, "package/pkgconfigs.d/%s/Config.in.%s", pkgdirp->d_name, token) < 0) + fatal_error("failed to create path variable."); + + /* create temporary section files */ + memset(hvalue, 0 , MAXVALUE); + result = strmap_get(sectionmap, pkg_section, hvalue, sizeof(hvalue)); + if (result == 1) { + if (snprintf(spath, MAXPATH, "package/pkglist.d/sectionlst.%d", hash_str(hvalue)) < 0) + fatal_error("failed to create path variable."); + section = fopen(spath, "a"); + if (section != NULL) { + fprintf(section, "%s|%s\n", token, pkgdirp->d_name); + fclose(section); + } + } else + fatal_error("Can not find section description for package"); + + unlink(path); + cfg = fopen(path, "w"); + if (cfg == NULL) + perror("Can not open Config.in file"); + + fprintf(cfg, "config ADK_PACKAGE_%s\n", toupperstr(token)); + fprintf(cfg, "\tprompt \"%s... %s\"\n", pseudo_name, pkg_descr); + fprintf(cfg, "\ttristate\n"); + + free(pseudo_name); + + /* print custom cf line */ + if (pkg_cfline != NULL) { + cftoken = strtok_r(pkg_cfline, "@", &saveptr); + while (cftoken != NULL) { + fprintf(cfg, "\t%s\n", cftoken); + cftoken = strtok_r(NULL, "@", &saveptr); + } + } + + /* add sub package dependencies */ + strncat(hkey, "PKGSS_", 6); + strncat(hkey, toupperstr(token), strlen(token)); + memset(hvalue, 0, MAXVALUE); + result = strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue)); + if (result == 1) { + val = strtok_r(hvalue, " ", &saveptr); + while (val != NULL) { + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + val = strtok_r(NULL, " ", &saveptr); + } + } + memset(hkey, 0, MAXVAR); + + /* create package host dependency information */ + if (pkg_host_depends != NULL) { + token = strtok(pkg_host_depends, " "); + fprintf(cfg, "\tdepends on "); + sp = ""; + while (token != NULL) { + if(strncmp(token, "!", 1) == 0) { + fprintf(cfg, "%s!ADK_HOST%s", sp, toupperstr(token)); + sp = " && "; + } else { + fprintf(cfg, "%sADK_HOST%s", sp, toupperstr(token)); + sp = " || "; + } + token = strtok(NULL, " "); + } + fprintf(cfg, "\n"); + } + + /* create package target dependency information */ + if (pkg_target_depends != NULL) { + token = strtok(pkg_target_depends, " "); + neg = 0; + sp = ""; + fprintf(cfg, "\tdepends on "); + memset(hvalue, 0, MAXVALUE); + while (token != NULL) { + if (strncmp(token, "!", 1) == 0) { + result = strmap_get(targetmap, token+1, hvalue, sizeof(hvalue)); + neg = 1; + } else { + result = strmap_get(targetmap, token, hvalue, sizeof(hvalue)); + } + hvalue[strlen(hvalue)-1] = '\0'; + print_target_depline(hvalue, neg, sp, cfg); + if (neg == 1) + sp = " && "; + else + sp = " || "; + token = strtok(NULL, " "); + } + fprintf(cfg, "\n"); + } + + /* create package dependency information */ + if (pkg_depends != NULL) { + token = strtok(pkg_depends, " "); + while (token != NULL) { + if (strncmp(token, "kmod", 4) == 0) + fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(token)); + else + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(token)); + token = strtok(NULL, " "); + } + free(pkg_depends); + pkg_depends = NULL; + } + + fprintf(cfg, "\tselect ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name)); + + if (pkg_dflt != NULL) + fprintf(cfg, "\tdefault %s\n", pkg_dflt); + else + fprintf(cfg, "\tdefault n\n"); + + fprintf(cfg, "\thelp\n"); + fprintf(cfg, "\t %s\n\n", pkg_descr); + if (pkg_url != NULL) + fprintf(cfg, "\t WWW: %s\n", pkg_url); + + /* handle special C++ packages */ + if (pkg_cxx != NULL) { + fprintf(cfg, "\nchoice\n"); + fprintf(cfg, "prompt \"C++ library to use\"\n"); + fprintf(cfg, "depends on ADK_COMPILE_%s\n\n", toupperstr(pkgdirp->d_name)); + fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC\n", pkg_cxx); + fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC\n\n", pkg_cxx); + fprintf(cfg, "config ADK_COMPILE_%s_WITH_STDCXX\n", pkg_cxx); + fprintf(cfg, "\tbool \"GNU C++ library\"\n"); + fprintf(cfg, "\tselect ADK_PACKAGE_LIBSTDCXX\n\n"); + fprintf(cfg, "config ADK_COMPILE_%s_WITH_UCLIBCXX\n", pkg_cxx); + fprintf(cfg, "\tbool \"uClibc++ library\"\n"); + fprintf(cfg, "\tselect ADK_PACKAGE_UCLIBCXX\n\n"); + fprintf(cfg, "endchoice\n"); + free(pkg_cxx); + pkg_cxx = NULL; + } + + /* package flavours */ + if (pkg_flavours != NULL) { + token = strtok(pkg_flavours, " "); + while (token != NULL) { + fprintf(cfg, "\nconfig ADK_PACKAGE_%s_%s\n", toupperstr(pkgdirp->d_name), + toupperstr(token)); + fprintf(cfg, "\tbool "); + strncat(hkey, "PKGFD_", 6); + strncat(hkey, token, strlen(token)); + memset(hvalue, 0 , MAXVALUE); + strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue)); + memset(hkey, 0 , MAXVAR); + pkg_fd = strdup(hvalue); + + fprintf(cfg, "\"%s\"\n", pkg_fd); + fprintf(cfg, "\tdefault n\n"); + fprintf(cfg, "\tdepends on ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name)); + strncat(hkey, "PKGFS_", 6); + strncat(hkey, token, strlen(token)); + + result = strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue)); + if (result == 1) { + val = strtok_r(hvalue, " ", &saveptr); + while (val != NULL) { + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + val = strtok_r(NULL, " ", &saveptr); + } + } + memset(hkey, 0, MAXVAR); + fprintf(cfg, "\thelp\n"); + fprintf(cfg, "\t %s\n", pkg_fd); + token = strtok(NULL, " "); + } + free(pkg_flavours); + pkg_flavours = NULL; + } + + /* package choices */ + if (pkg_choices != NULL) { + fprintf(cfg, "\nchoice\n"); + fprintf(cfg, "prompt \"Package flavour choice\"\n"); + fprintf(cfg, "depends on ADK_COMPILE_%s\n\n", toupperstr(pkgdirp->d_name)); + token = strtok(pkg_choices, " "); + while (token != NULL) { + fprintf(cfg, "config ADK_PACKAGE_%s_%s\n", toupperstr(pkgdirp->d_name), + toupperstr(token)); + + fprintf(cfg, "\tbool "); + strncat(hkey, "PKGCD_", 6); + strncat(hkey, token, strlen(token)); + memset(hvalue, 0 , MAXVALUE); + strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue)); + memset(hkey, 0 , MAXVAR); + fprintf(cfg, "\"%s\"\n", hvalue); + + strncat(hkey, "PKGCS_", 6); + strncat(hkey, token, strlen(token)); + memset(hvalue, 0, MAXVALUE); + result = strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue)); + if (result == 1) { + val = strtok_r(hvalue, " ", &saveptr); + while (val != NULL) { + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + val = strtok_r(NULL, " ", &saveptr); + } + } + memset(hkey, 0, MAXVAR); + token = strtok(NULL, " "); + } + fprintf(cfg, "\nendchoice\n"); + free(pkg_choices); + pkg_choices = NULL; + } + /* close file descriptor, parse next package */ + fclose(cfg); + token = strtok_r(NULL, " ", &p_ptr); + } + + /* end of package output generation */ + free(packages); + packages = NULL; + + /* reset flags, free memory */ + free(pkg_name); + free(pkg_descr); + free(pkg_section); + free(pkg_url); + free(pkg_depends); + free(pkg_flavours); + free(pkg_choices); + free(pkg_subpkgs); + free(pkg_target_depends); + free(pkg_host_depends); + free(pkg_cxx); + free(pkg_dflt); + free(pkg_cfline); + free(pkg_multi); + pkg_name = NULL; + pkg_descr = NULL; + pkg_section = NULL; + pkg_url = NULL; + pkg_depends = NULL; + pkg_flavours = NULL; + pkg_choices = NULL; + pkg_subpkgs = NULL; + pkg_target_depends = NULL; + pkg_host_depends = NULL; + pkg_cxx = NULL; + pkg_dflt = NULL; + pkg_cfline = NULL; + pkg_multi = NULL; + + strmap_delete(pkgmap); + nobinpkgs = 0; + free(hkey); + } + } + + + /* create Config.in.auto */ + strmap_enum(sectionmap, iter, NULL); + + strmap_delete(targetmap); + strmap_delete(sectionmap); + fclose(menuglobal); + closedir(pkgdir); + + /* remove temporary section files */ + pkglistdir = opendir("package/pkglist.d"); + while ((pkgdirp = readdir(pkglistdir)) != NULL) { + if (strncmp(pkgdirp->d_name, "sectionlst.", 11) == 0) { + if (snprintf(path, MAXPATH, "package/pkglist.d/%s", pkgdirp->d_name) < 0) + fatal_error("creating path variable failed."); + if (unlink(path) < 0) + fatal_error("removing file failed."); + } + } + closedir(pkglistdir); + return(0); +} diff --git a/tools/adk/sortfile.c b/tools/adk/sortfile.c new file mode 100644 index 000000000..1e9fc9623 --- /dev/null +++ b/tools/adk/sortfile.c @@ -0,0 +1,153 @@ +/*- + * Copyright (c) 2010 + * Thorsten Glaser + * + * Provided that these terms and disclaimer and all copyright notices + * are retained or reproduced in an accompanying document, permission + * is granted to deal in this work without restriction, including un- + * limited rights to use, publicly perform, distribute, sell, modify, + * merge, give away, or sublicence. + * + * This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to + * the utmost extent permitted by applicable law, neither express nor + * implied; without malicious intent or gross negligence. In no event + * may a licensor, author or contributor be held liable for indirect, + * direct, other damage, loss, or other issues arising in any way out + * of dealing in the work, even if advised of the possibility of such + * damage or existence of a defect, except proven that it results out + * of said person's immediate fault when using the work as intended. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct ptrsize { + const char *ptr; + size_t size; +}; + +static void *xrecalloc(void *, size_t, size_t); +static int cmpfn(const void *, const void *); + +#define MUL_NO_OVERFLOW (1UL << (sizeof (size_t) * 8 / 2)) + +#ifndef SIZE_MAX +#ifdef SIZE_T_MAX +#define SIZE_MAX SIZE_T_MAX +#else +#define SIZE_MAX ((size_t)-1) +#endif +#endif + +#if !defined(MAP_FAILED) +/* XXX imake style */ +# if defined(__linux) +#define MAP_FAILED ((void *)-1) +# elif defined(__bsdi__) || defined(__osf__) || defined(__ultrix) +#define MAP_FAILED ((caddr_t)-1) +# endif +#endif + +static void * +xrecalloc(void *ptr, size_t nmemb, size_t size) +{ + void *rv; + + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) + errx(1, "attempted integer overflow: %zu * %zu", nmemb, size); + size *= nmemb; + if ((rv = realloc(ptr, size)) == NULL) + err(1, "cannot allocate %zu bytes", size); + return (rv); +} + +int +sortfile(char *infile, char *outfile) +{ + int fd, fdout; + size_t fsz, asz, anents; + char *cp, *thefile, *endfile; + struct ptrsize *thearray; + + if ((fd = open(infile, O_RDONLY)) < 0) + err(1, "open: %s", infile); + else { + struct stat sb; + + /* reasonable maximum size: 3/4 of SIZE_MAX */ + fsz = (SIZE_MAX / 2) + (SIZE_MAX / 4); + + if (fstat(fd, &sb)) + err(1, "stat: %s", infile); + if (sb.st_size > fsz) + errx(1, "file %s too big, %llu > %zu", infile, + (unsigned long long)sb.st_size, fsz); + fsz = (size_t)sb.st_size; + } + + if ((thefile = mmap(NULL, fsz, PROT_READ, MAP_FILE | MAP_PRIVATE, + fd, (off_t)0)) == MAP_FAILED) + err(1, "mmap %zu bytes from %s", fsz, infile); + /* last valid byte in the file, must be newline anyway */ + endfile = thefile + fsz - 1; + + thearray = xrecalloc(NULL, (asz = 8), sizeof(thearray[0])); + thearray[(anents = 0)].ptr = cp = thefile; + + while ((cp = memchr(cp, '\n', endfile - cp)) != NULL) { + /* byte after the \n */ + if (++cp > endfile) + /* end of file */ + break; + thearray[anents].size = cp - thearray[anents].ptr; + if (++anents == asz) + /* resize array */ + thearray = xrecalloc(thearray, (asz <<= 1), + sizeof(thearray[0])); + thearray[anents].ptr = cp; + } + thearray[anents].size = endfile - thearray[anents].ptr + 1; + + qsort(thearray, ++anents, sizeof(thearray[0]), cmpfn); + + if ((fdout = open(outfile, O_WRONLY | O_CREAT, S_IRWXU)) < 0) + err(1, "open: %s", outfile); + else { + for (asz = 0; asz < anents; ++asz) + if ((size_t)write(fdout, thearray[asz].ptr, + thearray[asz].size) != thearray[asz].size) + err(1, "write %zu bytes", thearray[asz].size); + } + + if (munmap(thefile, fsz)) + warn("munmap"); + + free(thearray); + close(fd); + + return (0); +} + +static int +cmpfn(const void *p1, const void *p2) +{ + int rv; + const struct ptrsize *a1 = (const struct ptrsize *)p1; + const struct ptrsize *a2 = (const struct ptrsize *)p2; + + if ((rv = memcmp(a1->ptr, a2->ptr, (a1->size > a2->size ? + a2->size : a1->size) - /* '\n' */ 1)) != 0) + /* unequal in the common part */ + return (rv); + + /* shorter string is smaller */ + return (a1->size > a2->size ? 1 : a1->size == a2->size ? 0 : -1); +} diff --git a/tools/adk/sortfile.h b/tools/adk/sortfile.h new file mode 100644 index 000000000..c54294e69 --- /dev/null +++ b/tools/adk/sortfile.h @@ -0,0 +1 @@ +int sortfile(char *infile, char *outfile); diff --git a/tools/adk/strmap.c b/tools/adk/strmap.c new file mode 100644 index 000000000..f2c660e1f --- /dev/null +++ b/tools/adk/strmap.c @@ -0,0 +1,510 @@ +/* + * strmap version 1.0.0 + * + * ANSI C hash table for strings. + * + * strmap.c + * + * Copyright (c) 2009 Per Ola Kristensson. + * + * Per Ola Kristensson + * Inference Group, Department of Physics + * University of Cambridge + * Cavendish Laboratory + * JJ Thomson Avenue + * CB3 0HE Cambridge + * United Kingdom + * + * strmap is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * strmap is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with strmap. If not, see . + */ +#include "strmap.h" + +typedef struct Pair Pair; + +typedef struct Bucket Bucket; + +struct Pair { + char *key; + char *value; +}; + +struct Bucket { + unsigned int count; + Pair *pairs; +}; + +struct StrMap { + unsigned int count; + Bucket *buckets; +}; + +static Pair * get_pair(Bucket *bucket, const char *key); +static unsigned long hash(const char *str); + +StrMap * strmap_new(unsigned int capacity) +{ + StrMap *map; + + map = malloc(sizeof(StrMap)); + if (map == NULL) { + return NULL; + } + map->count = capacity; + map->buckets = malloc(map->count * sizeof(Bucket)); + if (map->buckets == NULL) { + free(map); + return NULL; + } + memset(map->buckets, 0, map->count * sizeof(Bucket)); + return map; +} + +void strmap_delete(StrMap *map) +{ + unsigned int i, j, n, m; + Bucket *bucket; + Pair *pair; + + if (map == NULL) { + return; + } + n = map->count; + bucket = map->buckets; + i = 0; + while (i < n) { + m = bucket->count; + pair = bucket->pairs; + j = 0; + while(j < m) { + free(pair->key); + free(pair->value); + pair++; + j++; + } + free(bucket->pairs); + bucket++; + i++; + } + free(map->buckets); + free(map); +} + +int strmap_get(const StrMap *map, const char *key, char *out_buf, unsigned int n_out_buf) +{ + unsigned int index; + Bucket *bucket; + Pair *pair; + + if (map == NULL) { + return 0; + } + if (key == NULL) { + return 0; + } + index = hash(key) % map->count; + bucket = &(map->buckets[index]); + pair = get_pair(bucket, key); + if (pair == NULL) { + return 0; + } + if (out_buf == NULL && n_out_buf == 0) { + return strlen(pair->value) + 1; + } + if (out_buf == NULL) { + return 0; + } + if (strlen(pair->value) >= n_out_buf) { + return 0; + } + strcpy(out_buf, pair->value); + return 1; +} + +int strmap_exists(const StrMap *map, const char *key) +{ + unsigned int index; + Bucket *bucket; + Pair *pair; + + if (map == NULL) { + return 0; + } + if (key == NULL) { + return 0; + } + index = hash(key) % map->count; + bucket = &(map->buckets[index]); + pair = get_pair(bucket, key); + if (pair == NULL) { + return 0; + } + return 1; +} + +int strmap_put(StrMap *map, const char *key, const char *value) +{ + unsigned int key_len, value_len, index; + Bucket *bucket; + Pair *tmp_pairs, *pair; + char *tmp_value; + char *new_key, *new_value; + + if (map == NULL) { + return 0; + } + if (key == NULL || value == NULL) { + return 0; + } + key_len = strlen(key); + value_len = strlen(value); + /* Get a pointer to the bucket the key string hashes to */ + index = hash(key) % map->count; + bucket = &(map->buckets[index]); + /* Check if we can handle insertion by simply replacing + * an existing value in a key-value pair in the bucket. + */ + if ((pair = get_pair(bucket, key)) != NULL) { + /* The bucket contains a pair that matches the provided key, + * change the value for that pair to the new value. + */ + if (strlen(pair->value) < value_len) { + /* If the new value is larger than the old value, re-allocate + * space for the new larger value. + */ + tmp_value = realloc(pair->value, (value_len + 1) * sizeof(char)); + if (tmp_value == NULL) { + return 0; + } + pair->value = tmp_value; + } + /* Copy the new value into the pair that matches the key */ + strcpy(pair->value, value); + return 1; + } + /* Allocate space for a new key and value */ + new_key = malloc((key_len + 1) * sizeof(char)); + if (new_key == NULL) { + return 0; + } + new_value = malloc((value_len + 1) * sizeof(char)); + if (new_value == NULL) { + free(new_key); + return 0; + } + /* Create a key-value pair */ + if (bucket->count == 0) { + /* The bucket is empty, lazily allocate space for a single + * key-value pair. + */ + bucket->pairs = malloc(sizeof(Pair)); + if (bucket->pairs == NULL) { + free(new_key); + free(new_value); + return 0; + } + bucket->count = 1; + } + else { + /* The bucket wasn't empty but no pair existed that matches the provided + * key, so create a new key-value pair. + */ + tmp_pairs = realloc(bucket->pairs, (bucket->count + 1) * sizeof(Pair)); + if (tmp_pairs == NULL) { + free(new_key); + free(new_value); + return 0; + } + bucket->pairs = tmp_pairs; + bucket->count++; + } + /* Get the last pair in the chain for the bucket */ + pair = &(bucket->pairs[bucket->count - 1]); + pair->key = new_key; + pair->value = new_value; + /* Copy the key and its value into the key-value pair */ + strcpy(pair->key, key); + strcpy(pair->value, value); + return 1; +} + +int strmap_get_count(const StrMap *map) +{ + unsigned int i, j, n, m; + unsigned int count; + Bucket *bucket; + Pair *pair; + + if (map == NULL) { + return 0; + } + bucket = map->buckets; + n = map->count; + i = 0; + count = 0; + while (i < n) { + pair = bucket->pairs; + m = bucket->count; + j = 0; + while (j < m) { + count++; + pair++; + j++; + } + bucket++; + i++; + } + return count; +} + +int strmap_enum(const StrMap *map, strmap_enum_func enum_func, const void *obj) +{ + unsigned int i, j, n, m; + Bucket *bucket; + Pair *pair; + + if (map == NULL) { + return 0; + } + if (enum_func == NULL) { + return 0; + } + bucket = map->buckets; + n = map->count; + i = 0; + while (i < n) { + pair = bucket->pairs; + m = bucket->count; + j = 0; + while (j < m) { + enum_func(pair->key, pair->value, obj); + pair++; + j++; + } + bucket++; + i++; + } + return 1; +} + +/* + * Returns a pair from the bucket that matches the provided key, + * or null if no such pair exist. + */ +static Pair * get_pair(Bucket *bucket, const char *key) +{ + unsigned int i, n; + Pair *pair; + + n = bucket->count; + if (n == 0) { + return NULL; + } + pair = bucket->pairs; + i = 0; + while (i < n) { + if (pair->key != NULL && pair->value != NULL) { + if (strcmp(pair->key, key) == 0) { + return pair; + } + } + pair++; + i++; + } + return NULL; +} + +/* + * Returns a hash code for the provided string. + */ +static unsigned long hash(const char *str) +{ + unsigned long hash = 5381; + int c; + c = 0; + + while (c == *str++) { + hash = ((hash << 5) + hash) + c; + } + return hash; +} + +/* + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + +*/ diff --git a/tools/adk/strmap.h b/tools/adk/strmap.h new file mode 100644 index 000000000..99687b236 --- /dev/null +++ b/tools/adk/strmap.h @@ -0,0 +1,350 @@ +/* + * strmap version 1.0.0 + * + * ANSI C hash table for strings. + * + * strmap.h + * + * Copyright (c) 2009 Per Ola Kristensson. + * + * Per Ola Kristensson + * Inference Group, Department of Physics + * University of Cambridge + * Cavendish Laboratory + * JJ Thomson Avenue + * CB3 0HE Cambridge + * United Kingdom + * + * strmap is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * strmap is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with strmap. If not, see . + */ +#ifndef _STRMAP_H_ +#define _STRMAP_H_ + +#ifdef __cplusplus +extern "C" +{ +#endif + +#include +#include + +typedef struct StrMap StrMap; + +/* + * This callback function is called once per key-value when enumerating + * all keys associated to values. + * + * Parameters: + * + * key: A pointer to a null-terminated C string. The string must not + * be modified by the client. + * + * value: A pointer to a null-terminated C string. The string must + * not be modified by the client. + * + * obj: A pointer to a client-specific object. This parameter may be + * null. + * + * Return value: None. + */ +typedef void(*strmap_enum_func)(const char *key, const char *value, const void *obj); + +/* + * Creates a string map. + * + * Parameters: + * + * capacity: The number of top-level slots this string map + * should allocate. This parameter must be > 0. + * + * Return value: A pointer to a string map object, + * or null if a new string map could not be allocated. + */ +StrMap * strmap_new(unsigned int capacity); + +/* + * Releases all memory held by a string map object. + * + * Parameters: + * + * map: A pointer to a string map. This parameter cannot be null. + * If the supplied string map has been previously released, the + * behaviour of this function is undefined. + * + * Return value: None. + */ +void strmap_delete(StrMap *map); + +/* + * Returns the value associated with the supplied key. + * + * Parameters: + * + * map: A pointer to a string map. This parameter cannot be null. + * + * key: A pointer to a null-terminated C string. This parameter cannot + * be null. + * + * out_buf: A pointer to an output buffer which will contain the value, + * if it exists and fits into the buffer. + * + * n_out_buf: The size of the output buffer in bytes. + * + * Return value: If out_buf is set to null and n_out_buf is set to 0 the return + * value will be the number of bytes required to store the value (if it exists) + * and its null-terminator. For all other parameter configurations the return value + * is 1 if an associated value was found and completely copied into the output buffer, + * 0 otherwise. + */ +int strmap_get(const StrMap *map, const char *key, char *out_buf, unsigned int n_out_buf); + +/* + * Queries the existence of a key. + * + * Parameters: + * + * map: A pointer to a string map. This parameter cannot be null. + * + * key: A pointer to a null-terminated C string. This parameter cannot + * be null. + * + * Return value: 1 if the key exists, 0 otherwise. + */ +int strmap_exists(const StrMap *map, const char *key); + +/* + * Associates a value with the supplied key. If the key is already + * associated with a value, the previous value is replaced. + * + * Parameters: + * + * map: A pointer to a string map. This parameter cannot be null. + * + * key: A pointer to a null-terminated C string. This parameter + * cannot be null. The string must have a string length > 0. The + * string will be copied. + * + * value: A pointer to a null-terminated C string. This parameter + * cannot be null. The string must have a string length > 0. The + * string will be copied. + * + * Return value: 1 if the association succeeded, 0 otherwise. + */ +int strmap_put(StrMap *map, const char *key, const char *value); + +/* + * Returns the number of associations between keys and values. + * + * Parameters: + * + * map: A pointer to a string map. This parameter cannot be null. + * + * Return value: The number of associations between keys and values. + */ +int strmap_get_count(const StrMap *map); + +/* + * Enumerates all associations between keys and values. + * + * Parameters: + * + * map: A pointer to a string map. This parameter cannot be null. + * + * enum_func: A pointer to a callback function that will be + * called by this procedure once for every key associated + * with a value. This parameter cannot be null. + * + * obj: A pointer to a client-specific object. This parameter will be + * passed back to the client's callback function. This parameter can + * be null. + * + * Return value: 1 if enumeration completed, 0 otherwise. + */ +int strmap_enum(const StrMap *map, strmap_enum_func enum_func, const void *obj); + +#ifdef __cplusplus +} +#endif + +#endif + +/* + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + +*/ -- cgit v1.2.3