prt-get: update to 5.18

diff --git a/prt-get/.md5sum b/prt-get/.md5sum
index 596a27a460749d6c001e12b1e0d316dd6614b8d1..74cc9e0fd7cd79fd6987e6feef38843782df3bf1 100644 (file)
--- a/prt-get/.md5sum
+++ b/prt-get/.md5sum
@@ -1,4 +1,4 @@
-d0b846b694d4aeeff5081360c8b23087  prt-get-5.16-printf_regex.diff
-83d41c0297e21383ed3e4f4f7530ca7c  prt-get-5.16.tar.gz
+d0abf2a28823f9527c36832d5cbb8257  prt-get-5.18.tar.gz
 4f6b710e4d2b18c70cfe5e4a593938b7  prt-get.aliases
 d3aa7a53c12af8ef2bca5c85e0e4f928  prt-get.conf
+b4eeea27244550754219801bcf29c5e3  prt-get.diff

diff --git a/prt-get/Pkgfile b/prt-get/Pkgfile
index 28cf592e922b9a1ef1c483efb4478ac148bbd4b6..cf26505af854f973bdc553274e28092d1b156dba 100644 (file)
--- a/prt-get/Pkgfile
+++ b/prt-get/Pkgfile
@@ -4,23 +4,22 @@
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 
 name=prt-get
-version=5.16
+version=5.18
 release=2
 source=(http://jw.smts.ch/files/crux/prt-get-$version.tar.gz
-       prt-get-$version-printf_regex.diff
-       prt-get.conf prt-get.aliases)
+       prt-get.conf prt-get.aliases prt-get.diff)
 
 build() {
   cd ${name}-${version}
-  patch -p1 -i $SRC/prt-get-$version-printf_regex.diff
+  patch -p1 -i $SRC/$name.diff
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --mandir=/usr/man
-make
-make DESTDIR=$PKG install
+  make
+  make DESTDIR=$PKG install
 
-install -m 644 $SRC/prt-get.conf $PKG/etc/
-install -D -m 644 $SRC/prt-get.aliases $PKG/var/lib/pkg/prt-get.aliases
+  install -m 644 $SRC/prt-get.conf $PKG/etc/
+  install -D -m 644 $SRC/prt-get.aliases $PKG/var/lib/pkg/prt-get.aliases
 }

diff --git a/prt-get/prt-get-5.16-printf_regex.diff b/prt-get/prt-get-5.16-printf_regex.diff
deleted file mode 100644 (file)
index 05bbc7c..0000000
--- a/prt-get/prt-get-5.16-printf_regex.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- prt-get-5.16.orig/src/prtget.cpp   2008-06-26 18:23:42.000000000 +0200
-+++ prt-get-5.16/src/prtget.cpp        2008-12-06 15:13:58.950402225 +0100
-@@ -1238,7 +1238,7 @@
-     assertExactArgCount(1);
- 
-     initRepo();
--    string filter = "*";
-+    string filter = m_parser->useRegex() ? "." : "*";
-     if ( m_parser->hasFilter() ) {
-         filter = m_parser->filter();
-     }

diff --git a/prt-get/prt-get.diff b/prt-get/prt-get.diff
new file mode 100644 (file)
index 0000000..f5412df
--- /dev/null
+++ b/prt-get/prt-get.diff
@@ -0,0 +1,13 @@
+diff --git a/src/installtransaction.cpp b/src/installtransaction.cpp
+index 849931a..70e5e37 100644
+--- a/src/installtransaction.cpp
++++ b/src/installtransaction.cpp
+@@ -658,5 +658,7 @@ string InstallTransaction::getPkgmkPackageDir()
+ 
+ string InstallTransaction::getPkgmkCompressionMode()
+ {
+-    return getPkgmkSetting("PKGMK_COMPRESSION_MODE");
++    string value = getPkgmkSetting("PKGMK_COMPRESSION_MODE");
++
++    return value.size() ? value : "gz";
+ }