2 files changed, 41 insertions, 34 deletions
diff --git a/pkg/libpng/gen.lua b/pkg/libpng/gen.lua
new file mode 100644
index 00000000..858caf4c
--- /dev/null
+++ b/pkg/libpng/gen.lua
@@ -0,0 +1,41 @@
+cflags{
+	'-D HAVE_CONFIG_H',
+	'-I include',
+	'-I $dir',
+	'-I $outdir/include',
+	'-I $builddir/pkg/zlib/include',
+}
+
+build('awk', '$outdir/pnglibconf.tf4', {
+	'$srcdir/pngconf.h',
+	'$srcdir/scripts/pnglibconf.dfa',
+	'$srcdir/pngusr.dfa',
+	'|', '$srcdir/scripts/options.awk',
+}, {expr='-f $srcdir/scripts/options.awk out=/dev/stdout version=search'})
+build('awk', '$outdir/pnglibconf.c', '$outdir/pnglibconf.tf4', {
+	expr='-f $srcdir/scripts/options.awk out=/dev/stdout',
+})
+build('cc', '$outdir/pnglibconf.tf1', {'$outdir/pnglibconf.c', '||', 'pkg/zlib/headers'}, {
+	cflags='$cflags -E -MT $outdir/pnglibconf.tf1',
+})
+build('awk', '$outdir/include/pnglibconf.h', '$outdir/pnglibconf.tf1', {
+	expr='-f $srcdir/scripts/dfn.awk out=/dev/stdout',
+})
+
+pkg.hdrs = {
+	copy('$outdir/include', '$srcdir', {'png.h', 'pngconf.h'}),
+	'$outdir/include/pnglibconf.h',
+	install=true,
+}
+pkg.deps = {'$outdir/include/pnglibconf.h', 'pkg/zlib/headers'}
+
+lib('libpng.a', [[
+	png.c pngerror.c
+	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c
+	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
+	intel/(intel_init.c filter_sse2_intrinsics.c)
+	$builddir/pkg/zlib/libz.a
+]])
+file('lib/libpng.a', '644', '$outdir/libpng.a')
+
+fetch 'git'
diff --git a/pkg/libpng/gen.rc b/pkg/libpng/gen.rc
deleted file mode 100644
index dba72103..00000000
--- a/pkg/libpng/gen.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-I include\
-	-I '$dir' \
-	-I '$outdir'/include\
-	-I '$builddir'/pkg/zlib/include
-
-build '$outdir'/pnglibconf.tf4 awk '$srcdir'/^(pngconf.h scripts/pnglibconf.dfa pngusr.dfa) ; with\
-	expr '-f $srcdir/scripts/options.awk out=/dev/stdout version=search'
-build '$outdir'/pnglibconf.c awk '$outdir'/pnglibconf.tf4 ; with\
-	expr '-f $srcdir/scripts/options.awk out=/dev/stdout'
-build '$outdir'/pnglibconf.tf1 cc '$outdir'/pnglibconf.c '||' pkg/zlib/headers ; with\
-	cflags '$cflags -E -MT $outdir/pnglibconf.tf1'
-build '$outdir'/include/pnglibconf.h awk '$outdir'/pnglibconf.tf1 ; with\
-	expr '-f $srcdir/scripts/dfn.awk out=/dev/stdout'
-
-hdrs=(png.h pngconf.h)
-for(hdr in $hdrs) {
-	build '$outdir'/include/$hdr copy '$srcdir'/$hdr
-	file include/$hdr '$srcdir'/$hdr 644
-}
-phony headers '$outdir'/include/^($hdrs pnglibconf.h)
-file include/pnglibconf.h '$outdir'/include/pnglibconf.h 644
-
-phony deps '$outdir'/include/pnglibconf.h pkg/zlib/headers
-lib libpng.a -d '$dir'/deps\
-	png.c pngerror.c\
-	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
-	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
-	intel/^(intel_init.c filter_sse2_intrinsics.c)\
-	'$builddir'/pkg/zlib/libz.a
-file lib/libpng.a '$outdir'/libpng.a 644
-
-fetch git