djvu: adding Manifest; also fixing some mkbuilds regarding to simplepkg bug #80

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@375 18ef50b8-d735-4ccd-97c1-689132df3dd9

57 files changed, 85 insertions, 61 deletions

diff --git a/app/dicts/babytrans/babytrans.mkbuild b/app/dicts/babytrans/babytrans.mkbuild
index 7d29272..b8b8457 100644
--- a/app/dicts/babytrans/babytrans.mkbuild
+++ b/app/dicts/babytrans/babytrans.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="app/dicts/babytrans"
 
 #---------------------
diff --git a/app/editors/kile/kile.mkbuild b/app/editors/kile/kile.mkbuild
index e7ac86b..4daf467 100644
--- a/app/editors/kile/kile.mkbuild
+++ b/app/editors/kile/kile.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="app/editors/kile"
 
 #---------------------
diff --git a/app/emulation/wine/wine.mkbuild b/app/emulation/wine/wine.mkbuild
index 658ed0c..692c3f2 100644
--- a/app/emulation/wine/wine.mkbuild
+++ b/app/emulation/wine/wine.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="app/emulation/wine"
 
 #---------------------
diff --git a/app/misc/wine-doors/wine-doors.mkbuild b/app/misc/wine-doors/wine-doors.mkbuild
index 77907f3..77bc5d1 100644
--- a/app/misc/wine-doors/wine-doors.mkbuild
+++ b/app/misc/wine-doors/wine-doors.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="app/misc/wine-doors"
 
 #---------------------
diff --git a/app/text/djvu/Manifest b/app/text/djvu/Manifest
new file mode 100644
index 0000000..831c6e8
--- /dev/null
+++ b/app/text/djvu/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST djvulibre-3.5.20.tar.gz 2416958 MD5 c94091de014b3aaf037d3d0f398d36c2 RMD160 fb755064912586585656b9701b7d98bd3019c67b SHA1 88ec94512f3f7845b42c2585f75e07a9cf147380 SHA256 d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3 SHA512 e6266a16c91c8b705191b1189c2660a02d78639c4060e0f587be5588e050e5890afaf184530b081a25581f5e32f8f9a2b097088fe7bebf3ba9ba4e900bd7b32e
+MKBUILD djvu.mkbuild 3452 MD5 3e3a36f1d5ddbb045741fbd968f24a28 RMD160 4eede092eea17888f5d5f207852ca2ca8280ba4c SHA1 988b44d19a654868fa0a4fde8b2e6c0e1630b62d SHA256 13af00d284a46fb92060b8629e9c5c928aea27a520a7d85c3192159a196540cc SHA512 e7f317e81c876c5bb633d314f62d4c9e79bcf28fe06dc20b356e0a2c7f00e14d5ad5bb4448944047ef707e63d7976382843d13d52812ba29cc5c1d6bd65b1850
+SLACKBUILD djvu.SlackBuild 7178 MD5 046e7bef15242c9d9988952985f4f9fc RMD160 7d08f531d83d559c9e6135abd8cad8c818a5bffc SHA1 33071f8a96251b790d842d0ae4d2e35f2fe8c949 SHA256 598e6637bd47693fd12ddad52d197d0f9a38d22404c7284fa20527226eb6e259 SHA512 ac076129df02316e865e6a455a901ac87926379f49590b57be92e81075c834afc28eea2c701ba56482e65f1ccc093d621c91dfd8087a1e0632286d64ee579116
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJeOQ3AAoJEEHL93ESzgeiu9IP/AseB4GLxsHZGvoCBMVnSs8W
+iyaWh/nVZoV1nIEXfF61PHn3vAhLns4F/RN01kOkGt/vgMNLsl22gSz3cQMi6FMR
+GStpdMsysnO1FzbJvv2w3IqnDA3B4CGxBuh7jPLcUOLp9hbOmyFy9/6PMrtSTuCb
+XwoTZt8yZaBucAIyWx2Kyuf4KyyT2cVFausA6mcxe1MTB9+w9jhbNySege5/JkeF
+K9sA3kJXQ7qY34UXb10DM/d6+mXzXb7oWFHA/IyTBv2i8dKgslbpzftQ0MthEIbk
+NSAgjPyAuIfA1I1RGQQG29m0ehb7Pfy1uRUN2OvC9TPZfSK1l+JJWErPcGa5Fc7+
+Wn0s7qswq+mHZpuYTdAY1fzNDXMvMZn9m0aT/2XxbGRFgkE+UGjMT/Ju+Ed3Smid
+fimpgqv/Z/kSjKS2j/Lp+USTZJhDoq8S1hmXLulDPa5vvKKgZeobGgafX73BreL+
+T/zNmQP1Zd5evS1TVICD1qNqvox2XTkRFGwzMCXZWLYnmRvTiawsukBjzWokpAk3
+cknF26dG7qghwIIemPNaHbcfhwgP6e89TtRewTiQ8kNwKq1ilu6f8OqWb2qaOAbG
+9sK0hYg/khX5r+eHDsKywrLdPyYZZ6O7uwsdQTNfpETd4vMaK1pWN0/6jhlSaXnr
+8fYUA6a+1c5qPiupLYGN
+=Uw5K
+-----END PGP SIGNATURE-----
diff --git a/app/text/djvu/djvu.mkbuild b/app/text/djvu/djvu.mkbuild
index 6e70f8a..ecd0e6b 100644
--- a/app/text/djvu/djvu.mkbuild
+++ b/app/text/djvu/djvu.mkbuild
@@ -45,8 +45,8 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
-[[SLACKBUILD PATH]]="app/text/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
+[[SLACKBUILD PATH]]="app/text/$PKG_NAME"
 
 #---------------------
 # SlackBuild Sections
@@ -66,6 +66,7 @@
 off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
 off: gpg_signature_check
+ on: manifest_check
  on: untar_source
 off: patch_source
  on: configure
diff --git a/app/text/scrollkeeper/scrollkeeper.mkbuild b/app/text/scrollkeeper/scrollkeeper.mkbuild
index 5e11570..b4579ff 100644
--- a/app/text/scrollkeeper/scrollkeeper.mkbuild
+++ b/app/text/scrollkeeper/scrollkeeper.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="app/text/scrollkeeper"
 
 #---------------------
diff --git a/dev/lang/ocaml/ocaml.mkbuild b/dev/lang/ocaml/ocaml.mkbuild
index 23a30ab..4472151 100644
--- a/dev/lang/ocaml/ocaml.mkbuild
+++ b/dev/lang/ocaml/ocaml.mkbuild
@@ -32,7 +32,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/lang/ocaml"
 
 #---------------------
diff --git a/dev/libs/check/check.mkbuild b/dev/libs/check/check.mkbuild
index aecc5c9..804ec27 100644
--- a/dev/libs/check/check.mkbuild
+++ b/dev/libs/check/check.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/libs/check"
 
 #---------------------
diff --git a/dev/libs/directfb-extra/DirectFB-extra.mkbuild b/dev/libs/directfb-extra/DirectFB-extra.mkbuild
index cce9e1a..3a7ff16 100644
--- a/dev/libs/directfb-extra/DirectFB-extra.mkbuild
+++ b/dev/libs/directfb-extra/DirectFB-extra.mkbuild
@@ -109,7 +109,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/libs/directfb-extra"
 
 #---------------------
diff --git a/dev/libs/directfb/directfb.mkbuild b/dev/libs/directfb/directfb.mkbuild
index ede22a6..f50001f 100644
--- a/dev/libs/directfb/directfb.mkbuild
+++ b/dev/libs/directfb/directfb.mkbuild
@@ -109,7 +109,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/libs/directfb"
 
 #---------------------
diff --git a/dev/libs/dotconf/dotconf.mkbuild b/dev/libs/dotconf/dotconf.mkbuild
index 600eaa6..5ab736f 100644
--- a/dev/libs/dotconf/dotconf.mkbuild
+++ b/dev/libs/dotconf/dotconf.mkbuild
@@ -29,8 +29,8 @@
 [[DOWNLOAD FOLDER URL]]="http://www.azzit.de/dotconf/download/v1.0/dotconf-1.0.13.tar.gz"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
-[[SLACKBUILD PATH]]="dev/libs/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
+[[SLACKBUILD PATH]]="dev/libs/$PKG_NAME"
 
 #---------------------
 # SlackBuild Sections
diff --git a/dev/libs/gdk-pixbuf/gdk-pixbuf.mkbuild b/dev/libs/gdk-pixbuf/gdk-pixbuf.mkbuild
index a903e0f..f48cb30 100644
--- a/dev/libs/gdk-pixbuf/gdk-pixbuf.mkbuild
+++ b/dev/libs/gdk-pixbuf/gdk-pixbuf.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/libs/gdk-pixbuf"
 
 #---------------------
diff --git a/dev/libs/libiconv/libiconv.mkbuild b/dev/libs/libiconv/libiconv.mkbuild
index d30f1bd..cab4bc1 100644
--- a/dev/libs/libiconv/libiconv.mkbuild
+++ b/dev/libs/libiconv/libiconv.mkbuild
@@ -37,7 +37,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/libs/libiconv"
 
 #---------------------
diff --git a/dev/python/gnome-python-desktop/gnome-python-desktop.mkbuild b/dev/python/gnome-python-desktop/gnome-python-desktop.mkbuild
index 848787c..436c552 100644
--- a/dev/python/gnome-python-desktop/gnome-python-desktop.mkbuild
+++ b/dev/python/gnome-python-desktop/gnome-python-desktop.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/python/gnome-python-desktop"
 
 #---------------------
diff --git a/dev/python/pyxml/PyXML.mkbuild b/dev/python/pyxml/PyXML.mkbuild
index 04889d9..f53b4e3 100644
--- a/dev/python/pyxml/PyXML.mkbuild
+++ b/dev/python/pyxml/PyXML.mkbuild
@@ -29,7 +29,7 @@
 [[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz"
 
 # SlackBuild PATH in Slack.Sarava tree
-[[SLACKBUILD PATH]]="dev/python/[[NAME]]"
+[[SLACKBUILD PATH]]="dev/python/$PKG_NAME"
 
 # Documentation files
 [[DOCUMENTATION FILES]]="ANNOUNCE CREDITS LICENCE MANIFEST README"
diff --git a/dev/util/bashdb/bashdb.mkbuild b/dev/util/bashdb/bashdb.mkbuild
index e2a634c..a69da39 100644
--- a/dev/util/bashdb/bashdb.mkbuild
+++ b/dev/util/bashdb/bashdb.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/util/bashdb"
 
 #---------------------
diff --git a/dev/util/ddd/ddd.mkbuild b/dev/util/ddd/ddd.mkbuild
index f435948..5599533 100644
--- a/dev/util/ddd/ddd.mkbuild
+++ b/dev/util/ddd/ddd.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]=""
 
 #---------------------
diff --git a/dev/util/geany/geany.mkbuild b/dev/util/geany/geany.mkbuild
index 40003b2..a36d071 100644
--- a/dev/util/geany/geany.mkbuild
+++ b/dev/util/geany/geany.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/util/geany"
 
 #---------------------
diff --git a/dev/util/glade/glade.mkbuild b/dev/util/glade/glade.mkbuild
index 62457bb..08fe567 100644
--- a/dev/util/glade/glade.mkbuild
+++ b/dev/util/glade/glade.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/util/glade"
 
 #---------------------
diff --git a/dev/util/pydb/pydb.mkbuild b/dev/util/pydb/pydb.mkbuild
index 81b3ee3..878b250 100644
--- a/dev/util/pydb/pydb.mkbuild
+++ b/dev/util/pydb/pydb.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/util/pydb"
 
 #---------------------
diff --git a/games/strategy/dopewars/dopewars.mkbuild b/games/strategy/dopewars/dopewars.mkbuild
index b39a82b..387570f 100644
--- a/games/strategy/dopewars/dopewars.mkbuild
+++ b/games/strategy/dopewars/dopewars.mkbuild
@@ -43,7 +43,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="games/strategy/dopewars"
 
 #---------------------
diff --git a/gnome/base/orbit/ORBit2.mkbuild b/gnome/base/orbit/ORBit2.mkbuild
index 49fb33d..c393b59 100644
--- a/gnome/base/orbit/ORBit2.mkbuild
+++ b/gnome/base/orbit/ORBit2.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="gnome/base/orbit"
 
 #---------------------
diff --git a/mail/client/sylpheed/sylpheed.mkbuild b/mail/client/sylpheed/sylpheed.mkbuild
index f066a05..6bc8200 100644
--- a/mail/client/sylpheed/sylpheed.mkbuild
+++ b/mail/client/sylpheed/sylpheed.mkbuild
@@ -107,7 +107,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="mail/client/sylpheed"
 
 #---------------------
diff --git a/mail/filter/maildrop/maildrop.mkbuild b/mail/filter/maildrop/maildrop.mkbuild
index 8b3e948..886f8b6 100644
--- a/mail/filter/maildrop/maildrop.mkbuild
+++ b/mail/filter/maildrop/maildrop.mkbuild
@@ -46,8 +46,8 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
-[[SLACKBUILD PATH]]="mail/filter/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
+[[SLACKBUILD PATH]]="mail/filter/$PKG_NAME"
 
 #---------------------
 # SlackBuild Sections
diff --git a/media/gfx/inkscape/inkscape.mkbuild b/media/gfx/inkscape/inkscape.mkbuild
index 4e1fe80..7142581 100644
--- a/media/gfx/inkscape/inkscape.mkbuild
+++ b/media/gfx/inkscape/inkscape.mkbuild
@@ -107,7 +107,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/gfx/inkscape"
 
 #---------------------
diff --git a/media/libs/gst-ffmpeg/gst-ffmpeg.mkbuild b/media/libs/gst-ffmpeg/gst-ffmpeg.mkbuild
index 30ca7f1..5c131d0 100644
--- a/media/libs/gst-ffmpeg/gst-ffmpeg.mkbuild
+++ b/media/libs/gst-ffmpeg/gst-ffmpeg.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/gst-ffmpeg"
 
 #---------------------
diff --git a/media/libs/gst-plugins-bad/gst-plugins-bad.mkbuild b/media/libs/gst-plugins-bad/gst-plugins-bad.mkbuild
index 9053ff3..d25ad2b 100644
--- a/media/libs/gst-plugins-bad/gst-plugins-bad.mkbuild
+++ b/media/libs/gst-plugins-bad/gst-plugins-bad.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/gst-plugins-bad"
 
 #---------------------
diff --git a/media/libs/gst-plugins-base/gst-plugins-base.mkbuild b/media/libs/gst-plugins-base/gst-plugins-base.mkbuild
index 245eac7..50175bd 100644
--- a/media/libs/gst-plugins-base/gst-plugins-base.mkbuild
+++ b/media/libs/gst-plugins-base/gst-plugins-base.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/gst-plugins-base"
 
 #---------------------
diff --git a/media/libs/gst-plugins-good/gst-plugins-good.mkbuild b/media/libs/gst-plugins-good/gst-plugins-good.mkbuild
index 78df053..74c662c 100644
--- a/media/libs/gst-plugins-good/gst-plugins-good.mkbuild
+++ b/media/libs/gst-plugins-good/gst-plugins-good.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/gst-plugins-good"
 
 #---------------------
diff --git a/media/libs/gst-plugins-ugly/gst-plugins-ugly.mkbuild b/media/libs/gst-plugins-ugly/gst-plugins-ugly.mkbuild
index a66918d..ba76e14 100644
--- a/media/libs/gst-plugins-ugly/gst-plugins-ugly.mkbuild
+++ b/media/libs/gst-plugins-ugly/gst-plugins-ugly.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/gst-plugins-ugly"
 
 #---------------------
diff --git a/media/libs/gstreamer/gstreamer.mkbuild b/media/libs/gstreamer/gstreamer.mkbuild
index 2b54b22..bacfe67 100644
--- a/media/libs/gstreamer/gstreamer.mkbuild
+++ b/media/libs/gstreamer/gstreamer.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/gstreamer"
 
 #---------------------
diff --git a/media/libs/libdvbpsi/libdvbpsi.mkbuild b/media/libs/libdvbpsi/libdvbpsi.mkbuild
index c947dc0..6941dc4 100644
--- a/media/libs/libdvbpsi/libdvbpsi.mkbuild
+++ b/media/libs/libdvbpsi/libdvbpsi.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/libdvbpsi"
 
 #---------------------
diff --git a/media/libs/libmikmod/libmikmod.mkbuild b/media/libs/libmikmod/libmikmod.mkbuild
index b0cc9d6..ba8e251 100644
--- a/media/libs/libmikmod/libmikmod.mkbuild
+++ b/media/libs/libmikmod/libmikmod.mkbuild
@@ -37,7 +37,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/libmikmod"
 
 #---------------------
diff --git a/media/libs/unicap/unicap.mkbuild b/media/libs/unicap/unicap.mkbuild
index f11c5e1..6dd8cd9 100644
--- a/media/libs/unicap/unicap.mkbuild
+++ b/media/libs/unicap/unicap.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/unicap"
 
 #---------------------
diff --git a/media/libs/zvbi/zvbi.mkbuild b/media/libs/zvbi/zvbi.mkbuild
index bad9e94..901bb2c 100644
--- a/media/libs/zvbi/zvbi.mkbuild
+++ b/media/libs/zvbi/zvbi.mkbuild
@@ -109,7 +109,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/libs/zvbi"
 
 #---------------------
diff --git a/media/sound/audacity/audacity.mkbuild b/media/sound/audacity/audacity.mkbuild
index f143a65..8bb8676 100644
--- a/media/sound/audacity/audacity.mkbuild
+++ b/media/sound/audacity/audacity.mkbuild
@@ -32,8 +32,8 @@
 [[DOCUMENTATION FILES]]="LICENSE.txt README.txt"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
-[[SLACKBUILD PATH]]="media/sound/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
+[[SLACKBUILD PATH]]="media/sound/$PKG_NAME"
 
 #---------------------
 # SlackBuild Sections
diff --git a/media/sound/jack/jack.mkbuild b/media/sound/jack/jack.mkbuild
index 838517e..ac66b39 100644
--- a/media/sound/jack/jack.mkbuild
+++ b/media/sound/jack/jack.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/sound/jack"
 
 #---------------------
diff --git a/media/sound/lame/lame.mkbuild b/media/sound/lame/lame.mkbuild
index 21d5c6e..6a8b01b 100644
--- a/media/sound/lame/lame.mkbuild
+++ b/media/sound/lame/lame.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/sound/lame"
 
 #---------------------
diff --git a/media/sound/pulseaudio/pulseaudio.mkbuild b/media/sound/pulseaudio/pulseaudio.mkbuild
index 91bb2b2..d235b2a 100644
--- a/media/sound/pulseaudio/pulseaudio.mkbuild
+++ b/media/sound/pulseaudio/pulseaudio.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/sound/pulseaudio"
 
 #---------------------
diff --git a/media/sound/xmms/xmms.mkbuild b/media/sound/xmms/xmms.mkbuild
index c82e574..baef919 100644
--- a/media/sound/xmms/xmms.mkbuild
+++ b/media/sound/xmms/xmms.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="others/unclassified/xmms"
 
 #---------------------
diff --git a/media/video/ucview/ucview.mkbuild b/media/video/ucview/ucview.mkbuild
index fe62aa8..4cd62ea 100644
--- a/media/video/ucview/ucview.mkbuild
+++ b/media/video/ucview/ucview.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="media/video/ucview"
 
 #---------------------
diff --git a/net/analyzer/pktstat/pktstat.mkbuild b/net/analyzer/pktstat/pktstat.mkbuild
index 88b3806..5797313 100644
--- a/net/analyzer/pktstat/pktstat.mkbuild
+++ b/net/analyzer/pktstat/pktstat.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="net/analyzer/pktstat"
 
 #---------------------
diff --git a/net/im/pidgin/pidgin.mkbuild b/net/im/pidgin/pidgin.mkbuild
index 4842bbc..80317c4 100644
--- a/net/im/pidgin/pidgin.mkbuild
+++ b/net/im/pidgin/pidgin.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="net/im/pidgin"
 
 #---------------------
diff --git a/net/news/snownews/snownews.mkbuild b/net/news/snownews/snownews.mkbuild
index df61465..38238ff 100644
--- a/net/news/snownews/snownews.mkbuild
+++ b/net/news/snownews/snownews.mkbuild
@@ -36,7 +36,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="net/news/snownews"
 
 #---------------------
diff --git a/net/p2p/mldonkey/mldonkey.mkbuild b/net/p2p/mldonkey/mldonkey.mkbuild
index ce41f41..7d8614c 100644
--- a/net/p2p/mldonkey/mldonkey.mkbuild
+++ b/net/p2p/mldonkey/mldonkey.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="net/p2p/mldonkey"
 
 #---------------------
diff --git a/net/www/gnash/gnash.mkbuild b/net/www/gnash/gnash.mkbuild
index 828bcfd..208209a 100644
--- a/net/www/gnash/gnash.mkbuild
+++ b/net/www/gnash/gnash.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="net/www/gnash"
 
 #---------------------
diff --git a/patches/atk/atk.mkbuild b/patches/atk/atk.mkbuild
index 19efc32..573fd18 100644
--- a/patches/atk/atk.mkbuild
+++ b/patches/atk/atk.mkbuild
@@ -32,7 +32,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="dev/libs/atk"
 
 #---------------------
diff --git a/patches/glib2/glib2.mkbuild b/patches/glib2/glib2.mkbuild
index 48e6c96..b8769e2 100644
--- a/patches/glib2/glib2.mkbuild
+++ b/patches/glib2/glib2.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="patches/glib2"
 
 #---------------------
diff --git a/sci/libs/gsl/gsl.mkbuild b/sci/libs/gsl/gsl.mkbuild
index a7e35f2..e4783f9 100644
--- a/sci/libs/gsl/gsl.mkbuild
+++ b/sci/libs/gsl/gsl.mkbuild
@@ -85,7 +85,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="sci/libs/gsl"
 
 #---------------------
diff --git a/sci/mathematics/scilab/scilab.mkbuild b/sci/mathematics/scilab/scilab.mkbuild
index e0a3145..46ce71d 100644
--- a/sci/mathematics/scilab/scilab.mkbuild
+++ b/sci/mathematics/scilab/scilab.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="sci/mathematics/scilab"
 
 #---------------------
diff --git a/sys/apps/lshw/lshw.mkbuild b/sys/apps/lshw/lshw.mkbuild
index ff76fff..2736909 100644
--- a/sys/apps/lshw/lshw.mkbuild
+++ b/sys/apps/lshw/lshw.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="sys/apps/lshw"
 
 #---------------------
diff --git a/sys/libs/cracklib/cracklib.mkbuild b/sys/libs/cracklib/cracklib.mkbuild
index ec6f5cf..5e35297 100644
--- a/sys/libs/cracklib/cracklib.mkbuild
+++ b/sys/libs/cracklib/cracklib.mkbuild
@@ -34,8 +34,8 @@
 [[DOCUMENTATION FILES]]="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README README-DAWG README-LICENSE README-WORDS"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
-[[SLACKBUILD PATH]]="sys/libs/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
+[[SLACKBUILD PATH]]="sys/libs/$PKG_NAME"
 
 #---------------------
 # SlackBuild Sections
diff --git a/sys/libs/libfreebob/libfreebob.mkbuild b/sys/libs/libfreebob/libfreebob.mkbuild
index 3d8746d..cd2dac2 100644
--- a/sys/libs/libfreebob/libfreebob.mkbuild
+++ b/sys/libs/libfreebob/libfreebob.mkbuild
@@ -106,7 +106,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="sys/libs/libfreebob"
 
 #---------------------
diff --git a/www/apps/moin/moin.mkbuild b/www/apps/moin/moin.mkbuild
index bce3ffa..8a1aa16 100644
--- a/www/apps/moin/moin.mkbuild
+++ b/www/apps/moin/moin.mkbuild
@@ -69,7 +69,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="www/apps/moin"
 
 #---------------------
diff --git a/x11/libs/agg/agg.mkbuild b/x11/libs/agg/agg.mkbuild
index 2c14437..084fd03 100644
--- a/x11/libs/agg/agg.mkbuild
+++ b/x11/libs/agg/agg.mkbuild
@@ -110,7 +110,7 @@
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[PKG NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="x11/libs/agg"
 
 #---------------------
diff --git a/x11/libs/wxwidgets/wxWidgets.mkbuild b/x11/libs/wxwidgets/wxWidgets.mkbuild
index dd0ba19..6106801 100644
--- a/x11/libs/wxwidgets/wxWidgets.mkbuild
+++ b/x11/libs/wxwidgets/wxWidgets.mkbuild
@@ -36,7 +36,7 @@
 [[OTHER CONFIGURE ARGS]]="--enable-unicode --with-opengl"
 
 # SlackBuild PATH in Slack.Sarava tree
-#[[SLACKBUILD PATH]]="others/unclassified/[[NAME]]"
+#[[SLACKBUILD PATH]]="others/unclassified/$PKG_NAME"
 [[SLACKBUILD PATH]]="x11/libs/wxwidgets"
 
 #---------------------