make sure we dont install bogus /ESTDIR dir #146372 by Lars (Polynomial-C)

Package-Manager: portage-2.1.1_rc1-r4

diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index c5d73b2550dde2816fecadf3e1d472467f344843..4fe8668b81aed064e77bff61c9f664efc0a5cdeb 100644 (file)
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -5,10 +5,10 @@ AUX ncftp-3.1.9-build.patch 1187 RMD160 9b0beb94e797145bdea2c54f268ceaa312dea5b8
 MD5 dca315d28a822cc3cfbf56e7312f1b53 files/ncftp-3.1.9-build.patch 1187
 RMD160 9b0beb94e797145bdea2c54f268ceaa312dea5b8 files/ncftp-3.1.9-build.patch 1187
 SHA256 4b3aeed9b6c29bd0f103d38a8c3eb482c7c8882917b8e616a27ae5107b926745 files/ncftp-3.1.9-build.patch 1187
-AUX ncftp-3.2.0-build.patch 1322 RMD160 4f359d64bb6daf4755430fea7a79d11662018123 SHA1 18e5fadfd1c5158000e575d4557018a5f870ad76 SHA256 f49bcbab6b0eb51d7a4a8077634dd2dee8fcd36d419a335cc13842d54239bd1b
-MD5 3cdc5daa970c26e6d72ed4c011ab3989 files/ncftp-3.2.0-build.patch 1322
-RMD160 4f359d64bb6daf4755430fea7a79d11662018123 files/ncftp-3.2.0-build.patch 1322
-SHA256 f49bcbab6b0eb51d7a4a8077634dd2dee8fcd36d419a335cc13842d54239bd1b files/ncftp-3.2.0-build.patch 1322
+AUX ncftp-3.2.0-build.patch 1384 RMD160 5ddd37e9cd3ede51aa79d2edd3bbc8e4ad66039b SHA1 27215d7972443f17e05883fe6535feb1e2ed4ae0 SHA256 cca7120ce04d5cc9325f2d9d84f0f1cd69e44dc64fd2216e6c0949e45661cf87
+MD5 ba69a4e2c441240fb13ba211a91c95ba files/ncftp-3.2.0-build.patch 1384
+RMD160 5ddd37e9cd3ede51aa79d2edd3bbc8e4ad66039b files/ncftp-3.2.0-build.patch 1384
+SHA256 cca7120ce04d5cc9325f2d9d84f0f1cd69e44dc64fd2216e6c0949e45661cf87 files/ncftp-3.2.0-build.patch 1384
 DIST ncftp-3.1.9-src.tar.bz2 409722 RMD160 b675d4d89b31480082476e53b970d99b95497249 SHA1 052be99800b740a50b31619ccd65fd4f082a3386 SHA256 b7ae2363f6b7cfb69e64a21c2edf3f9cf6fadc52606510bcc925668f6045c469
 DIST ncftp-3.1.9_editcmd.patch 9594 RMD160 d87f0c76e08ffe3452926c2d6db69490fd1c853a SHA1 a50fd1f144c77644c3eccb0e951d8f07ea482b67 SHA256 99f1213edf9eeb8c53f0560069b3dfcfc3c69123d78ab6f9326be028f7d8a68d
 DIST ncftp-3.2.0-src.tar.bz2 427962 RMD160 391dc307112f018647d3e2b9a8099a236972733c SHA1 708222170df81ed957e4f187213d69ea21e4f7dd SHA256 2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376
@@ -37,7 +37,7 @@ SHA256 4dbb3d2512abbae54236bfa781d697972ef328d886a321ce3e9982d314f8c2c9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+/40amhnQswr0vIRAquWAJ9XC1zi8OZrLwPZ/4XkjJj+qnDjhACffgX/
-X4vrAZPcLt7Cn9ZdDsZ3lXg=
-=7ARA
+iD8DBQFE/lNEamhnQswr0vIRAumjAKC+zMhOAkmu7GPudhp8wlsbRkdzggCggL89
+yoyYVj8AUQ4woXaMR3AmtFU=
+=l18F
 -----END PGP SIGNATURE-----

diff --git a/net-ftp/ncftp/files/ncftp-3.2.0-build.patch b/net-ftp/ncftp/files/ncftp-3.2.0-build.patch
index f917b8689d339e5ab95006f6dda6a42e1036562c..790ce1872efc1c61b749f30b0b51ce493fabc0ad 100644 (file)
--- a/net-ftp/ncftp/files/ncftp-3.2.0-build.patch
+++ b/net-ftp/ncftp/files/ncftp-3.2.0-build.patch
@@ -3,8 +3,9 @@
 @@ -44,7 +44,7 @@
        @( cd ./sh_util ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" )
        @( cd ./vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" )
-       -@test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null
+-      -@test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null
 -      -mkdir "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null
++      -@test -z "$(DESTDIR)" || mkdir -p "$(DESTDIR)" 2>/dev/null
 +      -mkdir -p "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null
        -@echo '..... Installing the programs .....'
        $(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp@EXEEXT@"