# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1371212709 0
# Node ID 7a526dcd493226b679750f4895bdbebf9853bd04
# Parent  b682a585bff57f7b743382c52623a80c1fbf2745
Normalize LICENSE and some TAGS and CATEGORY.

diff -r b682a585bff5 -r 7a526dcd4932 bozohttpd/receipt
--- a/bozohttpd/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/bozohttpd/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,26 +5,24 @@
 CATEGORY="network"
 SHORT_DESC="Small and secure http version 1.1 server"
 MAINTAINER="milka@konstelacioj.info"
+WEB_SITE="http://www.eterna.com.au/$PACKAGE/"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="http://www.eterna.com.au/$PACKAGE/$TARBALL"
+TAGS="http server lightweight CGI ipv6 ssl"
+
 DEPENDS="openssl"
 BUILD_DEPENDS="openssl-dev"
 SUGGESTED="haserl"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.eterna.com.au/$PACKAGE/"
-WGET_URL="http://www.eterna.com.au/$PACKAGE/$TARBALL"
-TAGS="http server lightweight cgi ipv6 ssl"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	make -f Makefile.boot all
-	mkdir -p $PWD/_pkg/usr/bin
-	mv bozohttpd $PWD/_pkg/usr/bin/
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
+	mkdir -p $fs/usr/bin
+	cp -a $src/bozohttpd $fs/usr/bin
 }
diff -r b682a585bff5 -r 7a526dcd4932 cantarell-fonts/receipt
--- a/cantarell-fonts/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/cantarell-fonts/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Sans serif font family designed for on-screen readability"
 MAINTAINER="al.bobylev@gmail.com"
-LICENSE="SIL OFL1.1"
+LICENSE="SIL_OFL"
 WEB_SITE="https://live.gnome.org/CantarellFonts"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 SERIES="$(echo $VERSION | cut -d. -f1,2)"
diff -r b682a585bff5 -r 7a526dcd4932 cd-discid/receipt
--- a/cd-discid/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/cd-discid/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,23 +5,24 @@
 CATEGORY="multimedia"
 SHORT_DESC="Utility to get CDDB discid information from a CD-ROM disc"
 MAINTAINER="domcox@slitaz.org"
+WEB_SITE="http://linukz.org/cd-discid.shtml"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="http://linukz.org/download/$TARBALL"
+TAGS="audio CD CDDB"
+
 DEPENDS=""
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://linukz.org/cd-discid.shtml"
-WGET_URL="http://linukz.org/download/$TARBALL"
-TAGS="audio cd cddb"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	make && make DESTDIR=$PWD/_pkg install
+	make &&
+	make DESTDIR=$install install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $install/usr/bin $fs/usr
 }
 
diff -r b682a585bff5 -r 7a526dcd4932 croscore-fonts/receipt
--- a/croscore-fonts/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/croscore-fonts/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Chrome OS Fonts: Arimo (sans), Cousine (monospace), Tinos (serif), and Symbol Neu (symbol)"
 MAINTAINER="al.bobylev@gmail.com"
-LICENSE="SIL Open Font License http://en.wikipedia.org/wiki/SIL_Open_Font_License"
+LICENSE="SIL_OFL"
 WEB_SITE="http://fedoraproject.org/wiki/Google_Croscore_fonts"
 TARBALL="croscorefonts-$VERSION.tar.gz"
 WGET_URL="http://gsdview.appspot.com/chromeos-localmirror/distfiles/$TARBALL"
diff -r b682a585bff5 -r 7a526dcd4932 djvulibre-dev/receipt
--- a/djvulibre-dev/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/djvulibre-dev/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -2,7 +2,7 @@
 
 PACKAGE="djvulibre-dev"
 VERSION="3.5.25.3"
-CATEGORY="developement"
+CATEGORY="development"
 SHORT_DESC="A web-centric format and software platform for distributing documents and images, development files."
 MAINTAINER="pascal.bellard@slitaz.org"
 WEB_SITE="http://djvu.sourceforge.net/"
diff -r b682a585bff5 -r 7a526dcd4932 fdutils/receipt
--- a/fdutils/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/fdutils/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -2,7 +2,7 @@
 
 PACKAGE="fdutils"
 VERSION="5.5"
-CATEGORY="system"
+CATEGORY="system-tools"
 SHORT_DESC="Utilities for configuring and formatting floppy."
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
diff -r b682a585bff5 -r 7a526dcd4932 ffmpegthumbnailer/receipt
--- a/ffmpegthumbnailer/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/ffmpegthumbnailer/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -2,7 +2,7 @@
 
 PACKAGE="ffmpegthumbnailer"
 VERSION="2.0.8"
-CATEGORY="system"
+CATEGORY="system-tools"
 SHORT_DESC="Lightweight video thumbnailer that can be used by file managers"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
diff -r b682a585bff5 -r 7a526dcd4932 liberation-fonts-base/receipt
--- a/liberation-fonts-base/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/liberation-fonts-base/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Liberation fonts (only regular)"
 MAINTAINER="al.bobylev@gmail.com"
-LICENSE="SIL Open Font License, Version 1.1"
+LICENSE="SIL_OFL"
 WEB_SITE="https://www.redhat.com/promo/fonts/"
 SOURCE="liberation-fonts"
 TARBALL="$SOURCE-ttf-$VERSION.tar.gz"
diff -r b682a585bff5 -r 7a526dcd4932 liberation-fonts/receipt
--- a/liberation-fonts/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/liberation-fonts/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Liberation fonts"
 MAINTAINER="al.bobylev@gmail.com"
-LICENSE="SIL Open Font License, Version 1.1"
+LICENSE="SIL_OFL"
 WEB_SITE="https://www.redhat.com/promo/fonts/"
 
 WANTED="liberation-fonts-base"
diff -r b682a585bff5 -r 7a526dcd4932 opencore-amr-dev/receipt
--- a/opencore-amr-dev/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/opencore-amr-dev/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="multimedia"
 SHORT_DESC="Adaptive Multi Rate (AMR) speech codec -dev files"
 MAINTAINER="domcox@slitaz.org"
-LICENSE="apache"
+LICENSE="Apache"
 WEB_SITE="http://opencore-amr.sourceforge.net"
 WANTED="opencore-amr"
 
diff -r b682a585bff5 -r 7a526dcd4932 opencore-amr/receipt
--- a/opencore-amr/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/opencore-amr/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="multimedia"
 SHORT_DESC="Adaptive Multi Rate (AMR) speech codec"
 MAINTAINER="domcox@slitaz.org"
-LICENSE="apache"
+LICENSE="Apache"
 WEB_SITE="http://opencore-amr.sourceforge.net"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r b682a585bff5 -r 7a526dcd4932 rubyripper/receipt
--- a/rubyripper/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/rubyripper/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,32 +5,32 @@
 CATEGORY="multimedia"
 SHORT_DESC="A secure audio disc ripper"
 MAINTAINER="domcox@slitaz.org"
+WEB_SITE="http://code.google.com/p/rubyripper"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="http://rubyripper.googlecode.com/files/$TARBALL"
+TAGS="audio CD ripper"
+
+SUGGESTED="ruby-gtk2 lame orgenc"
 DEPENDS="cd-discid cdparanoia-III flac normalize ruby"
-SUGGESTED="ruby-gtk2 lame orgenc"
 BUILD_DEPENDS="cd-discid cdparanoia-III lame normalize ruby vorbis-tools"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://code.google.com/p/rubyripper"
-WGET_URL="http://rubyripper.googlecode.com/files/$TARBALL"
-TAGS="audio cd ripper"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--enable-gtk2 \
 		--enable-cli \
 		--enable-lang-all \
-		&& make && make DESTDIR=$PWD/_pkg install
+		&& make && make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr 
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/lib $fs/usr
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib $fs/usr
 	# launcher
 	cp -a $stuff/$PACKAGE $fs/usr/bin
 }
diff -r b682a585bff5 -r 7a526dcd4932 schroedinger-dev/receipt
--- a/schroedinger-dev/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/schroedinger-dev/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="multimedia"
 SHORT_DESC="Dirac video compression library - dev files"
 MAINTAINER="domcox@slitaz.org"
-LICENSE="mpl LGPL MIT"
+LICENSE="MPL LGPL MIT"
 WEB_SITE="http://diracvideo.org/"
 WANTED="schroedinger"
 
diff -r b682a585bff5 -r 7a526dcd4932 schroedinger/receipt
--- a/schroedinger/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/schroedinger/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,10 +5,11 @@
 CATEGORY="multimedia"
 SHORT_DESC="Dirac video compression library"
 MAINTAINER="domcox@slitaz.org"
-LICENSE="mpl LGPL MIT"
+LICENSE="MPL LGPL MIT"
 WEB_SITE="http://diracvideo.org/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/download/$PACKAGE/$TARBALL"
+
 DEPENDS="orc"
 BUILD_DEPENDS="orc-dev"
 
diff -r b682a585bff5 -r 7a526dcd4932 slib/receipt
--- a/slib/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/slib/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="office"
 SHORT_DESC="portable library for the programming language Scheme"
 MAINTAINER="domcox@slitaz.org"
-LICENSE="Public Domain"
+LICENSE="PublicDomain"
 WEB_SITE="http://people.csail.mit.edu/jaffer/SLIB"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://groups.csail.mit.edu/mac/ftpdir/scm/$TARBALL"
diff -r b682a585bff5 -r 7a526dcd4932 terminology/receipt
--- a/terminology/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/terminology/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="base-system"
 SHORT_DESC="Terminology is a terminal emulator with innovative features."
 MAINTAINER="domcox@slitaz.org"
-LICENSE="gpl"
+LICENSE="GPL"
 WEB_SITE="http://www.enlightenment.org/"
 TARBALL="$PACKAGE-${VERSION%-*}.tar.gz"
 WGET_URL="http://download.enlightenment.org/releases/$TARBALL"
diff -r b682a585bff5 -r 7a526dcd4932 ttf-bitstream-vera/receipt
--- a/ttf-bitstream-vera/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/ttf-bitstream-vera/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -8,7 +8,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnome.org/fonts/"
 WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/$VERSION/$TARBALL"
-TAGS="fonts"
+TAGS="font"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r b682a585bff5 -r 7a526dcd4932 ttf-dejavu-extra/receipt
--- a/ttf-dejavu-extra/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/ttf-dejavu-extra/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -4,11 +4,10 @@
 VERSION="2.32"
 CATEGORY="x-window"
 SHORT_DESC="DejaVu True Type Font (extra)."
-SOURCE="dejavu-fonts-ttf"
-WANTED="ttf-dejavu"
 MAINTAINER="pankso@slitaz.org"
 WEB_SITE="http://dejavu.sourceforge.net/"
-TAGS="fonts"
+WANTED="ttf-dejavu"
+TAGS="font"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r b682a585bff5 -r 7a526dcd4932 ttf-dejavu/receipt
--- a/ttf-dejavu/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/ttf-dejavu/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -4,12 +4,12 @@
 VERSION="2.32"
 CATEGORY="x-window"
 SHORT_DESC="DejaVu True Type Font (minimum)."
+MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://dejavu.sourceforge.net/"
 SOURCE="dejavu-fonts-ttf"
-MAINTAINER="pankso@slitaz.org"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://dejavu.sourceforge.net/"
 WGET_URL="$SF_MIRROR/dejavu/$TARBALL"
-TAGS="fonts"
+TAGS="font"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r b682a585bff5 -r 7a526dcd4932 ttf-roboto-base/receipt
--- a/ttf-roboto-base/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/ttf-roboto-base/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Android Roboto Fonts (base family)"
 MAINTAINER="al.bobylev@gmail.com"
-LICENSE="Apache License 2.0 /usr/share/fonts/truetype/ttf-roboto/COPYING.txt"
+LICENSE="Apache"
 WEB_SITE="http://developer.android.com/design/style/typography.html"
 TARBALL="Roboto_Hinted_$VERSION.zip"
 WGET_URL="http://developer.android.com/downloads/design/$TARBALL"
diff -r b682a585bff5 -r 7a526dcd4932 ttf-roboto/receipt
--- a/ttf-roboto/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/ttf-roboto/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Android Roboto Fonts"
 MAINTAINER="al.bobylev@gmail.com"
-LICENSE="Apache License 2.0 /usr/share/fonts/truetype/ttf-roboto/COPYING.txt"
+LICENSE="Apache"
 WEB_SITE="http://developer.android.com/design/style/typography.html"
 WANTED="ttf-roboto-base"
 DEPENDS="ttf-roboto-base"
diff -r b682a585bff5 -r 7a526dcd4932 tumbler/receipt
--- a/tumbler/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/tumbler/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -2,7 +2,7 @@
 
 PACKAGE="tumbler"
 VERSION="0.1.27"
-CATEGORY="system"
+CATEGORY="system-tools"
 SHORT_DESC="A D-Bus thumbnailing service based on the thumbnail management D-Bus specification"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 LGPL2.1"
diff -r b682a585bff5 -r 7a526dcd4932 ufiformat/receipt
--- a/ufiformat/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/ufiformat/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -2,7 +2,7 @@
 
 PACKAGE="ufiformat"
 VERSION="0.9.9"
-CATEGORY="system"
+CATEGORY="system-tools"
 SHORT_DESC="Low level (physical) formatting tool on USB-FDD."
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
diff -r b682a585bff5 -r 7a526dcd4932 wqy-bitmapfont/receipt
--- a/wqy-bitmapfont/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/wqy-bitmapfont/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,22 +5,16 @@
 CATEGORY="x-window"
 SHORT_DESC="A popular Chinese bitmap font."
 MAINTAINER="tsjz@ymail.com"
-TARBALL="wqy-bitmapfont-pcf-0.9.9-0.tar.gz"
 WEB_SITE="http://www.wqy.org/"
+TARBALL="$PACKAGE-pcf-0.9.9-0.tar.gz"
 WGET_URL="$SF_MIRROR/wqy/$TARBALL"
-TAGS="fonts"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src/* $DESTDIR
-}
+TAGS="font"
 
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share/fonts/wqy/wqy-bitmapfont/
-	cp -a $_pkg/*.pcf $fs/usr/share/fonts/wqy/wqy-bitmapfont/
+	FONT=$fs/usr/share/fonts/wqy/wqy-bitmapfont
+	mkdir -p $FONT
+	cp -a $src/*.pcf $FONT
 }
 
 pre_install()
diff -r b682a585bff5 -r 7a526dcd4932 zlib/receipt
--- a/zlib/receipt	Fri Jun 14 08:43:56 2013 +0200
+++ b/zlib/receipt	Fri Jun 14 12:25:09 2013 +0000
@@ -5,7 +5,7 @@
 CATEGORY="base-system"
 SHORT_DESC="Compression library."
 MAINTAINER="pankso@slitaz.org"
-LICENSE="http://www.zlib.net/zlib_license.html"
+LICENSE="zlib/libpng"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://zlib.net"
 WGET_URL="$SF_MIRROR/libpng/$TARBALL"