mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- Convert somewhat cryptic sed(1) code to a patch, and get rid of the

Browse Source 
post-patch target altogether
- Remove seemingly useless include of <bsd.port.options.mk> while here
This commit is contained in:
Alexey Dokuchaev 2014-12-05 18:23:46 +00:00
parent 99cd9064df
commit c4e0a3a5b2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=374074
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ftp/gftp/Makefile
View File

@ -23,14 +23,4 @@ OPTIONS_SUB= yes
NLS_USES= gettext
NLS_CONFIGURE_OFF= --disable-nls
.include <bsd.port.options.mk>
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
s|"-lssl |& -lcrypto|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|size_t dest_len|size_t *dest_len|g ; \
s|\(gftp_filename_from_utf8 (gftp_request \* request,\) int force_local,|\1|' \
${WRKSRC}/lib/charset-conv.c
.include <bsd.port.mk>

38
ftp/gftp/files/patch-lib_charset-conv.c Normal file
View File

@ -0,0 +1,38 @@
--- lib/charset-conv.c.orig 2008-03-04 12:18:03 UTC
+++ lib/charset-conv.c
@@ -230,7 +230,7 @@ gftp_filename_from_utf8 (gftp_request *
#else
char *
-gftp_string_to_utf8 (gftp_request * request, const char *str, size_t dest_len)
+gftp_string_to_utf8 (gftp_request * request, const char *str, size_t *dest_len)
{
return (NULL);
}
@@ -238,22 +238,22 @@ gftp_string_to_utf8 (gftp_request * requ
char *
gftp_string_from_utf8 (gftp_request * request, int force_local, const char *str,
- size_t dest_len)
+ size_t *dest_len)
{
return (NULL);
}
char *
-gftp_filename_to_utf8 (gftp_request * request, const char *str, size_t dest_len)
+gftp_filename_to_utf8 (gftp_request * request, const char *str, size_t *dest_len)
{
return (NULL);
}
char *
-gftp_filename_from_utf8 (gftp_request * request, int force_local,
- const char *str, size_t dest_len)
+gftp_filename_from_utf8 (gftp_request * request,
+ const char *str, size_t *dest_len)
{
return (NULL);
}