Date: Fri, 5 Dec 2014 18:23:47 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374074 - in head/ftp/gftp: . files Message-ID: <201412051823.sB5INlDZ064358@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Dec 5 18:23:46 2014 New Revision: 374074 URL: https://svnweb.freebsd.org/changeset/ports/374074 QAT: https://qat.redports.org/buildarchive/r374074/ Log: - Convert somewhat cryptic sed(1) code to a patch, and get rid of the post-patch target altogether - Remove seemingly useless include of <bsd.port.options.mk> while here Added: head/ftp/gftp/files/patch-lib_charset-conv.c (contents, props changed) Modified: head/ftp/gftp/Makefile Modified: head/ftp/gftp/Makefile ============================================================================== --- head/ftp/gftp/Makefile Fri Dec 5 18:16:11 2014 (r374073) +++ head/ftp/gftp/Makefile Fri Dec 5 18:23:46 2014 (r374074) @@ -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> Added: head/ftp/gftp/files/patch-lib_charset-conv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/gftp/files/patch-lib_charset-conv.c Fri Dec 5 18:23:46 2014 (r374074) @@ -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); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412051823.sB5INlDZ064358>