diff options
| -rw-r--r-- | package/Config.in | 90 | ||||
| -rw-r--r-- | package/opensips/Makefile | 1 | ||||
| -rw-r--r-- | package/xorg-server/Makefile | 2 |
3 files changed, 41 insertions, 52 deletions
diff --git a/package/Config.in b/package/Config.in index eeb65119c..e76397d57 100644 --- a/package/Config.in +++ b/package/Config.in @@ -3,8 +3,6 @@ menu "Package selection" -menu "Applications" - menu "Basesystem" source "package/base-files/Config.in" source "package/busybox/Config.in.manual" @@ -28,12 +26,22 @@ source "package/obexftp/Config.in" source "package/ussp-push/Config.in" endmenu -menu "Browser" +menu "Browser / Editor / Pager" +source "package/less/Config.in" +source "package/nano/Config.in" +source "package/vim/Config.in" source "package/links/Config.in" source "package/elinks/Config.in" source "package/lynx/Config.in" endmenu +menu "Archivers / Compression" +source "package/bzip2/Config.in" +source "package/cpio/Config.in" +source "package/tar/Config.in" +source "package/xz/Config.in" +endmenu + menu "Debugging / Analyzing" source "package/exmap/Config.in" source "package/gdb/Config.in" @@ -43,12 +51,6 @@ source "package/strace/Config.in" source "package/valgrind/Config.in" endmenu -menu "Editors / Pager" -source "package/less/Config.in" -source "package/nano/Config.in" -source "package/vim/Config.in" -endmenu - menu "Filesystem / Blockdevice utilities" source "package/aufs2-util/Config.in" source "package/dosfstools/Config.in" @@ -63,7 +65,6 @@ source "package/wdfs/Config.in" source "package/xfsprogs/Config.in" endmenu - menu "Mail" source "package/bogofilter/Config.in" source "package/dovecot/Config.in" @@ -76,12 +77,9 @@ source "package/vilistextum/Config.in" endmenu menu "Misc" -source "package/bzip2/Config.in" -source "package/cpio/Config.in" source "package/collectd/Config.in" source "package/deco/Config.in" source "package/digitemp/Config.in" -source "package/gawk/Config.in" source "package/gpm/Config.in" source "package/gpsd/Config.in" source "package/logrotate/Config.in" @@ -89,7 +87,6 @@ source "package/mc/Config.in" source "package/mgetty/Config.in" source "package/monit/Config.in" source "package/motion/Config.in" -source "package/mysql/Config.in" source "package/osiris/Config.in" source "package/rrdtool/Config.in" source "package/rrdcollect/Config.in" @@ -99,8 +96,6 @@ source "package/scsi-spin/Config.in" source "package/ser2net/Config.in" source "package/sqlite/Config.in" source "package/syslog-ng/Config.in" -source "package/tar/Config.in" -source "package/xz/Config.in" endmenu menu "Multimedia" @@ -132,7 +127,7 @@ source "package/heimdal/Config.in" source "package/krb5/Config.in" source "package/openct/Config.in" source "package/opensc/Config.in" -source "package/openssl/Config.in" # libopenssl +source "package/openssl/Config.in" source "package/openssl-pkcs11/Config.in" endmenu @@ -162,16 +157,35 @@ source "package/procps/Config.in" source "package/sispmctl/Config.in" source "package/stress/Config.in" source "package/sysstat/Config.in" +source "package/swconfig/Config.in" #source "package/udev/Config.in" source "package/watchdog/Config.in" endmenu - +menu "Programming / Languages" +source "package/autoconf/Config.in" +source "package/automake/Config.in" +source "package/binutils/Config.in" +source "package/bison/Config.in" +source "package/diffutils/Config.in" +source "package/flex/Config.in" +source "package/gawk/Config.in" +source "package/gcc/Config.in" +source "package/gperf/Config.in" +source "package/haserl/Config.in" +source "package/jamvm/Config.in" +source "package/lua/Config.in" +source "package/m4/Config.in" +source "package/make/Config.in" +source "package/microperl/Config.in" +source "package/perl/Config.in" +source "package/php/Config.in" +source "package/python/Config.in" +source "package/ruby/Config.in" +source "package/tcl/Config.in" endmenu -menu "Networking" - -menu "Analyze / Debugging / Monitoring" +menu "Network - Analyze / Debugging / Monitoring" source "package/bwm/Config.in" source "package/dsniff/Config.in" source "package/ethtool/Config.in" @@ -224,7 +238,6 @@ source "package/ndisc/Config.in" source "package/radvd/Config.in" endmenu - menu "IRC / ICQ / JABBER" source "package/bitlbee/Config.in" source "package/irssi/Config.in" @@ -233,7 +246,6 @@ source "package/reaim/Config.in" source "package/tmsnc/Config.in" endmenu - menu "Firewall / Routing / Bridging" source "package/arpd/Config.in" source "package/bridge-utils/Config.in" @@ -256,7 +268,7 @@ source "package/wondershaper/Config.in" source "package/vrrpd/Config.in" endmenu -menu "Misc" +menu "Networking Misc" source "package/cups/Config.in" source "package/fakeidentd/Config.in" source "package/gkrellmd/Config.in" @@ -276,7 +288,6 @@ source "package/rsync/Config.in" source "package/shat/Config.in" source "package/socat/Config.in" source "package/subversion/Config.in" -source "package/swconfig/Config.in" source "package/udp-broadcast-relay/Config.in" source "package/vgp/Config.in" source "package/vnstat/Config.in" @@ -329,7 +340,7 @@ source "package/tor/Config.in" source "package/vnc-reflector/Config.in" endmenu -menu "Security" +menu "Networking Security" source "package/arpwatch/Config.in" source "package/autossh/Config.in" source "package/axtls/Config.in" @@ -363,31 +374,6 @@ source "package/wireless-firmware/Config.in" source "package/wpa_supplicant/Config.in" endmenu -endmenu - -menu "Programming" -source "package/autoconf/Config.in" -source "package/automake/Config.in" -source "package/binutils/Config.in" -source "package/bison/Config.in" -source "package/diffutils/Config.in" -source "package/flex/Config.in" -source "package/gcc/Config.in" -source "package/gperf/Config.in" -source "package/haserl/Config.in" -source "package/jamvm/Config.in" -source "package/lua/Config.in" -source "package/m4/Config.in" -source "package/make/Config.in" -source "package/microperl/Config.in" -source "package/perl/Config.in" -source "package/php/Config.in" -source "package/python/Config.in" -source "package/ruby/Config.in" -source "package/tcl/Config.in" -endmenu - - menu "Libraries" source "package/alsa-lib/Config.in" @@ -453,6 +439,8 @@ source "package/jpeg/Config.in" source "package/jpeg/Config.in.lib" source "package/lame/Config.in.lib" source "package/mpfr/Config.in" +source "package/mysql/Config.in" +source "package/mysql/Config.in.lib" source "package/nspr/Config.in" source "package/nss/Config.in" source "package/libtool/Config.in" diff --git a/package/opensips/Makefile b/package/opensips/Makefile index e49516e02..dd48a61de 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -10,6 +10,7 @@ PKG_BUILDDEP+= openssl PKG_MD5SUM:= 87c6fe40c143775d6a1be1beb75c3eb2 PKG_DESCR:= a high-performance, configurable, free SIP server PKG_SECTION:= net +PKG_MULTI:= 1 PKG_VARIANT:= tls PKG_URL:= http://opensips.org PKG_SITES:= http://opensips.org/pub/opensips/$(PKG_VERSION)/src/ diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 3927ca2c6..4380f3663 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} |