tagged lists updates

tags2lists was tweaked to work on the more natural word boundaries
than explicit "_", and the lists were renamed accordingly.

Dropped the borrowed pkglists by the way.

bin/tags2lists

@@ -7,12 +7,21 @@
 # live gnome
 # (base && (kernel || apt || alterator))
 # 
+# NB: tags are processed using word boundaries,
+#     so avoid using "-" in tag names
 
-# TODO; consider s/-name/-path/
-[ -d pkg.in/lists ] && cd pkg.in/lists
+DIR="${1:-pkg.in/lists/tagged}"
 
-find ${1:-tagged} $(sed \
-    -e "s,\([^&|! ()']\+\),-name *_\1_*,g" \
+warn() {
+	echo "$0: WARNING: $*" >&2
+	exit
+}
+
+[ -d "$DIR" ] || warn "$DIR nonexistent"
+cd "$DIR" || warn "cannot change to $DIR"
+
+find $(sed \
+    -e "s,\([^&|! ()']\+\),-regex ^.*\\\\<\1\\\\>.*$,g" \
     -e "s, *&& *, -a ,g" \
     -e "s, *|| *, -o ,g" \
     -e "s, *! *, ! ,g" \

functions.mk

@@ -40,4 +40,4 @@ define log_body
 { grep -q '^# $@$$' "$(CONFIG)" || printf '# %s\n' '$@' >> "$(CONFIG)"; }
 endef
 
-tags = $(shell echo "$(1)" | bin/tags2lists)
+tags = $(addprefix tagged/,$(shell echo "$(1)" | bin/tags2lists))

pkg.in/lists/tagged/base-server.in

@@ -1,116 +0,0 @@
-# interactivesystem
-anacron
-apt-conf-@APTCONF_PACKAGE@
-apt
-glibc-gconv-modules
-glibc-locales
-glibc-nss
-glibc-utils
-interactivesystem
-kbd
-setarch
-shadow-suite
-#sound-scripts (hal required, using alsa-set-initial-mixer)
-#alsa-set-initial-mixer
-sysklogd
-udev
-
-# boot
-bootsplash
-lilo
-memtest86+
-
-# editor
-vim-console
-
-# network tools
-curl
-elinks
-etcnet
-hostinfo
-iptables
-iputils
-lftp
-mailx
-netcat
-netlist
-openssh-clients
-rsync
-traceroute
-vlan-utils
-ntpdate
-tcpdump
-
-# disk tools
-eject
-hdparm
-lvm2
-mdadm
-mtools
-ntfs-3g
-sfdisk
-usbutils
-xfsprogs
-
-#printing
-#printer-drivers-base
-
-# servers
-openssh-server
-postfix
-openntpd
-
-# security
-openssl
-osec-mailreport
-audit
-
-# debug
-strace
-
-# alterator stage3
-installer-@INSTALLER@-stage3
-installer-feature-copy-udev-rules-stage3
-installer-feature-setup-network-stage3
-
-# ?
-acpid
-mkbootflash
-rp-pppoe-base
-
-# ldap
-# nss_ldap
-# pam_ldap
-
-# haldbus :(
-#hal
-#dbus
-
-# mc :(
-mc
-
-#alsa-utils
-
-# kernel/firmware
-firmware-ipw2100
-firmware-ipw2200
-firmware-iwl3945
-firmware-iwl4965
-firmware-iwl5000
-firmware-acx100
-firmware-prism54
-firmware-rt73
-lm_sensors
-update-kernel
-
-# compression
-cpio
-p7zip
-tar
-unzip
-zip
-
-bridge-utils
-
-gpm
-expect

pkg.in/lists/tagged/server-light.in

@@ -1,59 +0,0 @@
-# interactivesystem
-
-#apache2
-
-#indexhtml-OfficeServer
-sudo
-etcnet-defaults-server
-
-# kernel and modules
-
-# network tools
-dhcpcd
-bind-utils
-
-# disk tools
-jfsutils
-reiserfsprogs
-
-# servers
-#dovecot
-#postfix-dovecot
-#httpd-alterator
-
-# debug
-tcpdump
-
-# docs
-man-pages
-#indexhtml-@THEME@
-#alt-docs-apache2
-#docs-issue-school-server
-
-# alterator
-installer-feature-pxeboot-stage3
-
-# office server
-#alterator-fbi
-
-alterator-dhcp
-alterator-lilo
-alterator-net-domain
-alterator-net-eth
-alterator-net-pppoe
-alterator-net-pptp
-alterator-net-openvpn
-
-#publish-acc-to-console
-
-quota
-
-#installed-db-school-server
-#moodle
-#moodle-apache2
-#moodle-local-mysql
-#mediawiki-apache2
-#nfs-clients
-#nfs-server
-bridge-utils
-etckeeper

pkg.in/lists/tagged/server.in

@@ -1,37 +0,0 @@
-# interactivesystem
-
-sudo
-etcnet-defaults-server
-
-# network tools
-arpwatch
-dhcpcd
-bind
-wireless-tools
-
-# disk tools
-jfsutils
-reiserfsprogs
-quota
-
-# servers
-dovecot
-postfix-dovecot
-nfs-server
-
-#clients
-nfs-clients
-
-# debug
-tcpdump
-
-# docs
-man-pages
-#indexhtml-@THEME@
-alt-docs-apache2
-#docs-issue-school-server
-
-# virt
-vzctl
-kvm
-qemu-system