diff options
| author | mat <mat@FreeBSD.org> | 2016-06-21 00:23:28 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2016-06-21 00:23:28 +0800 |
| commit | bc12b6beb26907f267f34c1f8598d120cabecbae (patch) | |
| tree | e83ee6693050a76e305a95a376451aa583df151e /net-im | |
| parent | 5616a93eb39854a280bacec86824bbec7824d5b3 (diff) | |
| download | freebsd-ports-gnome-bc12b6beb26907f267f34c1f8598d120cabecbae.tar.gz freebsd-ports-gnome-bc12b6beb26907f267f34c1f8598d120cabecbae.tar.zst freebsd-ports-gnome-bc12b6beb26907f267f34c1f8598d120cabecbae.zip | |
With the power of USES=dos2unix, get rid of most patches and files
with CRLF.
While there, run make makepatch, rename patches to use the new scheme,
and various fixes.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/mbpurple/Makefile | 3 | ||||
| -rw-r--r-- | net-im/mbpurple/files/patch-microblog_mb__net.c (renamed from net-im/mbpurple/files/patch-microblog__mb_net.c) | 34 |
2 files changed, 18 insertions, 19 deletions
diff --git a/net-im/mbpurple/Makefile b/net-im/mbpurple/Makefile index ce946fe6bf5e..6e4fc9406100 100644 --- a/net-im/mbpurple/Makefile +++ b/net-im/mbpurple/Makefile @@ -16,7 +16,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/pidgin:net-im/pidgin LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake pkgconfig +USES= dos2unix gmake pkgconfig +DOS2UNIX_GLOB= *.c MAKE_ARGS= PREFIX="${PREFIX}" LIBDIR="${PREFIX}/lib" \ PURPLE_DATAROOT_DIR="${PREFIX}/share" diff --git a/net-im/mbpurple/files/patch-microblog__mb_net.c b/net-im/mbpurple/files/patch-microblog_mb__net.c index 818c30cb2e7f..077b0f249c02 100644 --- a/net-im/mbpurple/files/patch-microblog__mb_net.c +++ b/net-im/mbpurple/files/patch-microblog_mb__net.c @@ -1,19 +1,17 @@ -diff --git a/microblog/mb_net.c b/microblog/mb_net.c -index 2752aba..962ac1f 100644 ---- microblog/mb_net.c +--- microblog/mb_net.c.orig 2016-06-20 15:55:29 UTC +++ microblog/mb_net.c -@@ -160,13 +160,13 @@ void mb_conn_fetch_url_cb(PurpleUtilFetchUrlData * url_data, gpointer user_data, - conn_data->fetch_url_data = NULL;
-
- if(error_message != NULL) {
-- mb_conn_data_free(conn_data);
- if(conn_data->handler) {
- retval = conn_data->handler(conn_data, conn_data->handler_data, error_message);
- }
- if(ma->gc != NULL) {
- purple_connection_error_reason(ma->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
- }
-+ mb_conn_data_free(conn_data);
- } else {
- mb_http_data_post_read(conn_data->response, url_text, len);
- if(conn_data->handler) {
+@@ -160,13 +160,13 @@ void mb_conn_fetch_url_cb(PurpleUtilFetc + conn_data->fetch_url_data = NULL; + + if(error_message != NULL) { +- mb_conn_data_free(conn_data); + if(conn_data->handler) { + retval = conn_data->handler(conn_data, conn_data->handler_data, error_message); + } + if(ma->gc != NULL) { + purple_connection_error_reason(ma->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message); + } ++ mb_conn_data_free(conn_data); + } else { + mb_http_data_post_read(conn_data->response, url_text, len); + if(conn_data->handler) { |