diff options
author | Johannes Winkelmann <jw@smts.ch> | 2006-03-16 20:34:16 +0000 |
---|---|---|
committer | Johannes Winkelmann <jw@smts.ch> | 2006-03-16 20:34:16 +0000 |
commit | 931cffe9ccb1f4a29d87e8225ebb6f140bbcd1d0 (patch) | |
tree | c37c63134249c8b1250b6a0a9fcb524ad576fed4 /prt-get | |
parent | ab0556237ac610afd2709888793a111b7eb606c5 (diff) | |
download | core-931cffe9ccb1f4a29d87e8225ebb6f140bbcd1d0.tar.gz core-931cffe9ccb1f4a29d87e8225ebb6f140bbcd1d0.tar.xz |
prt-get (2.2): fix upstream bugs
Diffstat (limited to 'prt-get')
-rw-r--r-- | prt-get/.footprint | 1 | ||||
-rw-r--r-- | prt-get/.md5sum | 1 | ||||
-rw-r--r-- | prt-get/Pkgfile | 8 | ||||
-rw-r--r-- | prt-get/prt-get-0.5.11-deptree-alias.diff | 25 |
4 files changed, 31 insertions, 4 deletions
diff --git a/prt-get/.footprint b/prt-get/.footprint index bb83bc58..2c505fe2 100644 --- a/prt-get/.footprint +++ b/prt-get/.footprint @@ -14,4 +14,3 @@ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/pkg/ -rw-r--r-- root/root var/lib/pkg/prt-get.aliases --rw-r--r-- root/root var/lib/pkg/prt-get.deplist diff --git a/prt-get/.md5sum b/prt-get/.md5sum index 4632d335..eb3b07a2 100644 --- a/prt-get/.md5sum +++ b/prt-get/.md5sum @@ -1,2 +1,3 @@ +cb47e392c3d0ee6042f68f48f2b36bca prt-get-0.5.11-deptree-alias.diff a9297b69ec9eacd555b291bc9ef50ad5 prt-get-0.5.11.tar.gz 2b1cec6ab2834ae7402b92f7bbd54d3b prt-get.conf diff --git a/prt-get/Pkgfile b/prt-get/Pkgfile index dc435140..26cca13a 100644 --- a/prt-get/Pkgfile +++ b/prt-get/Pkgfile @@ -4,15 +4,17 @@ name=prt-get version=0.5.11 -release=2 +release=3 source=(http://jw.tks6.net/files/crux/prt-get-$version.tar.gz \ - prt-get.conf) + prt-get.conf prt-get-0.5.11-deptree-alias.diff) build() { cd ${name}-${version} + patch -p1 < $SRC/prt-get-0.5.11-deptree-alias.diff ./configure --prefix=/usr make make DESTDIR=$PKG install - install -m 644 $SRC/prt-get.conf $PKG/etc/ + install -m 644 $SRC/prt-get.conf $PKG/etc/ + rm -r $PKG/var/lib/pkg/prt-get.deplist } diff --git a/prt-get/prt-get-0.5.11-deptree-alias.diff b/prt-get/prt-get-0.5.11-deptree-alias.diff new file mode 100644 index 00000000..4b6f09c1 --- /dev/null +++ b/prt-get/prt-get-0.5.11-deptree-alias.diff @@ -0,0 +1,25 @@ +--- prt-get-0.5.11/src/prtget.cpp 2005-06-01 22:33:43.000000000 +0200 ++++ prt-get-0.5.11.new/src/prtget.cpp 2006-03-15 10:07:38.000000000 +0100 +@@ -1786,8 +1785,11 @@ + list<string> deps; + StringHelper::split(package->dependencies(), ',', deps); + list<string>::iterator it = deps.begin(); ++ bool isAlias = false; ++ string aliasName = ""; ++ + for (; it != deps.end(); ++it) { +- if ( m_pkgDB->isInstalled( *it ) ) { ++ if ( m_pkgDB->isInstalled( *it, true, &isAlias, &aliasName ) ) { + cout << "[i] "; + } else { + cout << "[ ] "; +@@ -1796,6 +1798,9 @@ + cout << " "; + } + cout << *it; ++ if (isAlias) { ++ cout << " (provided by " << aliasName << ")"; ++ } + const Package* p = m_repo->getPackage( *it ); + if (p) { + if (p->dependencies().length() > 0) { |