diff options
author | Jeroen Roovers <jer@gentoo.org> | 2012-03-16 16:48:39 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2012-03-16 16:48:39 +0000 |
commit | fb9f2fc03d44560bea470037ad43255cdc95a90b (patch) | |
tree | ae2a0eddcca466e3e3198f03fd3378090b1f2e64 /net-ftp/pftpfxp | |
parent | Dependency on polygon:2 only (diff) | |
download | historical-fb9f2fc03d44560bea470037ad43255cdc95a90b.tar.gz historical-fb9f2fc03d44560bea470037ad43255cdc95a90b.tar.bz2 historical-fb9f2fc03d44560bea470037ad43255cdc95a90b.zip |
Fix bug #408231. Set RDEPEND. Move preparation stuff to src_prepare(). Respect LDFLAGS. Remove old patches. Do not automagically compile against dev-libs/openssl.
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'net-ftp/pftpfxp')
-rw-r--r-- | net-ftp/pftpfxp/ChangeLog | 13 | ||||
-rw-r--r-- | net-ftp/pftpfxp/Manifest | 16 | ||||
-rw-r--r-- | net-ftp/pftpfxp/files/0.11.4.6-correct_bookmark_path.patch | 136 | ||||
-rw-r--r-- | net-ftp/pftpfxp/files/0.11.4.6-correct_config_fix.patch | 94 | ||||
-rw-r--r-- | net-ftp/pftpfxp/files/0.11.4.6-gcc3.4.fix | 13 | ||||
-rw-r--r-- | net-ftp/pftpfxp/files/1.11-gcc43.patch | 4 | ||||
-rw-r--r-- | net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch | 93 | ||||
-rw-r--r-- | net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild (renamed from net-ftp/pftpfxp/pftpfxp-1.12.ebuild) | 38 |
8 files changed, 46 insertions, 361 deletions
diff --git a/net-ftp/pftpfxp/ChangeLog b/net-ftp/pftpfxp/ChangeLog index d754e56050c6..2b60ea037fc6 100644 --- a/net-ftp/pftpfxp/ChangeLog +++ b/net-ftp/pftpfxp/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-ftp/pftpfxp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.16 2012/03/03 19:38:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.17 2012/03/16 16:48:38 jer Exp $ + +*pftpfxp-1.12-r1 (16 Mar 2012) + + 16 Mar 2012; Jeroen Roovers <jer@gentoo.org> + -files/0.11.4.6-correct_bookmark_path.patch, + -files/0.11.4.6-correct_config_fix.patch, -files/0.11.4.6-gcc3.4.fix, + -files/pftpfxp-v0.11.4mew6-pret.patch, files/1.11-gcc43.patch, + -pftpfxp-1.12.ebuild, +pftpfxp-1.12-r1.ebuild: + Fix bug #408231. Set RDEPEND. Move preparation stuff to src_prepare(). + Respect LDFLAGS. Remove old patches. Do not automagically compile against + dev-libs/openssl. *pftpfxp-1.12 (03 Mar 2012) diff --git a/net-ftp/pftpfxp/Manifest b/net-ftp/pftpfxp/Manifest index c85007d38dcb..7162aa5b4b3f 100644 --- a/net-ftp/pftpfxp/Manifest +++ b/net-ftp/pftpfxp/Manifest @@ -1,19 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 0.11.4.6-correct_bookmark_path.patch 4188 RMD160 c80f2cfb3ccd497ff4eb5fb1dbff8c10f97b38c4 SHA1 82954335f0d0ed894110496f457583741ba16476 SHA256 3cf45197a50d68a2bbc0628f9f6c4413ec39ad5a0dedf3a5c7ba12c0bdd69a25 -AUX 0.11.4.6-correct_config_fix.patch 3627 RMD160 abdc33a659ca21b73fdede3ceb5d851c2dc20617 SHA1 a6863c2e625ded0b7f79868752aa28e773dfde2a SHA256 1ff39aedb3b7bba0fb3e76b9786dde4b24dd7ae8d28d588206012abe9ec17fa9 -AUX 0.11.4.6-gcc3.4.fix 505 RMD160 594f4126145c4ac2cdaeb0668e6ed038542b2654 SHA1 45797d787d09d10f428ec8bada32375d403d6d25 SHA256 e38b89ec2484a5dc3c39947b5daac9751f2ee1ab4b5bb84d56a1e34aeaebe4d9 -AUX 1.11-gcc43.patch 396 RMD160 58a875e66d4583aa8c33dce28ce4ec2cede2f030 SHA1 4eec4c144c22c6d70bc81b24c88b64c374729eec SHA256 730319ee6f2b011d8760878a99e314ef096a8cd3e6679b81d05fdda8d46f4255 -AUX pftpfxp-v0.11.4mew6-pret.patch 3559 RMD160 b4321eadfb2f1283ee9b99a234fbb635829aea02 SHA1 85dd4918600438b155ea4c1dd264614ee46cb0fb SHA256 ba74c7a64c3904961a3ed47e711f1bd6960315b2b3b8ecf83a3480d500ed9309 +AUX 1.11-gcc43.patch 328 RMD160 4492e0fd4635c752fc76e052a88e8a4781def431 SHA1 fde7469a4ce41ec9a5ee2f95589a56ff187fda59 SHA256 d2be9b44d970edfff827e20e2a5eb5924e9aca92d6af4eea90334ab303e019cb DIST pftp-shit.v.1.12.zip 155058 RMD160 694ab76126739cc7f611a0b4e604c9f1f8408b21 SHA1 f7b9c65c25ca0763453be23a35bf904318664d18 SHA256 b3448093b9a967490a2f25c5921881e22403887dcf66e17cd86383e299f0c15c -EBUILD pftpfxp-1.12.ebuild 1332 RMD160 b4e1cbda7a6fc5afe2f5b5cf625116d7683a0dcd SHA1 074824bea1673a26868bdce447a58c35893f4e42 SHA256 b68b2acd8d7c10d60032238bd201a058fbc581a98913413b4b29880595067077 -MISC ChangeLog 2909 RMD160 f5de21a1b5e88e4dc84a73806c09ea2fce480daa SHA1 ce4f8afa509ad21536be35f2386c5d48e85d0edb SHA256 fbaf13685c05013e34eb8070ffbfea575d93a8b00a06b296cdb63a902ae7476c +EBUILD pftpfxp-1.12-r1.ebuild 1614 RMD160 3724ffb2699cd7023b9af92348c62fedc95fa5a9 SHA1 7a8a660d628e43b043c54a733595367a0ba294a9 SHA256 01caf2d8ed8a497c62a8cb3d1f81773f50fe5daca44cccd26170a94bacf56c35 +MISC ChangeLog 3389 RMD160 3e141ee593f8f5d6e78ab599c19d4ae45fde8d61 SHA1 311c9edd36c6d0d4a43bf47a0fd773c1f965fdf2 SHA256 027a6641feee11b0ebd3119a5475a3e46fa8af90045058ab5fd1d1c381622806 MISC metadata.xml 248 RMD160 55f25ec59877ec3627fa4aaa346a61eacf403cad SHA1 3e7cd001b0c0005e3a86cb73d8ce32c2ad50d2fe SHA256 7404eee9a4427538674065b37d113a6531546b1126da727a21b6dbae1926bf98 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk9Sc0sACgkQCaWpQKGI+9SMMgCePO55F7rv1qK4g6BL1QG4hKCm -bxsAn2esJAk8DSKW7KMNtVmy/mVRaSil -=0iwC +iEYEARECAAYFAk9jbvAACgkQVWmRsqeSphOP+wCcCmycWr+mxSRhjafLJg9tQDo2 +RicAnAzFCeabPvev+yT3/jMSeMlq1Rkg +=0Kg5 -----END PGP SIGNATURE----- diff --git a/net-ftp/pftpfxp/files/0.11.4.6-correct_bookmark_path.patch b/net-ftp/pftpfxp/files/0.11.4.6-correct_bookmark_path.patch deleted file mode 100644 index e63d656cbf83..000000000000 --- a/net-ftp/pftpfxp/files/0.11.4.6-correct_bookmark_path.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -Naur old/pftpfxp-mew/include/defines.h new/pftpfxp-mew/include/defines.h ---- old/pftpfxp-mew/include/defines.h 2006-07-28 08:55:08.000000000 +0200 -+++ new/pftpfxp-mew/include/defines.h 2006-07-28 08:57:28.000000000 +0200 -@@ -209,9 +209,6 @@ - - #define PASSWORD_SIZE 60 - --#define BOOKMARK_RC ".pftp/bookmarks" --#define BOOKMARK_RC_BAK ".pftp/bookmarks.bak" -- - #define DEFAULT_OKAY "[ okay ]" - - #define PASS_MAGIC ",.,-.%$&%2.--,.-jio433-:52.-$:-.1hinui#+43+.5230.9401431.-54,.-fdioru892032" -diff -Naur old/pftpfxp-mew/src/bookmark.cc new/pftpfxp-mew/src/bookmark.cc ---- old/pftpfxp-mew/src/bookmark.cc 2006-07-28 08:55:08.000000000 +0200 -+++ new/pftpfxp-mew/src/bookmark.cc 2006-07-28 17:16:32.000000000 +0200 -@@ -23,15 +23,38 @@ - char *line = new(char[2048]), *enc = new(char[4096]); - BOOKMARK *bm_temp = global_bookmark; - char tempcwd[SERVER_WORKINGDIR_SIZE]; -+ char *home_directory; -+ char *bookmark_file; -+ char *bookmark_file_bak; -+ int n; -+ -+ home_directory = getenv("HOME"); -+ n = strlen(home_directory) + sizeof("/.pftp/bookmarks") + 1; -+ -+ if ((bookmark_file=(char*)malloc(n))==NULL) { -+ fprintf(stderr,"error allocating memory\n"); -+ exit( -1); -+ } -+ -+ sprintf(bookmark_file, "%s/.pftp/bookmarks", home_directory); -+ -+ n = strlen(home_directory) + sizeof("/.pftp/bookmarks.bak") + 1; -+ if ((bookmark_file_bak=(char*)malloc(n))==NULL) { -+ fprintf(stderr,"error allocating memory\n"); -+ exit( -1); -+ } -+ -+ sprintf(bookmark_file_bak, "%s/.pftp/bookmarks.bak", home_directory); - - getcwd(tempcwd, SERVER_WORKINGDIR_SIZE); - chdir(startcwd); - - // backup old bookmark-file -- rename(BOOKMARK_RC, BOOKMARK_RC_BAK); -+ rename(bookmark_file, bookmark_file_bak); -+ free(bookmark_file_bak); - - pass_pos = 0; -- if ((file_out = fopen(BOOKMARK_RC, "w"))) { -+ if ((file_out = fopen(bookmark_file, "w"))) { - // put magic and version number - strcpy(line, PASS_MAGIC); - Encrypt(line, enc); -@@ -297,6 +320,7 @@ - delete[](line); - delete[](enc); - chdir(tempcwd); -+ free(bookmark_file); - } - - void CDisplayHandler::Decrypt(char *in, char *out) { -@@ -383,12 +407,25 @@ - char *line = new(char[4096]), *out = new(char[2048]); - BOOKMARK *bm_new, *bm_temp = NULL; - char tempcwd[SERVER_WORKINGDIR_SIZE]; -+ char *home_directory; -+ char *bookmark_file; -+ int n; - -+ pass_pos = 0; -+ home_directory = getenv("HOME"); -+ n = strlen(home_directory) + sizeof("/.pftp/bookmarks") + 1; -+ -+ if ((bookmark_file=(char*)malloc(n))==NULL) { -+ fprintf(stderr,"error allocating memory\n"); -+ exit( -1); -+ } -+ sprintf(bookmark_file, "%s/.pftp/bookmarks", home_directory); -+ - getcwd(tempcwd, SERVER_WORKINGDIR_SIZE); - chdir(startcwd); -- -- pass_pos = 0; -- if ((file_in = fopen(BOOKMARK_RC, "r"))) { -+ -+ if ((file_in = fopen(bookmark_file, "r"))) { -+ free(bookmark_file); - // check bookmark-id - fgets(line, 4095, file_in); - -@@ -2303,6 +2340,7 @@ - chdir(tempcwd); - return (TRUE); - } -+ free(bookmark_file); - delete[](line); - delete[](out); - chdir(tempcwd); -@@ -2313,11 +2351,24 @@ - FILE *file_probe; - char tempcwd[SERVER_WORKINGDIR_SIZE]; - char *line; -+ char *home_directory; -+ char *bookmark_file; -+ int n; -+ -+ home_directory = getenv("HOME"); -+ n = strlen(home_directory) + sizeof("/.pftp/bookmarks") + 1; -+ -+ if ((bookmark_file=(char*)malloc(n))==NULL) { -+ fprintf(stderr,"error allocating memory\n"); -+ exit( -1); -+ } -+ sprintf(bookmark_file, "%s/.pftp/bookmarks", home_directory); - - getcwd(tempcwd, SERVER_WORKINGDIR_SIZE); - chdir(startcwd); - -- if ((file_probe = fopen(BOOKMARK_RC, "r"))) { -+ if ((file_probe = fopen(bookmark_file, "r"))) { -+ free(bookmark_file); - // check bookmark-id - line = new(char[4096]); - fgets(line, 4095, file_probe); -@@ -2358,6 +2409,7 @@ - delete[](line); - return (1); - } else { -+ free(bookmark_file); - chdir(tempcwd); - return (2); - } diff --git a/net-ftp/pftpfxp/files/0.11.4.6-correct_config_fix.patch b/net-ftp/pftpfxp/files/0.11.4.6-correct_config_fix.patch deleted file mode 100644 index c5d4b6a589f8..000000000000 --- a/net-ftp/pftpfxp/files/0.11.4.6-correct_config_fix.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- pftpfxp-mew/src/main.cc.orig 2006-07-13 13:04:55.000000000 +1000 -+++ pftpfxp-mew/src/main.cc 2006-07-13 13:07:35.000000000 +1000 -@@ -547,7 +547,7 @@ - if ((*label != '\0') && (strlen(value) > 0)) { - if (!strcasecmp(label, "DEVICE")) { - if (!DetermineOwnIP(value)) { -- printf("unknown network device '%s', sorry.\n", -+ fprintf(stderr,"unknown network device '%s', sorry.\n", - value); - fclose(in_file); - return (FALSE); -@@ -705,7 +705,7 @@ - strcpy(sectionlabels[21], value); - //debuglog("section22: %s", sectionlabels[21]); - } else { -- printf("unknown label '%s' in configfile.\n", label); -+ fprintf(stderr,"unknown label '%s' in configfile.\n", label); - fclose(in_file); - return (FALSE); - } -@@ -1096,9 +1096,26 @@ - } - - int main(int argc, char **argv) { -- char msg[256], config_file[] = {".pftp/config"}, keymap_file[] = {".pftp/keymap"}; -+ char msg[256]; -+ char *home_directory; -+ char *config_file; -+ char *keymap_file; - int n; - -+ home_directory = getenv("HOME"); -+ n = strlen(home_directory) + sizeof("/.pftp/config") + 1; -+ if ((config_file=(char*)malloc(n))==NULL) { -+ fprintf(stderr,"error allocating memory\n"); -+ exit( -1); -+ } -+ if ((keymap_file=(char*)malloc(n))==NULL) { -+ free(config_file); -+ fprintf(stderr,"error allocating memory\n"); -+ exit( -1); -+ } -+ sprintf(config_file, "%s/.pftp/config", home_directory); -+ sprintf(keymap_file, "%s/.pftp/keymap", home_directory); -+ - pthread_mutex_init(&syscall_lock, NULL); - pthread_mutex_init(&sigwinch_lock, NULL); - -@@ -1137,35 +1154,39 @@ - getcwd(startcwd, SERVER_WORKINGDIR_SIZE); - - if (!ReadConfig(config_file)) { -- printf("error reading/parsing configfile '%s', bailing out.\n", config_file); -+ fprintf(stderr,"error reading/parsing configfile '%s', bailing out.\n", config_file); -+ free(config_file); - exit( -1); - } -+ free(config_file); - - unlinklog(); - - if (!ReadKeymap(keymap_file)) { -- printf("error reading/parsing keymapfile '%s', bailing out.\n", keymap_file); -+ fprintf(stderr,"error reading/parsing keymapfile '%s', bailing out.\n", keymap_file); -+ free(keymap_file); - exit( -1); - } -+ free(keymap_file); - debuglog("after keymap"); - - if (display->ProbeBookmarkRC() == 1) { -- printf("unknown or invalid bookmark file found, delete it\n"); -+ fprintf(stderr,"unknown or invalid bookmark file found, delete it\n"); - exit( -1); - } - - if (chdir(localdir) != 0) { -- printf("please specify a valid dir for the LOCALDIR label or comment it out\n"); -+ fprintf(stderr,"please specify a valid dir for the LOCALDIR label or comment it out\n"); - exit ( -1); - } - - if (!use_own_ip) { -- printf("you need to specify a network-device in the configfile.\n"); -+ fprintf(stderr,"you need to specify a network-device in the configfile.\n"); - exit( -1); - } - - if (!use_okay_dir) { -- printf("you need to specify a dir for the .okay and .error files in the configfile.\n"); -+ fprintf(stderr,"you need to specify a dir for the .okay and .error files in the configfile.\n"); - exit( -1); - } - diff --git a/net-ftp/pftpfxp/files/0.11.4.6-gcc3.4.fix b/net-ftp/pftpfxp/files/0.11.4.6-gcc3.4.fix deleted file mode 100644 index e2c68fb07e38..000000000000 --- a/net-ftp/pftpfxp/files/0.11.4.6-gcc3.4.fix +++ /dev/null @@ -1,13 +0,0 @@ ---- src/server.cc.orig 2004-11-26 17:32:26.750551888 +0930 -+++ src/server.cc 2004-11-26 17:41:14.500567672 +0930 -@@ -5357,8 +5357,8 @@ - finished = FALSE; - int f, d; - FILELIST **dir_list, **file_list; -- dir_list = new (FILELIST *)[dir_count]; -- file_list = new (FILELIST *)[file_count]; -+ dir_list = new FILELIST *[dir_count]; -+ file_list = new FILELIST *[file_count]; - - //make arrays for the sorting - fl_temp = this->internal_filelist; diff --git a/net-ftp/pftpfxp/files/1.11-gcc43.patch b/net-ftp/pftpfxp/files/1.11-gcc43.patch index d8a1c88cf419..f856429ab973 100644 --- a/net-ftp/pftpfxp/files/1.11-gcc43.patch +++ b/net-ftp/pftpfxp/files/1.11-gcc43.patch @@ -1,5 +1,5 @@ ---- src/tcp.cc 2003-11-08 23:00:00.000000000 +0000 -+++ src/tcp.cc 2009-03-11 22:26:49.000000000 +0000 +--- a/src/tcp.cc ++++ b/src/tcp.cc @@ -1176,7 +1176,7 @@ this->size = 0; diff --git a/net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch b/net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch deleted file mode 100644 index 161b929c55a4..000000000000 --- a/net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- pftpfxp-mew.orig/src/server.cc Sun Nov 9 20:51:19 2003 -+++ pftpfxp-mew/src/server.cc Wed Jun 9 10:59:21 2004 -@@ -3277,7 +3277,14 @@ - return (FALSE); - } - } else { -- if (!this->tcp.SendData("PASV\r\n")) { -+ sprintf(this->temp_string, "PRET RETR %s\r\n", file); -+ if (!this->tcp.SendData(this->temp_string)) { -+ this->error = E_CONTROL_RESET; -+ this->PostBusy(NULL); -+ return (FALSE); -+ } -+ this->tcp.WaitForMessage(); -+ if (!this->tcp.SendData("PASV\r\n")) { - this->error = E_CONTROL_RESET; - this->PostBusy(NULL); - return (FALSE); -@@ -3687,7 +3694,15 @@ - } - - if (fxpmethod == 0) { -- if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) { -+ sprintf(this->temp_string, "PRET RETR %s\r\n", file); -+ if (!this->tcp.SendData(this->temp_string)) { -+ this->error = E_CONTROL_RESET; -+ this->PostBusy(NULL); -+ dest->PostBusy(NULL); -+ return (FALSE); -+ } -+ this->tcp.WaitForMessage(); -+ if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) { - // dest & src support ssl and want ssl_fxp - // send CPSV, extract PORT info and post file, then wait (until DEST sent PORT and then STOR) - if (!this->tcp.SendData("CPSV\r\n")) { -@@ -3909,7 +3924,15 @@ - fxpmeth1: - if (fxpmethod == 1) { - debuglog("normal fxp rejected trying alternative method"); -- if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) { -+ sprintf(this->temp_string, "PRET STOR %s\r\n", file); -+ if (!dest->tcp.SendData(this->temp_string)) { -+ this->error = E_CONTROL_RESET; -+ this->PostBusy(NULL); -+ dest->PostBusy(NULL); -+ return (FALSE); -+ } -+ dest->tcp.WaitForMessage(); -+ if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) { - // dest & src support ssl and want ssl_fxp - // send CPSV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR) - if (!dest->tcp.SendData("CPSV\r\n")) { -@@ -3920,8 +3943,15 @@ - return (FALSE); - } - } else { -- // send PASV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR) -- if (!dest->tcp.SendData("PASV\r\n")) { -+ sprintf(this->temp_string, "PRET STOR %s\r\n", file); -+ if (!this->tcp.SendData(this->temp_string)) { -+ this->error = E_CONTROL_RESET; -+ this->PostBusy(NULL); -+ return (FALSE); -+ } -+ this->tcp.WaitForMessage(); -+ // send PASV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR) -+ if (!dest->tcp.SendData("PASV\r\n")) { - this->error = E_CONTROL_RESET; - this->PostBusy(NULL); - dest->PostBusy(NULL); -@@ -4080,7 +4110,7 @@ - } - } - //this->PostStatusFile(file, "RETR_OK", port_msg); // notify dest and GO! -- this->PostBusy("FXP>"); -+ this->PostBusy("FXP>"); - dest->PostBusy("FXP<"); - this->StartTime(); - dest->StartTime(); -@@ -4491,6 +4521,13 @@ - return (FALSE); - } - } else { /* PASV MODE */ -+ if(!this->tcp.SendData("PRET LIST\r\n")) { -+ this->error = E_CONTROL_RESET; -+ this->PostBusy(NULL); -+ return (FALSE); -+ } -+ this->tcp.WaitForMessage(); -+ - if (!this->tcp.SendData("PASV\r\n")) { - this->error = E_CONTROL_RESET; - this->PostBusy(NULL); diff --git a/net-ftp/pftpfxp/pftpfxp-1.12.ebuild b/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild index 378e19a9b93a..2edd6f003acd 100644 --- a/net-ftp/pftpfxp/pftpfxp-1.12.ebuild +++ b/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-1.12.ebuild,v 1.1 2012/03/03 19:38:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild,v 1.1 2012/03/16 16:48:38 jer Exp $ EAPI=4 inherit eutils toolchain-funcs @@ -17,29 +17,43 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="ssl" -DEPEND="app-arch/unzip - ssl? ( >=dev-libs/openssl-0.9.6c )" +RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )" +DEPEND=" + app-arch/unzip + ${RDEPEND} +" S=${WORKDIR}/${MY_P} src_prepare() { epatch "$FILESDIR/1.11-gcc43.patch" -} -src_configure() { + # do no strip + # look for the correct library (bug #408231) + sed -i configure \ + -e 's|[^D]*DO.*||g' \ + -e 's|libssl.a|libssl.so|g' \ + || die + #fix permissions of configure script chmod +x configure - # no stripping - sed -i -e 's/[^D]*DO.*//g' configure - sed -i -e 's/CPP/CXX/g' src/Makefile.in - #note: not a propper autoconf - ./configure || die "configure failed" + + # use CXX not CPP + # respect LDFLAGS + sed -i src/Makefile.in \ + -e 's/CPP/CXX/g' \ + -e 's|$(CXX) -o |$(CXX) $(GENTOO_LDFLAGS) -o |g' \ + || die +} + +src_configure() { + #note: not a proper autoconf + ./configure $(use ssl || echo --nossl) || die "configure failed" sed -i -e 's:$<:$(CPPFLAGS) $<:' -e 's/LINKFLAGS/LDFLAGS/g' src/Makefile } src_compile() { - tc-export CXX - emake + emake GENTOO_LDFLAGS="${LDFLAGS}" CXX=$(tc-getCXX) } src_install() { |