* Cleaner outpupt when building

radare · radare · commit ef774528a617 · 2011-12-21T01:36:49.000+01:00
* Added new packages:
  ImageMagic, graphviz, guile-2.0.3 libiconv libpcap, xz
  netcat, ngrep, php, proplib, readline-6.2, tcpdump, zlib

--HG--
rename : pkg/guile-2.0.0 =&gt; pkg/guile-2.0.3
rename : pkg/libpcap-1.1.1 =&gt; pkg/libpcap-1.2.0
rename : pkg/readline-6.1 =&gt; pkg/readline-6.2
rename : pkg/tcpdump-4.1.1 =&gt; pkg/tcpdump-4.2.0
rename : pkg/xz-5.0.2 =&gt; pkg/xz-5.0.3
diff --git a/TODO b/TODO
@@ -16,6 +16,7 @@ slpm
   - remove static libraries
   - remove development files
   - remove manpages
+  - strip binaries
 * TODO: rename all .*_executed as .*_done
 * Support to pass source pkgname with fullpath
   - Add support for other pkg repositories
diff --git a/pkg/ImageMagick-6.6.8-1 b/pkg/ImageMagick-6.6.8-1
diff --git a/pkg/ImageMagick-6.7.4-0 b/pkg/ImageMagick-6.7.4-0
@@ -0,0 +1,3 @@
+URL=http://www.imagemagick.org/download/ImageMagick-6.7.4-0.tar.xz
+TYPE=tar
+DESC="commandline image manipulation utilities"
diff --git a/pkg/graphviz-2.28.0 b/pkg/graphviz-2.28.0
@@ -0,0 +1,3 @@
+URL=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
+TYPE=tar
+DESC="GraphViz library and dot utilities"
diff --git a/pkg/guile-2.0.3 b/pkg/guile-2.0.3
@@ -1,4 +1,4 @@
-URL=http://ftp.gnu.org/pub/gnu/guile/guile-2.0.0.tar.gz
+URL=http://ftp.gnu.org/pub/gnu/guile/guile-2.0.3.tar.gz
 DEPS=libunistring
 DESC="GNU Scheme compiler and interpreter"
 #CFGARGS="--without-libunistring-prefix"
diff --git a/pkg/libiconv-1.13.1 b/pkg/libiconv-1.13.1
diff --git a/pkg/libiconv-1.14 b/pkg/libiconv-1.14
@@ -0,0 +1,3 @@
+URL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
+TYPE=tar
+DESC="GNU international charset conversion library"
diff --git a/pkg/libpcap-1.1.1 b/pkg/libpcap-1.1.1
diff --git a/pkg/libpcap-1.2.0 b/pkg/libpcap-1.2.0
@@ -0,0 +1,3 @@
+URL=http://www.tcpdump.org/release/libpcap-1.2.0.tar.gz
+TYPE=tar
+DESC="Network packet capture library"
diff --git a/pkg/netcat-0.7.1 b/pkg/netcat-0.7.1
@@ -0,0 +1,3 @@
+URL=http://kent.dl.sourceforge.net/project/netcat/netcat/0.7.1/netcat-0.7.1.tar.gz
+TYPE=tar
+DESC="GNU netcat tool"
diff --git a/pkg/ngrep-1.45 b/pkg/ngrep-1.45
@@ -0,0 +1,3 @@
+URL=http://netcologne.dl.sourceforge.net/project/ngrep/ngrep/1.45/ngrep-1.45.tar.bz2
+TYPE=tar
+DESC="network grep"
diff --git a/pkg/php-5.3.8 b/pkg/php-5.3.8
@@ -0,0 +1,4 @@
+URL=http://es.php.net/distributions/php-5.3.8.tar.bz2
+TYPE=tar
+DESC="PHP5 programming language"
+DEPS="libxml2 libiconv"
diff --git a/pkg/proplib-0.6.0 b/pkg/proplib-0.6.0
@@ -0,0 +1,3 @@
+URL=http://portableproplib.googlecode.com/files/proplib-0.6.0.tar.xz
+TYPE=tar
+DESC="portable prop library"
diff --git a/pkg/readline-6.1 b/pkg/readline-6.1
diff --git a/pkg/readline-6.2 b/pkg/readline-6.2
@@ -0,0 +1,3 @@
+URL=ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz
+TYPE=tar
+DESC="GNU Readline library"
diff --git a/pkg/tcpdump-4.2.0 b/pkg/tcpdump-4.2.0
@@ -1,4 +1,4 @@
-URL=http://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz
+URL=http://www.tcpdump.org/release/tcpdump-4.2.0.tar.gz
 TYPE=tar
 DESC="Network packet capture utility"
 DEPS=libpcap
diff --git a/pkg/xz-5.0.2 b/pkg/xz-5.0.2
diff --git a/pkg/xz-5.0.3 b/pkg/xz-5.0.3
@@ -0,0 +1,3 @@
+URL=http://tukaani.org/xz/xz-5.0.3.tar.bz2
+TYPE=tar
+DESC="xz compression tool"
diff --git a/pkg/zlib-1.2.5 b/pkg/zlib-1.2.5
@@ -0,0 +1,3 @@
+URL=http://zlib.net/zlib-1.2.5.tar.gz
+TYPE=tar
+DESC="zip library"
diff --git a/slpm b/slpm
@@ -154,14 +154,14 @@ pkg_update() {
 pkg_patch() {
   if [ -n "${PATCHES}" ]; then
     pushd ${WRKDIR}/${PKG}/${BASEDIR} > /dev/null
-    if [ -e .patch_executed ]; then
+    if [ -e .slpm_patch_done ]; then
       echo "=> Patches already applied."
     else
       echo "=> Patching ${PKG}.."
       for a in ${PATCHES} ; do
         patch -p1 < ${PTXDIR}/${a}.patch
       done
-      :> .patch_executed
+      :> .slpm_patch_done
     fi
     popd > /dev/null
   fi
@@ -170,12 +170,12 @@ pkg_patch() {
 pkg_unpatch() {
   if [ -n "${PATCHES}" ]; then
     pushd ${WRKDIR}/${PKG}/${BASEDIR} >/dev/null
-    if [ -e .patch_executed ]; then
+    if [ -e .slpm_patch_done ]; then
       echo "=> Unpatching ${PKG}.."
       for a in ${PATCHES} ; do
         patch -R -p1 < ${PTXDIR}/${a}.patch
       done
-      rm -f .patch_executed
+      rm -f .slpm_patch_done
     else
       echo "=> Patches already not applied."
     fi
@@ -314,7 +314,6 @@ pkg_register() {
   #PKGINSTALL_ARGS="DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} PREFIX=${PREFIX} prefix=${PREFIX} exec_prefix=${PREFIX}"
   PKGINSTALL_ARGS="PREFIX=/ DESTDIR=${WRKDIR}/.tmp/${PKG} prefix=/ exec_prefix=${PREFIX}"
   for a in ${PKGINSTALL_ARGS} ; do
-  	echo export ${a}
   	eval export ${a}
   done
   eval ${PKGINSTALL} ${PKGINSTALL_ARGS}
@@ -618,7 +617,7 @@ fi
   if [ "${DODEPS}" = 1 ]; then
     for DEP in ${DEPS}; do
       if [ -z "`echo $a | $igncmd`" ]; then
-        printf "=> Checking dependency $DEP"
+        echo "=> Checking dependency $DEP"
         slpm -l | grep ${DEP}
         if [ $? = 0 ]; then
           echo "=> OK"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+URL=http://www.imagemagick.org/download/ImageMagick-6.7.4-0.tar.xz`
	`2`	`+TYPE=tar`
	`3`	`+DESC="commandline image manipulation utilities"`