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 | 02758e5d14dab02a9ce21222536866a196ffa87a (patch) | |
| tree | db700851436b69a3b2b73b5ac8280d7cc8d9c50c /net-ftp | |
| parent | Revision bump. Closes bug #230211. Thanks Cilly <cilly@cilly.mine.nu> for the... (diff) | |
| download | historical-02758e5d14dab02a9ce21222536866a196ffa87a.tar.gz historical-02758e5d14dab02a9ce21222536866a196ffa87a.tar.bz2 historical-02758e5d14dab02a9ce21222536866a196ffa87a.zip | |
Do not install $D/ESTDIR.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7-JeR i686
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/ncftp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/ncftp/Manifest | 4 | ||||
| -rw-r--r-- | net-ftp/ncftp/files/ncftp-3.2.2-build.patch | 12 |
3 files changed, 15 insertions, 7 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/Manifest b/net-ftp/ncftp/Manifest index a1eb880e0bc8..edc69d6f8533 100644 --- a/net-ftp/ncftp/Manifest +++ b/net-ftp/ncftp/Manifest @@ -1,10 +1,10 @@ AUX ncftp-3.2.1-build.patch 2769 RMD160 1767f7d934b485d3184493e37fdba4368e33befa SHA1 29361ad9d5e35ddb1f165bc01060bf6819622cfa SHA256 4fcb8d303dc7db269ce700cffcaa76943afbbd72361ac28029113a485887dfde -AUX ncftp-3.2.2-build.patch 951 RMD160 828f397cd17f0455d140560a65e2e0aef700c90e SHA1 e76d31eff09bf63db9bcc1a590a9d7f0e99a2c8c SHA256 2e8d91455ad97275abb53d9f35d4a8d27f075fc781ab6ef524f8af979096ba28 +AUX ncftp-3.2.2-build.patch 1125 RMD160 309385ec6ad129eeb46992a3381724369c32d0fb SHA1 151bf71b0e6f090fa639b2a0b81b7c2769ed5018 SHA256 387a674689f4401788448ee61ea722dbd046e6a6aef333f4084abe86de1bf84d DIST ncftp-3.2.1-src.tar.bz2 419122 RMD160 b56243d235dca2d49b317016fcdab77855aa5ac9 SHA1 6c1f19531ade7fbe19174aa48cf5940830ced7f7 SHA256 834375c760a826b953c783f56c5d72ef57f9b1450b9bb738fc00b7b1aab7dec7 DIST ncftp-3.2.2-src.tar.bz2 422824 RMD160 36e01e369abebe55836be504b3eb43ef3c12f42b SHA1 913df52ee99fee3e28728177ec8496325e82118f SHA256 c369e913bc7e9f0b0794e12ace714d211d00f80a7011d4ec1b4f90a6195df260 DIST ncftp-321-v6-20070822.diff.gz 37628 RMD160 7fd73d31ab41c4b45e65d5c8121bff007b3e9394 SHA1 044e41bfc4fa0acac9e59a69c26ccda1834acaf7 SHA256 89974a3f5ceede51a0baf60079e4dc011ce65b5529117af439dc6cb46a0ce963 DIST ncftp-322-v6-20080821.diff.gz 39856 RMD160 d82a99c82733f042f78c23ef3d13c67ad74c461d SHA1 002711ef230b7e55bce289a73402870e56d432a7 SHA256 e35028709f62eb4aa2cd7ae827b4134461f7ad995d6d360d5b78e3494df4e194 EBUILD ncftp-3.2.1.ebuild 1024 RMD160 ce4e3ecb1ff793cf6b2408ec1e73b1e0ea095622 SHA1 4f6318fe2459f7a3baec45c1dc9815e5a6c25349 SHA256 399c2bc90f687c1c5b1565134b96f6fa173df53aaf4159bbae7007347ec04fdb EBUILD ncftp-3.2.2.ebuild 1026 RMD160 453f088d3ab683141ba6b443634687964b12e83c SHA1 ac464ce0da126e9bef5b2ce656c90199455db267 SHA256 96b42a709baef3fb5259d8395f8a5d85956bd92aa9191d5f29feeed05fbf4203 -MISC ChangeLog 8804 RMD160 4b640aa097e3403b8c0873124e6793828ff88139 SHA1 a824b62d602ae0ca0626b49cb67bada23dc696e7 SHA256 7048997cc1b915a8452e0802e9ad5f3fc457c51a023b8a3f6642b20e21b08f7b +MISC ChangeLog 8913 RMD160 d6d02b0de7d6f77d39a93a448a578ea87ef3bc61 SHA1 c7390ff9eb1d0b03b5c6e630394fe7c643e64a4d SHA256 8296236f2f57f6d39c67180f895a653e9b292f5f899ebe09f978307294ddea4b MISC metadata.xml 712 RMD160 52a767f758cb937ccb366f47ae5907d6bcdb3ad3 SHA1 dfbfd7ea89cd094f84ec7e6d52752740aba52fa2 SHA256 1572d420deed521bf43bcda24c87973cf68f43566100ea8a9c4d3eb134e033ac 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@" |