3 files changed, 36 insertions, 5 deletions
diff --git a/misc/funny-manpages/funny-manpages.SlackBuild b/misc/funny-manpages/funny-manpages.SlackBuild
index 6f71ed08bef75..af84fdb9a6b1c 100644
--- a/misc/funny-manpages/funny-manpages.SlackBuild
+++ b/misc/funny-manpages/funny-manpages.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for funny-manpages
-# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,8 @@ VERSION=1.3.5
 SRC_VERSION=1.3
 DEB_VERSION=1.3-5
 
-
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -57,18 +56,24 @@ find . \
 patch -p1 < $CWD/${PRGNAM}_$DEB_VERSION.diff
 
 # Create the directories we need
-mkdir -p $PKG/usr/man/man{1,3,6}
+mkdir -p $PKG/usr/man/man{1,3,6,7}
 
 for manpage in $(echo *fun); do
     section=$(echo $manpage | awk -F. '{print $2}' | colrm 2 4)
     install -m 0644 $manpage $PKG/usr/man/man$section/$manpage
 done
 
+# Move date.1fun over to mansection 6. It is kinda screwing with upstream, 
+# but right now causes a conflict with the systems date(1)
 ( cd $PKG/usr/man/man1
   ln -sf grope.1fun egrope.1fun
   ln -sf grope.1fun fgrope.1fun
+  mv date.1fun ../man6/date.6fun
 )
 
+# Add custom noobfarm manpage. Thanks to Matt Hayes.
+install -m 0644 $CWD/noobfarm.7 $PKG/usr/man/man7/noobfarm.7fun
+
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/misc/funny-manpages/funny-manpages.info b/misc/funny-manpages/funny-manpages.info
index 42df2c4335516..d3504f34af058 100644
--- a/misc/funny-manpages/funny-manpages.info
+++ b/misc/funny-manpages/funny-manpages.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/f/funny-manpages/funny-manpa
 MD5SUM="bed1deef82218d42fb230a2176a11ed4"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/misc/funny-manpages/noobfarm.7 b/misc/funny-manpages/noobfarm.7
new file mode 100644
index 0000000000000..171b68d61e06a
--- /dev/null
+++ b/misc/funny-manpages/noobfarm.7
@@ -0,0 +1,26 @@
+.\" Noobfarm \- The Code
+.\" Contact noobfarm@noobfarm.org to correct errors or omissions. 
+.TH noobfarm 7 "27 March 2008" "1.0" "Noobfarm - The Code"
+.SH NAME
+Noobfarm \- The Code
+.SH SYNOPSIS
+.\" 
+Open a web browser and go to: http://noobfarm.org
+.SH EXAMPLES
+See above
+.SH DESCRIPTION
+IRC/everyday quotes site
+.SH OPTIONS
+None
+.SH BUGS
+No known bugs at this time. 
+Short of many noobs and users in the various IRC channels.
+.SH SEE ALSO
+pom(6)
+.SH AUTHOR
+.nf
+Matt Hayes, Martin Lefebvre, and Mark Walling.
+.fi
+.SH HISTORY
+2008 \- Written as an idea from users in ##slackware on freenode.
+       Basically see: http://noobfarm.org/?id=1123