4 files changed, 109 insertions, 17 deletions
diff --git a/network/aMule/README b/network/aMule/README
index 9212c36349..40d5479fa4 100644
--- a/network/aMule/README
+++ b/network/aMule/README
@@ -3,8 +3,21 @@ wxWidgets class library. It was originally forked from the xMule project,
 which in turn was forked from the lMule project. This is turn was the
 first fork of eMule to run nativly on Linux and other Unix-like systems.
 
-This requires wxGTK and cryptopp.
+This requires wxPython/wxGTK and cryptopp and optimunally libupnp
 
-It was reported that aMule doesn't work very well (or at all) with 
-cryptopp 5.6.0, so version 5.5.2 is recommended instead (you can build
-version 5.2.2 using the same build script for cryptopp-5.6.0).
+You can build optimal features of aMule with following variables;
+
+DAEMON=yes Creates amuled
+CMD=yes Creates commandline client
+WEBSERVER=yes Creates webserver for remote control
+ALC=yes Creates aLinkCreator GUI version
+ALCC=yes Creates aLinkCreator CLI version
+XAS=yes Installs xChat statistic plugin
+GEOIP=yes Builds with GeoIP library support (needs GeoIP)
+MMAP=yes Uses mmap
+OPTIMIZE=no Don't use code optimizations
+
+It was reported that aMule doesn't work very well (or at all) with
+cryptopp 5.6.0, if you notice SEGFAULTS at time of start then downgrade
+your cryptopp 5.2.2. You can use the build script at SBo with merely
+changing VERSION.
diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild
index 2eba27071b..64d87d98a7 100644
--- a/network/aMule/aMule.SlackBuild
+++ b/network/aMule/aMule.SlackBuild
@@ -2,18 +2,17 @@
 # Slackware build script for aMule
 # Written by Iskar Enev (<iskar.enev[@]gmail.com>)
 # Modified by the SlackBuilds.org project
+# Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmial.com
 
 PRGNAM=aMule
 VERSION=${VERSION:-2.2.6}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -37,6 +36,77 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DAEMON=${DAEMON:-no}
+CMD=${CMD:-no}
+WEBSERVER=${WEBSERVER:-no}
+ALC=${ALC:-no}
+ALCC=${ALCC:-no}
+XAS=${XAS:-no}
+GEOIP=${GEOIP:-no}
+MMAP=${MMAP:-no}
+OPTIMIZE=${OPTIMIZE:-yes}
+PLASMAMULE=${PLASMAMULE:-no}
+
+if [ "$DAEMON" = "yes" ]; then
+  AMULE_DAEMON="enable"
+else
+  AMULE_DAEMON="disable"
+fi
+
+if [ "$CMD" = "yes" ]; then
+  AMULE_CMD="enable"
+  else
+  AMULE_CMD="disable"
+fi
+
+if [ "$WEBSERVER" = "yes" ]; then
+  AMULE_WEBSERVER="enable"
+  else
+  AMULE_WEBSERVER="disable"
+fi
+
+if [ "$ALC" = "yes" ]; then
+  AMULE_ALC="enable"
+  else
+  AMULE_ALC="disable"
+fi
+
+if [ "$ALCC" = "yes" ]; then
+  AMULE_ALCC="enable"
+  else
+  AMULE_ALCC="disable"
+fi
+
+if [ "$XAS" = "yes" ]; then
+  AMULE_XAS="enable"
+  else
+  AMULE_XAS="disable"
+fi
+
+if  [ "$GEOIP" = "yes" ]; then
+  AMULE_GEOIP="enable"
+  else
+  AMULE_GEOIP="disable"
+fi
+
+if [ "$MMAP" = "yes" ]; then
+  AMULE_MMAP="enable"
+  else
+  AMULE_MMAP="disable"
+fi
+
+if [ "$OPTIMIZE" = "yes" ]; then
+  AMULE_OPTIMIZE="enable"
+  else
+  AMULE_OPTIMIZE="disable"
+fi
+
+if [ "$PLASMAMULE" = "yes" ]; then
+  AMULE_PLASMAMULE="enable"
+  else
+  AMULE_PLASMAMULE="disable"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -62,6 +132,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-wx-config=/usr/bin/wx-config \
   --disable-debug \
+  --$AMULE_DAEMON-amule-daemon \
+  --$AMULE_CMD-amulecmd \
+  --$AMULE_WEBSERVER-webserver \
+  --$AMULE_ALC-alc \
+  --$AMULE_ALCC-alcc \
+  --$AMULE_XAS-xas \
+  --$AMULE_GEOIP-geoip \
+  --$AMULE_MMAP-mmap \
+  --$AMULE_PLASMAMULE-plasmamule \
+  --$AMULE_OPTIMIZE-optimize \
   --build=$ARCH-slackware-linux
 
 make
@@ -70,14 +150,13 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/doc/$PRGNAM-$VERSION/* $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/doc/$PRGNAM-$VERSION $PKG/usr/share/doc
 
-# All of the needed docs are already installed; we'll just move them to the
-# correct location 
-mv $PKG/usr/share/doc $PKG/usr
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info
index 280a9978c9..fecbe7399a 100644
--- a/network/aMule/aMule.info
+++ b/network/aMule/aMule.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/amule/aMule-2.2.6.tar.bz2"
 MD5SUM="530d9b48187e36f78fc21bb19e94326d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Ozan Turkyilmaz"
-EMAIL="ozan.turkyilmaz@gmail.com"
-APPROVED="rworkman"
+MAINTAINER="Ozan Türkyılmaz"
+EMAIL="<ozan.turkyilmaz[@]gmail.com>"
+APPROVED="dsomero"
diff --git a/network/aMule/slack-desc b/network/aMule/slack-desc
index 04ee8ef471..51cb00197d 100644
--- a/network/aMule/slack-desc
+++ b/network/aMule/slack-desc
@@ -8,7 +8,7 @@
      |-----handy-ruler------------------------------------------------------|
 aMule: aMule (multiplatform ed2k client)
 aMule:
-aMule: aMule is a multiplatform ed2k client, fork of the eMule client, 
+aMule: aMule is a multiplatform ed2k client, fork of the eMule client,
 aMule: using the wxWidgets class library, supporting Linux, *BSD platforms,
 aMule: Solaris, *MacOSX and *Win32 (*soon). It was originally forked from
 aMule: the xMule project, which in turn was forked from the lMule project.