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

5 files changed, 91 insertions, 113 deletions

diff --git a/app/dicts/babytrans/babytrans.mkbuild b/app/dicts/babytrans/babytrans.mkbuild
index 8236b6f..d9b8239 100644
--- a/app/dicts/babytrans/babytrans.mkbuild
+++ b/app/dicts/babytrans/babytrans.mkbuild
@@ -148,72 +148,62 @@ off: postinstall_script
 #>slackdesc
 babytrans: babytrans by Slack.Sarava
 babytrans:
-babytrans: BabyTrans is a graphical interface for the Babylon Translator dictionaries (available
-babytrans: under Windows). (More information: <http://www.babylon.com>)
-babytrans:
-babytrans: Copy the dictionary files from Babylon Translator either in the /usr/share/babytrans
-babytrans: directory or in another directory that you indicate in the configuration.
-babytrans:
+babytrans: BabyTrans is a graphical interface for the Babylon Translator
+babytrans: dictionaries (available under Windows). (More information:
+babytrans: <http://www.babylon.com>)
+babytrans: Copy the dictionary files from Babylon Translator either in the
+babytrans: /usr/share/babytrans directory or in another directory that you
+babytrans: indicate in the configuration.
 babytrans: The files to copy are:
 babytrans: - english.dic (common for all languages)
 babytrans: - Engto***.dic (with *** depending on the language)
 #<slackdesc
 
-#>make_package
-# Add assert.h include
-sed -i '/^#include "fred_sstream"/ { p; s/.*/#include <assert.h>/; }' src/main.cc
-# Compile
-make $NUMJOBS || exit $ERROR_MAKE
-#<make_package
-
-#>download_source
-# Dowload source if necessary
-SRC="[[SOURCE NAME CONSTRUCTION STRING]]"
-URL="[[DOWNLOAD FOLDER URL]]/$SRC"
-DIC_URL=ftp://ftp.ac-grenoble.fr/ge/languages/babylon_dict
-
-if [ ! -s "$SRC_DIR/$SRC" ] || ! [[DECOMPRESSOR]] [[DECOMPRESSOR TEST FLAG]] "$SRC_DIR/$SRC" 2> /dev/null; then
-  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
-fi
-
-# Get dictionaries
-DIC_LIST="EngtoDut.dic.gz EngtoEng.dic.gz EngtoFre.dic.gz 
-        EngtoGer.dic.gz EngtoHeb.dic.gz EngtoIta.dic.gz EngtoJpn.dic.gz 
-	EngtoPor.dic.gz EngtoSpa.dic.gz english.dic.gz english2.dic.gz"
-
-for i in $DIC_LIST; do
-    [ ! -e $SRC_DIR/$i ] && wget $DIC_URL/$i -P $SRC_DIR/
-done
-
-[ ! -e $SRC_DIR/dictionary ] && wget $DIC_URL/dictionary -P $SRC_DIR/
-#<download_source
-
-#>install_package
-# Install
-make install DESTDIR="$PKG" || exit $ERROR_INSTALL
-
-mkdir -p $PKG/usr/local/lib/babytrans
-mkdir -p $PKG/usr/share/babytrans
-mkdir -p $PKG/usr/share/applications
-rm -rf $PKG/usr/share/applets
-
-cp $SRC_DIR/*.dic.gz $PKG/usr/local/lib/babytrans/
-cp $SRC_DIR/dictionary $PKG/usr/share/babytrans/
-
-gunzip $PKG/usr/local/lib/babytrans/*.gz
-
-cat << KDE_DESK > $PKG/usr/share/applications/babytrans.desktop
-[Desktop Entry]
-Comment=An interface for babylon translator
-Categories=Education;Languages;
-Exec=babytrans --activate-goad-server babytrans
-GenericName=Babytrans
-Icon=kbabel
-Name=Babytrans
-StartupNotify=true
-Terminal=False
-Type=Application
-X-KDE-SubstituteUID=false
-KDE_DESK
-
-#<install_package
+#p>
+ URL="[[DOWNLOAD FOLDER URL]]/$SRC"
++DIC_URL=ftp://ftp.ac-grenoble.fr/ge/languages/babylon_dict
+===
+   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+ fi
++
++# Get dictionaries
++DIC_LIST="EngtoDut.dic.gz EngtoEng.dic.gz EngtoFre.dic.gz 
++        EngtoGer.dic.gz EngtoHeb.dic.gz EngtoIta.dic.gz EngtoJpn.dic.gz 
++        EngtoPor.dic.gz EngtoSpa.dic.gz english.dic.gz english2.dic.gz"
++
++for i in $DIC_LIST; do
++    [ ! -e $SRC_DIR/$i ] && wget $DIC_URL/$i -P $SRC_DIR/
++done
++
++[ ! -e $SRC_DIR/dictionary ] && wget $DIC_URL/dictionary -P $SRC_DIR/
+===
+ <make_package> off
++# Add assert.h include
++sed -i '/^#include "fred_sstream"/ { p; s/.*/#include <assert.h>/; }' src/main.cc
+===
+ make install DESTDIR="$PKG" || exit $ERROR_INSTALL
++
++mkdir -p $PKG/usr/local/lib/babytrans
++mkdir -p $PKG/usr/share/babytrans
++mkdir -p $PKG/usr/share/applications
++rm -rf $PKG/usr/share/applets
++
++cp $SRC_DIR/*.dic.gz $PKG/usr/local/lib/babytrans/
++cp $SRC_DIR/dictionary $PKG/usr/share/babytrans/
++
++gunzip $PKG/usr/local/lib/babytrans/*.gz
++
++cat << KDE_DESK > $PKG/usr/share/applications/babytrans.desktop
++[Desktop Entry]
++Comment=An interface for babylon translator
++Categories=Education;Languages;
++Exec=babytrans --activate-goad-server babytrans
++GenericName=Babytrans
++Icon=kbabel
++Name=Babytrans
++StartupNotify=true
++Terminal=False
++Type=Application
++X-KDE-SubstituteUID=false
++KDE_DESK
+#p<
diff --git a/app/doc/xmltoman/xmltoman.mkbuild b/app/doc/xmltoman/xmltoman.mkbuild
index 9321ec8..0c76290 100644
--- a/app/doc/xmltoman/xmltoman.mkbuild
+++ b/app/doc/xmltoman/xmltoman.mkbuild
@@ -120,7 +120,7 @@ off: gpg_signature_check
  on: patch_source
 off: configure
  on: make_package
-off: install_package
+ on: install_package
  on: strip_binaries
 off: compress_manpages
 off: compress_info_files
@@ -148,10 +148,14 @@ xmltoman:
 xmltoman:
 #<slackdesc
 
-#>make_package
-# Buils package
-make PREFIX=$PREFIX
-
-# Install package
-make install PREFIX=$PKG/usr
-#<make_package
+#p>
+ <make_package> off
+ # Compile
+-make $NUMJOBS || exit $ERROR_MAKE
++make PREFIX=$PREFIX || exit $ERROR_MAKE
+===
+ <install_package> off
+ # Install
+-make install DESTDIR="$PKG" || exit $ERROR_INSTALL
++make install PREFIX=$PKG/usr  || exit $ERROR_INSTALL
+#p<
diff --git a/app/emulation/wine/wine.mkbuild b/app/emulation/wine/wine.mkbuild
index 2d5db7a..daff0c9 100644
--- a/app/emulation/wine/wine.mkbuild
+++ b/app/emulation/wine/wine.mkbuild
@@ -17,7 +17,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://ibiblio.org/pub/linux/system/emulators/wine/wine-0.9.50.tar.bz2"
+[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/wine/wine-0.9.53.tar.bz2"
 
 # Source base name. if different from package name. Null ("") to default value.
 # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
@@ -158,27 +158,11 @@ wine: executables.
 wine:
 #<slackdesc
 
-#>slkflags
-# Set system libraries' path and optmization flags based on $ARCH
-LIBDIR="$PREFIX/lib"
-
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIR="$PREFIX/lib64"
-  CONF_OPTIONS="$CONF_OPTIONS --enable-win64"
-fi
-#<slkflags
-
-#>make_package
-# Compile
-make depend || exit $ERROR_MAKE
-make $NUMJOBS || exit $ERROR_MAKE
-#</make_package
+#p>
+   LIBDIR="$PREFIX/lib64"
++  CONF_OPTIONS="$CONF_OPTIONS --enable-win64"
+===
+ <make_package> off
+ # Compile
++make depend || exit $ERROR_MAKE
+#p<
diff --git a/app/misc/wine-doors/wine-doors.mkbuild b/app/misc/wine-doors/wine-doors.mkbuild
index f507654..7027d42 100644
--- a/app/misc/wine-doors/wine-doors.mkbuild
+++ b/app/misc/wine-doors/wine-doors.mkbuild
@@ -148,15 +148,15 @@ off: postinstall_script
 #>slackdesc
 wine-doors: wine-doors by Slack.Sarava
 wine-doors:
-wine-doors: Wine-doors is an application designed to make installing windows software on Linux,
-wine-doors: Solaris or other Unix systems easier. Wine-doors is essentially a package management
-wine-doors: tool for windows software on Linux systems. Most Linux desktop users are familiar
-wine-doors: with package management style application delivery, so it made sense to apply this
-wine-doors: model to windows software.
-wine-doors:
-wine-doors: Wine-doors works by leveraging the exquisite software, libraries and tools created
-wine-doors: over at WineHQ, there are also plans to support Cedega, cvscedega and Crossover
-wine-doors: Office.
+wine-doors: Wine-doors is an application designed to make installing windows
+wine-doors: software on Linux, Solaris or other Unix systems easier. Wine-
+wine-doors: doors is essentially a package management tool for windows software
+wine-doors: on Linux systems. Most Linux desktop users are familiar with
+wine-doors: package management style application delivery, so it made sense to
+wine-doors: apply this model to windows software.
+wine-doors: Wine-doors works by leveraging the exquisite software, libraries
+wine-doors: and tools created over at WineHQ, there are also plans to support
+wine-doors: Cedega, cvscedega and Crossover Office.
 #<slackdesc
 
 #>install_package
diff --git a/app/text/scrollkeeper/scrollkeeper.mkbuild b/app/text/scrollkeeper/scrollkeeper.mkbuild
index d53b4bf..5e11570 100644
--- a/app/text/scrollkeeper/scrollkeeper.mkbuild
+++ b/app/text/scrollkeeper/scrollkeeper.mkbuild
@@ -148,13 +148,13 @@ off: postinstall_script
 #>slackdesc
 scrollkeeper: scrollkeeper by Slack.Sarava
 scrollkeeper:
-scrollkeeper: ScrollKeeper is a cataloging system for documentation on open systems. It manages
-scrollkeeper: documentation metadata (as specified by the Open Source Metadata Framework(OMF))
-scrollkeeper: and provides a simple API to allow help browsers to find, sort, and search the
-scrollkeeper: document catalog. It will also be able to communicate with catalog servers on the
-scrollkeeper: Net to search for documents which are not on the local system.
-scrollkeeper:
-scrollkeeper:
+scrollkeeper: ScrollKeeper is a cataloging system for documentation on open
+scrollkeeper: systems. It manages documentation metadata (as specified by the
+scrollkeeper: Open Source Metadata Framework(OMF)) and provides a simple API
+scrollkeeper: to allow help browsers to find, sort, and search the document
+scrollkeeper: catalog. It will also be able to communicate with catalog
+scrollkeeper: servers on the Net to search for documents which are not on the
+scrollkeeper: local system.
 scrollkeeper:
 scrollkeeper:
 #<slackdesc