# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1553716800 -3600
# Node ID 91bf86b1b7f8e74b61be22875f9a6145771b2ec3
# Parent  8370eb7b15e575502e5ffc8f85bb3e6337bc51c4
fonts/freetype: rename from lib/freetype

diff -r 8370eb7b15e5 -r 91bf86b1b7f8 fonts/fontconfig/fontconfig.sh
--- a/fonts/fontconfig/fontconfig.sh	Wed Mar 27 14:24:47 2019 +0100
+++ b/fonts/fontconfig/fontconfig.sh	Wed Mar 27 21:00:00 2019 +0100
@@ -21,7 +21,7 @@
 PKGLICENSE=""
 PKGSUMMARY="library for configuring and customizing font access"
 PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/release/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/expat lib/freetype core/util-linux"
+PKGDEPENDS="lib/expat fonts/freetype core/util-linux"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
diff -r 8370eb7b15e5 -r 91bf86b1b7f8 fonts/freetype/freetype.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/freetype/freetype.sh	Wed Mar 27 21:00:00 2019 +0100
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+PKGNAME=freetype
+PKGVERSION=2.9.1
+PKGREVISION=1
+PKGLICENSE="CUSTOM GPLv2+"
+PKGSUMMARY="truetype font rendering library"
+PKGDOWNLOAD="https://download.savannah.gnu.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
+PKGOPTIONS="BZIP2 PNG ZLIB"
+
+: ${CHOST:=$(uname -m)-linux-musl}
+: ${CBUILD:=$(uname -m)-linux-musl}
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
+: ${BZIP2:=yes}
+: ${PNG:=yes}
+: ${ZLIB:=yes}
+
+if [ "$BZIP2" = "yes" ]; then
+	PKGDEPENDS="core/bzip2 $PKGDEPENDS"
+	with_bzip2="--with-bzip2"
+else
+	with_bzip2="--without-bzip2"
+fi
+
+if [ "$PNG" = "yes" ]; then
+	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
+	with_png="--with-png"
+else
+	with_png="--without-png"
+fi
+
+if [ "$ZLIB" = "yes" ]; then
+	PKGDEPENDS="lib/zlib $PKGDEPENDS"
+	with_zlib="--with-zlib"
+else
+	with_zlib="--without-zlib"
+fi
+
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	pushd $PKGNAME-$PKGVERSION
+
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr \
+		--disable-static \
+		$with_bzip2 \
+		$with_png \
+		$with_zlib
+	make
+	make install DESTDIR=$DESTDIR
+	rm -f $DESTDIR/usr/lib/libfreetype.la
+
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r 8370eb7b15e5 -r 91bf86b1b7f8 graphics/cairo/cairo.sh
--- a/graphics/cairo/cairo.sh	Wed Mar 27 14:24:47 2019 +0100
+++ b/graphics/cairo/cairo.sh	Wed Mar 27 21:00:00 2019 +0100
@@ -58,7 +58,7 @@
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="lib/freetype $PKGDEPENDS"
+	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
 	with_freetype="--enable-ft"
 else
 	with_freetype="--disable-ft"
diff -r 8370eb7b15e5 -r 91bf86b1b7f8 lib/freetype/freetype.sh
--- a/lib/freetype/freetype.sh	Wed Mar 27 14:24:47 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=freetype
-PKGVERSION=2.9.1
-PKGREVISION=1
-PKGLICENSE="CUSTOM GPLv2+"
-PKGSUMMARY="truetype font rendering library"
-PKGDOWNLOAD="https://download.savannah.gnu.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGOPTIONS="BZIP2 PNG ZLIB"
-
-: ${CHOST:=$(uname -m)-linux-musl}
-: ${CBUILD:=$(uname -m)-linux-musl}
-: ${CC:=gcc}
-: ${CFLAGS:=-O2}
-: ${LDFLAGS:=}
-: ${LIBS:=}
-: ${BZIP2:=yes}
-: ${PNG:=yes}
-: ${ZLIB:=yes}
-
-if [ "$BZIP2" = "yes" ]; then
-	PKGDEPENDS="core/bzip2 $PKGDEPENDS"
-	with_bzip2="--with-bzip2"
-else
-	with_bzip2="--without-bzip2"
-fi
-
-if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
-	with_png="--with-png"
-else
-	with_png="--without-png"
-fi
-
-if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="lib/zlib $PKGDEPENDS"
-	with_zlib="--with-zlib"
-else
-	with_zlib="--without-zlib"
-fi
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
-
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix=/usr \
-		--disable-static \
-		$with_bzip2 \
-		$with_png \
-		$with_zlib
-	make
-	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libfreetype.la
-
-	popd
-	rm -rf $PKGNAME-$PKGVERSION
-}
diff -r 8370eb7b15e5 -r 91bf86b1b7f8 x11/libxfont2/libxfont2.sh
--- a/x11/libxfont2/libxfont2.sh	Wed Mar 27 14:24:47 2019 +0100
+++ b/x11/libxfont2/libxfont2.sh	Wed Mar 27 21:00:00 2019 +0100
@@ -41,7 +41,7 @@
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="lib/freetype $PKGDEPENDS"
+	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
 	with_freetype="--enable-freetype"
 else
 	with_freetype="--disable-freetype"
diff -r 8370eb7b15e5 -r 91bf86b1b7f8 x11/libxft/libxft.sh
--- a/x11/libxft/libxft.sh	Wed Mar 27 14:24:47 2019 +0100
+++ b/x11/libxft/libxft.sh	Wed Mar 27 21:00:00 2019 +0100
@@ -22,7 +22,7 @@
 PKGSUMMARY="X.Org truetype extension library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXft-$PKGVERSION.tar.gz"
 PKGDEPENDS="fonts/fontconfig
-            lib/freetype
+            fonts/freetype
             x11/util-macros:build
             x11/xorgproto:build"
 
diff -r 8370eb7b15e5 -r 91bf86b1b7f8 x11/mkfontscale/mkfontscale.sh
--- a/x11/mkfontscale/mkfontscale.sh	Wed Mar 27 14:24:47 2019 +0100
+++ b/x11/mkfontscale/mkfontscale.sh	Wed Mar 27 21:00:00 2019 +0100
@@ -22,7 +22,7 @@
 PKGSUMMARY="X.Org tool to create index of scalable fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/app/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="lib/zlib
-            lib/freetype
+            fonts/freetype
             x11/libfontenc
             x11/util-macros:build
             x11/xorgproto:build"