diff options
| -rw-r--r-- | net-ftp/ncftp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/ncftp/Manifest | 30 | ||||
| -rw-r--r-- | net-ftp/ncftp/files/ncftp-3.1.9-build.patch | 8 | ||||
| -rw-r--r-- | net-ftp/ncftp/files/ncftp-3.2.0-build.patch | 47 |
4 files changed, 69 insertions, 22 deletions
diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog index ea28a2d4a53c..9e1a0e7c94b8 100644 --- a/net-ftp/ncftp/ChangeLog +++ b/net-ftp/ncftp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/ncftp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.50 2006/09/04 10:20:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.51 2006/09/14 02:16:37 vapier Exp $ + + 14 Sep 2006; Mike Frysinger <vapier@gentoo.org> + files/ncftp-3.1.9-build.patch, files/ncftp-3.2.0-build.patch: + Fix some parallel build issues #147371. 04 Sep 2006; Mike Frysinger <vapier@gentoo.org> +files/ncftp-3.1.9-build.patch, ncftp-3.1.9.ebuild: diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest index 4fe8668b81ae..75ed6fc8ff3b 100644 --- a/net-ftp/ncftp/Manifest +++ b/net-ftp/ncftp/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX ncftp-3.1.9-build.patch 1187 RMD160 9b0beb94e797145bdea2c54f268ceaa312dea5b8 SHA1 6dde2ad5466252cf74e80b7809b643f18f8877e1 SHA256 4b3aeed9b6c29bd0f103d38a8c3eb482c7c8882917b8e616a27ae5107b926745 -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 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 +AUX ncftp-3.1.9-build.patch 1215 RMD160 ddce7692375fa1583bb3cde393a6c830975d4028 SHA1 4fc6b2a3d6792080c335aef476dbd622da0f5d39 SHA256 14628b49bcf5636f2efc3060e29be2372c754d409c3631564a76f94bb24ff8d0 +MD5 7d2c44ff77907889b29015856b2326a7 files/ncftp-3.1.9-build.patch 1215 +RMD160 ddce7692375fa1583bb3cde393a6c830975d4028 files/ncftp-3.1.9-build.patch 1215 +SHA256 14628b49bcf5636f2efc3060e29be2372c754d409c3631564a76f94bb24ff8d0 files/ncftp-3.1.9-build.patch 1215 +AUX ncftp-3.2.0-build.patch 2587 RMD160 6dc38c6cf37d761de33aca58b7c03f30dd3105ec SHA1 538cd9099b1e28bb0831bfb8b7f8197c09b636ac SHA256 7d0859273a7d525eb0ad99a15aa50cbdbc9c15e6e45ceb085a688fdf7de906b0 +MD5 90f3ef21d8abe3c28d676927f812337c files/ncftp-3.2.0-build.patch 2587 +RMD160 6dc38c6cf37d761de33aca58b7c03f30dd3105ec files/ncftp-3.2.0-build.patch 2587 +SHA256 7d0859273a7d525eb0ad99a15aa50cbdbc9c15e6e45ceb085a688fdf7de906b0 files/ncftp-3.2.0-build.patch 2587 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 @@ -20,10 +20,10 @@ EBUILD ncftp-3.2.0.ebuild 831 RMD160 e39ab990e383ca96ec51df605c1057bbb52408df SH MD5 12f0b2dd110843726a1dd03f2585996a ncftp-3.2.0.ebuild 831 RMD160 e39ab990e383ca96ec51df605c1057bbb52408df ncftp-3.2.0.ebuild 831 SHA256 613b8953aaf7d03a07349fddddb73335a8a21f7ff20c5292e9a1a246ed4359b8 ncftp-3.2.0.ebuild 831 -MISC ChangeLog 6480 RMD160 963afc447f1672b0d40ed363b5c31ae37890e4af SHA1 bc3146fe3f7adbc8c63fbec851fb3ef7feab6525 SHA256 0261160351a6741eab40b60c11ff717f7fc944091ac7336340240f0e08c475e9 -MD5 a1b51c16c2dcbbec7130871323747945 ChangeLog 6480 -RMD160 963afc447f1672b0d40ed363b5c31ae37890e4af ChangeLog 6480 -SHA256 0261160351a6741eab40b60c11ff717f7fc944091ac7336340240f0e08c475e9 ChangeLog 6480 +MISC ChangeLog 6637 RMD160 4adb66b158f05ff8e077eed7c5063dfb817476b2 SHA1 2c4b9070c47bf969f3c10c364663d72fd7b6f834 SHA256 58b32d13ebaf2a929e0fd8ee1605ad706c16ec573449a44693d97548caf4137f +MD5 5020e13d010348d82a057e86a2199714 ChangeLog 6637 +RMD160 4adb66b158f05ff8e077eed7c5063dfb817476b2 ChangeLog 6637 +SHA256 58b32d13ebaf2a929e0fd8ee1605ad706c16ec573449a44693d97548caf4137f ChangeLog 6637 MISC metadata.xml 715 RMD160 f1e54f4b0b68fbcb9390213c39a278ab9b8ff692 SHA1 ed44ef860a8eab7cd177f7b729353428497d519e SHA256 d8a103b0d2727619f2e4ab345064e045cca7587884cbbc39c4208fd1424cb8da MD5 2f4035e2a68bf680d7e936f9f4676b0c metadata.xml 715 RMD160 f1e54f4b0b68fbcb9390213c39a278ab9b8ff692 metadata.xml 715 @@ -37,7 +37,7 @@ SHA256 4dbb3d2512abbae54236bfa781d697972ef328d886a321ce3e9982d314f8c2c9 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE/lNEamhnQswr0vIRAumjAKC+zMhOAkmu7GPudhp8wlsbRkdzggCggL89 -yoyYVj8AUQ4woXaMR3AmtFU= -=l18F +iD8DBQFFCLuQamhnQswr0vIRAixqAJ9e32N9akfVoay0qTvAOMjQOzXpkwCfbJ+w +zeo+nXaVv+EKjfv2jHiftb8= +=vpzN -----END PGP SIGNATURE----- diff --git a/net-ftp/ncftp/files/ncftp-3.1.9-build.patch b/net-ftp/ncftp/files/ncftp-3.1.9-build.patch index d6d45b9ab0dc..447c2ef4308d 100644 --- a/net-ftp/ncftp/files/ncftp-3.1.9-build.patch +++ b/net-ftp/ncftp/files/ncftp-3.1.9-build.patch @@ -16,8 +16,8 @@ http://bugs.gentoo.org/146214 +++ sio/pch.mk.gcc-gch @@ -1,5 +1,6 @@ syshdrs.h.gch: syshdrs.h sio.h usio.h -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@ +- $(CCDV)$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h ++ $(CCDV)$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@ + mv -f .tmp.$@ $@ PCH=syshdrs.h.gch @@ -35,8 +35,8 @@ http://bugs.gentoo.org/146214 +++ libncftp/pch.mk.gcc-gch @@ -1,5 +1,6 @@ syshdrs.h.gch: syshdrs.h ncftp.h ncftp_errno.h util.h ftp.h -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@ +- $(CCDV)$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h ++ $(CCDV)$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@ + mv -f .tmp.$@ $@ PCH=syshdrs.h.gch 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 790ce1872efc..c7909d20f484 100644 --- a/net-ftp/ncftp/files/ncftp-3.2.0-build.patch +++ b/net-ftp/ncftp/files/ncftp-3.2.0-build.patch @@ -1,5 +1,9 @@ ---- ncftp-3.2.0/Makefile.in -+++ ncftp-3.2.0/Makefile.in +Fix DESTDIR and parallel build bugs + +http://bugs.gentoo.org/147371 + +--- Makefile.in ++++ Makefile.in @@ -44,7 +44,7 @@ @( cd ./sh_util ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) @( cd ./vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) @@ -19,3 +23,42 @@ # # The visual programs are only built if a working Curses was found. # +--- sio/Makefile.in ++++ sio/Makefile.in +@@ -179,6 +179,7 @@ + SClose.o: SClose.c $(SYSHDRS_DEP) + SConnect.o: SConnect.c $(SYSHDRS_DEP) + SConnectByName.o: SConnectByName.c $(SYSHDRS_DEP) ++SError.o: SError.c $(SYSHDRS_DEP) + SNew.o: SNew.c $(SYSHDRS_DEP) + SRead.o: SRead.c $(SYSHDRS_DEP) + SReadline.o: SReadline.c $(SYSHDRS_DEP) +--- sio/pch.mk.gcc-gch ++++ sio/pch.mk.gcc-gch +@@ -1,5 +1,6 @@ + syshdrs.h.gch: syshdrs.h sio.h usio.h +- $(CCDV)$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h ++ $(CCDV)$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h -o .tmp.$@ ++ mv -f .tmp.$@ $@ + + PCH=syshdrs.h.gch + SYSHDRS_DEP=syshdrs.h.gch +--- libncftp/Makefile.in ++++ libncftp/Makefile.in +@@ -353,3 +353,6 @@ + + u_unmdtm.o: u_unmdtm.c $(SYSHDRS_DEP) + u_unmdtm.so: u_unmdtm.c $(SYSHDRS_DEP) ++ ++u_feat.o: u_feat.c $(SYSHDRS_DEP) ++u_feat.so: u_feat.c $(SYSHDRS_DEP) +--- libncftp/pch.mk.gcc-gch ++++ libncftp/pch.mk.gcc-gch +@@ -1,5 +1,6 @@ + syshdrs.h.gch: syshdrs.h ncftp.h ncftp_errno.h util.h ftp.h +- $(CCDV)$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h ++ $(CCDV)$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h -o .tmp.$@ ++ mv -f .tmp.$@ $@ + + PCH=syshdrs.h.gch + SYSHDRS_DEP=syshdrs.h.gch |