diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2008-08-25 02:17:12 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2008-08-25 02:17:12 +0000 |
| commit | 63e7fe537346b1f59c31871698290a403d036516 (patch) | |
| tree | 3f9c7afcae8a9c5673d5625d10230503105653db /net-ftp/ncftp | |
| parent | Revision bump. Closes bug #230211. Thanks Cilly <cilly@cilly.mine.nu> for the... (diff) | |
| download | gentoo-2-63e7fe537346b1f59c31871698290a403d036516.tar.gz gentoo-2-63e7fe537346b1f59c31871698290a403d036516.tar.bz2 gentoo-2-63e7fe537346b1f59c31871698290a403d036516.zip | |
Do not install $D/ESTDIR.
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
Diffstat (limited to 'net-ftp/ncftp')
| -rw-r--r-- | net-ftp/ncftp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/ncftp/files/ncftp-3.2.2-build.patch | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog index bb246f97d0e6..4fa87e88a887 100644 --- a/net-ftp/ncftp/ChangeLog +++ b/net-ftp/ncftp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/ncftp # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.71 2008/08/24 17:33:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.72 2008/08/25 02:17:12 jer Exp $ + + 25 Aug 2008; Jeroen Roovers <jer@gentoo.org> + files/ncftp-3.2.2-build.patch: + Do not install $D/ESTDIR. 24 Aug 2008; Jeroen Roovers <jer@gentoo.org> files/ncftp-3.2.2-build.patch: diff --git a/net-ftp/ncftp/files/ncftp-3.2.2-build.patch b/net-ftp/ncftp/files/ncftp-3.2.2-build.patch index 83eca4381004..f6f8b4df0170 100644 --- a/net-ftp/ncftp/files/ncftp-3.2.2-build.patch +++ b/net-ftp/ncftp/files/ncftp-3.2.2-build.patch @@ -1,14 +1,18 @@ +The first change makes sure $D/ESTDIR isn't created. + The original build system assumes that in DESTDIR, a mandir (say, /usr/share/man) already exists. Using -p may not be compatible, but then again this is a Gentoo specific patch. -JeR ---- Makefile.in.orig 2008-08-24 18:59:47.000000000 +0200 -+++ Makefile.in 2008-08-24 19:01:45.000000000 +0200 -@@ -44,7 +44,7 @@ +--- Makefile.in.orig 2008-08-25 04:10:21.000000000 +0200 ++++ Makefile.in 2008-08-25 04:11:51.000000000 +0200 +@@ -43,8 +43,8 @@ + @( cd ./ncftp ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) @( 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)/man1" 2>/dev/null -@echo '..... Installing the programs .....' $(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp@EXEEXT@" |