From c0f6e4154eaf2c670af68522ac4e3b64beb8b130 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 22 Jan 2010 18:17:29 +0100 Subject: add new packages to menu. shift some groups around. --- package/Config.in | 272 +++++++++++++++-------------- package/evilwm/patches/patch-Makefile.orig | 25 --- 2 files changed, 139 insertions(+), 158 deletions(-) delete mode 100644 package/evilwm/patches/patch-Makefile.orig (limited to 'package') diff --git a/package/Config.in b/package/Config.in index c42a75728..736875423 100644 --- a/package/Config.in +++ b/package/Config.in @@ -166,28 +166,6 @@ source "package/swconfig/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 "Network - Analyze / Debugging / Monitoring" source "package/bwm/Config.in" @@ -276,113 +254,6 @@ source "package/wondershaper/Config.in" source "package/vrrpd/Config.in" endmenu -menu "Networking Misc" -source "package/cups/Config.in" -source "package/fakeidentd/Config.in" -source "package/gkrellmd/Config.in" -source "package/git/Config.in" -source "package/net-snmp/Config.in" -# intentionally inserted here, as it depends on the above -source "package/iptables-snmp/Config.in" -source "package/nut/Config.in" -source "package/openldap/Config.in" -source "package/p910nd/Config.in" -source "package/pipacs/Config.in" -#source "package/pmacct/Config.in" -source "package/portmap/Config.in" -source "package/rarpd/Config.in" -source "package/rrs/Config.in" -source "package/rsync/Config.in" -source "package/shat/Config.in" -source "package/socat/Config.in" -source "package/subversion/Config.in" -source "package/udp-broadcast-relay/Config.in" -source "package/vgp/Config.in" -source "package/vnstat/Config.in" -source "package/vtun/Config.in" -source "package/wccpd/Config.in" -source "package/xinetd/Config.in" -endmenu - -menu "Network Filesystems" -source "package/davfs2/Config.in" -source "package/davfs2/Config.in.kernel" -source "package/nfs-utils/Config.in" -source "package/samba/Config.in" -endmenu - -menu "NTP" -source "package/htpdate/Config.in" -source "package/ntpclient/Config.in" -source "package/openntpd/Config.in" -source "package/rdate/Config.in" -endmenu - -menu "P2P" -source "package/cbtt/Config.in" -source "package/ctorrent/Config.in" -source "package/rtorrent/Config.in" -endmenu - -menu "PPP / PPTP / RADIUS" -source "package/freeradius-client/Config.in" -source "package/freeradius-server/Config.in" -source "package/ppp/Config.in" -source "package/pptp/Config.in" -source "package/pptpd/Config.in" -source "package/rp-pppoe/Config.in" -source "package/raddump/Config.in" -endmenu - -menu "Proxy" -source "package/dansguardian/Config.in" -source "package/frickin/Config.in" -source "package/igmpproxy/Config.in" -source "package/parprouted/Config.in" -source "package/privoxy/Config.in" -source "package/siproxd/Config.in" -source "package/squid/Config.in" -source "package/srelay/Config.in" -source "package/tinyproxy/Config.in" -source "package/tor/Config.in" -source "package/vnc-reflector/Config.in" -endmenu - -menu "Networking Security" -source "package/arpwatch/Config.in" -source "package/autossh/Config.in" -source "package/axtls/Config.in" -source "package/ca-certificates/Config.in" -source "package/dropbear/Config.in" -source "package/httptunnel/Config.in" -source "package/ipsec-tools/Config.in" -source "package/l2tpns/Config.in" -source "package/openssh/Config.in" -source "package/openssh/Config.in.kerberos" -source "package/openswan/Config.in" -source "package/openvpn/Config.in" -source "package/portsentry/Config.in" -source "package/ptunnel/Config.in" -source "package/scanlogd/Config.in" -source "package/snort/Config.in" -source "package/ssltunnel/Config.in" -source "package/tinc/Config.in" -source "package/vpnc/Config.in" -endmenu - -menu "Wireless" -source "package/aircrack-ng/Config.in" -source "package/chillispot/Config.in" -source "package/hostapd/Config.in" -source "package/iw/Config.in" -#source "package/kismet/Config.in" -source "package/olsrd/Config.in" -source "package/wifidog/Config.in" -source "package/wireless-firmware/Config.in" -source "package/wpa_supplicant/Config.in" -endmenu - - menu "Libraries" source "package/alsa-lib/Config.in" source "package/apr/Config.in" @@ -556,13 +427,151 @@ source "package/ustl/Config.in" source "package/zlib/Config.in" endmenu -menu "X" + +menu "Networking Misc" +source "package/cups/Config.in" +source "package/fakeidentd/Config.in" +source "package/gkrellmd/Config.in" +source "package/git/Config.in" +source "package/net-snmp/Config.in" +# intentionally inserted here, as it depends on the above +source "package/iptables-snmp/Config.in" +source "package/nut/Config.in" +source "package/openldap/Config.in" +source "package/p910nd/Config.in" +source "package/pipacs/Config.in" +#source "package/pmacct/Config.in" +source "package/portmap/Config.in" +source "package/rarpd/Config.in" +source "package/rrs/Config.in" +source "package/rsync/Config.in" +source "package/shat/Config.in" +source "package/socat/Config.in" +source "package/subversion/Config.in" +source "package/udp-broadcast-relay/Config.in" +source "package/vgp/Config.in" +source "package/vnstat/Config.in" +source "package/vtun/Config.in" +source "package/wccpd/Config.in" +source "package/xinetd/Config.in" +endmenu + +menu "Network Filesystems" +source "package/davfs2/Config.in" +source "package/davfs2/Config.in.kernel" +source "package/nfs-utils/Config.in" +source "package/samba/Config.in" +endmenu + +menu "NTP" +source "package/htpdate/Config.in" +source "package/ntpclient/Config.in" +source "package/openntpd/Config.in" +source "package/rdate/Config.in" +endmenu + +menu "P2P" +source "package/cbtt/Config.in" +source "package/ctorrent/Config.in" +source "package/rtorrent/Config.in" +endmenu + +menu "PPP / PPTP / RADIUS" +source "package/freeradius-client/Config.in" +source "package/freeradius-server/Config.in" +source "package/ppp/Config.in" +source "package/pptp/Config.in" +source "package/pptpd/Config.in" +source "package/rp-pppoe/Config.in" +source "package/raddump/Config.in" +endmenu + +menu "Proxy" +source "package/dansguardian/Config.in" +source "package/frickin/Config.in" +source "package/igmpproxy/Config.in" +source "package/parprouted/Config.in" +source "package/privoxy/Config.in" +source "package/siproxd/Config.in" +source "package/squid/Config.in" +source "package/srelay/Config.in" +source "package/tinyproxy/Config.in" +source "package/tor/Config.in" +source "package/vnc-reflector/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 Security" +source "package/arpwatch/Config.in" +source "package/autossh/Config.in" +source "package/axtls/Config.in" +source "package/ca-certificates/Config.in" +source "package/dropbear/Config.in" +source "package/httptunnel/Config.in" +source "package/ipsec-tools/Config.in" +source "package/l2tpns/Config.in" +source "package/openssh/Config.in" +source "package/openssh/Config.in.kerberos" +source "package/openswan/Config.in" +source "package/openvpn/Config.in" +source "package/portsentry/Config.in" +source "package/ptunnel/Config.in" +source "package/scanlogd/Config.in" +source "package/snort/Config.in" +source "package/ssltunnel/Config.in" +source "package/tinc/Config.in" +source "package/vpnc/Config.in" +endmenu + +menu "Wireless" +source "package/aircrack-ng/Config.in" +source "package/chillispot/Config.in" +source "package/hostapd/Config.in" +source "package/iw/Config.in" +#source "package/kismet/Config.in" +source "package/olsrd/Config.in" +source "package/wifidog/Config.in" +source "package/wireless-firmware/Config.in" +source "package/wpa_supplicant/Config.in" +endmenu + + +menu "Xorg server and drivers" source "package/xorg-server/Config.in" source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" source "package/xf86-input-mouse/Config.in" source "package/xf86-input-keyboard/Config.in" source "package/xf86-input-evtouch/Config.in" +endmenu + +menu "X Applications" +source "package/evilwm/Config.in" +source "package/rxvt-unicode/Config.in" +source "package/xauth/Config.in" +endmenu menu "X Libraries" source "package/libICE/Config.in" @@ -604,9 +613,6 @@ source "package/pixman/Config.in" source "package/xkbcomp/Config.in" source "package/xkeyboard-config/Config.in" endmenu - -endmenu - endmenu menu "Kernel configuration" diff --git a/package/evilwm/patches/patch-Makefile.orig b/package/evilwm/patches/patch-Makefile.orig deleted file mode 100644 index 710a353ba..000000000 --- a/package/evilwm/patches/patch-Makefile.orig +++ /dev/null @@ -1,25 +0,0 @@ ---- evilwm-1.0.1.orig/Makefile 2009-03-30 12:37:06.000000000 +0200 -+++ evilwm-1.0.1/Makefile 2010-01-22 17:12:43.000000000 +0100 -@@ -1,11 +1,11 @@ - # If you don't use CC --CC = gcc -+CC ?= gcc - - # Edit this line if you don't want evilwm to install under /usr. - # Note that $(DESTDIR) is used by the Debian build process. - prefix = $(DESTDIR)/usr - --XROOT = /usr/X11R6 -+XROOT ?= /usr/X11R6 - INCLUDES = -I$(XROOT)/include - LDPATH = -L$(XROOT)/lib - LIBS = -lX11 -@@ -71,7 +71,7 @@ distname = evilwm-$(version) - #DEFINES += -DXDEBUG # show some X calls - - DEFINES += -DVERSION=\"$(version)\" $(DEBIAN) --CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall -+CFLAGS += $(INCLUDES) $(DEFINES) -Wall - #CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall - CFLAGS += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls - LDFLAGS += $(LDPATH) $(LIBS) -- cgit v1.2.3