From aa8f85b209e6616e45f157c0a800582ea8121d8c Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Wed, 20 Jul 2005 15:44:05 +0000 Subject: [PATCH] - Add optional patch that changes smbclient invocation to match arguments that samba3 expects PR: ports/77015 Submitted by: Taik0 Approved by: maintainer timeout (5 months) --- net-im/linpopup/Makefile | 4 ++++ net-im/linpopup/files/extra-patch-samba3 | 12 ++++++++++++ net/linpopup/Makefile | 4 ++++ net/linpopup/files/extra-patch-samba3 | 12 ++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 net-im/linpopup/files/extra-patch-samba3 create mode 100644 net/linpopup/files/extra-patch-samba3 diff --git a/net-im/linpopup/Makefile b/net-im/linpopup/Makefile index befb32b651ce..4b5414dd4edb 100644 --- a/net-im/linpopup/Makefile +++ b/net-im/linpopup/Makefile @@ -25,6 +25,10 @@ USE_GNOME= gtk12 USE_X_PREFIX= yes USE_REINPLACE= yes +.if defined(WITH_SAMBA3) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-samba3 +.endif + post-patch: ${REINPLACE_CMD} -e "s#/doc/#/share/doc/#" ${WRKSRC}/Makefile diff --git a/net-im/linpopup/files/extra-patch-samba3 b/net-im/linpopup/files/extra-patch-samba3 new file mode 100644 index 000000000000..a172b6d1bb48 --- /dev/null +++ b/net-im/linpopup/files/extra-patch-samba3 @@ -0,0 +1,12 @@ +diff -ur send.c send.c +--- send.c Tue Mar 14 03:45:05 2000 ++++ send.c Wed Feb 2 17:05:46 2005 +@@ -92,7 +92,7 @@ + /* -- launch smbclient and read output from pipe -- */ + //sprintf (command_line, "( %s cat %s ) | smbclient -M \"%s\" -U \"%s\" -n \"%s\" \"%s\"", (MULTI_RECIPIENTS ? prefix : ""), temp_filename, head_text, user_rc.samba_username, user_rc.samba_nbiosname, user_rc.samba_misc); + +- sprintf (command_line, "( %s cat %s ) | smbclient -M \"%s\" -U \"%s\" -n \"%s\" \"%s\" 2>&1", (MULTI_RECIPIENTS ? prefix : ""), temp_filename, head_text, user_rc.samba_username, user_rc.samba_nbiosname, user_rc.samba_misc); ++ sprintf (command_line, "( %s cat %s ) | smbclient -M \"%s\" -U \"%s\" -n \"%s\" 2>&1", (MULTI_RECIPIENTS ? prefix : ""), temp_filename, head_text, user_rc.samba_username, user_rc.samba_nbiosname); + + + output = popen (command_line, "r"); diff --git a/net/linpopup/Makefile b/net/linpopup/Makefile index befb32b651ce..4b5414dd4edb 100644 --- a/net/linpopup/Makefile +++ b/net/linpopup/Makefile @@ -25,6 +25,10 @@ USE_GNOME= gtk12 USE_X_PREFIX= yes USE_REINPLACE= yes +.if defined(WITH_SAMBA3) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-samba3 +.endif + post-patch: ${REINPLACE_CMD} -e "s#/doc/#/share/doc/#" ${WRKSRC}/Makefile diff --git a/net/linpopup/files/extra-patch-samba3 b/net/linpopup/files/extra-patch-samba3 new file mode 100644 index 000000000000..a172b6d1bb48 --- /dev/null +++ b/net/linpopup/files/extra-patch-samba3 @@ -0,0 +1,12 @@ +diff -ur send.c send.c +--- send.c Tue Mar 14 03:45:05 2000 ++++ send.c Wed Feb 2 17:05:46 2005 +@@ -92,7 +92,7 @@ + /* -- launch smbclient and read output from pipe -- */ + //sprintf (command_line, "( %s cat %s ) | smbclient -M \"%s\" -U \"%s\" -n \"%s\" \"%s\"", (MULTI_RECIPIENTS ? prefix : ""), temp_filename, head_text, user_rc.samba_username, user_rc.samba_nbiosname, user_rc.samba_misc); + +- sprintf (command_line, "( %s cat %s ) | smbclient -M \"%s\" -U \"%s\" -n \"%s\" \"%s\" 2>&1", (MULTI_RECIPIENTS ? prefix : ""), temp_filename, head_text, user_rc.samba_username, user_rc.samba_nbiosname, user_rc.samba_misc); ++ sprintf (command_line, "( %s cat %s ) | smbclient -M \"%s\" -U \"%s\" -n \"%s\" 2>&1", (MULTI_RECIPIENTS ? prefix : ""), temp_filename, head_text, user_rc.samba_username, user_rc.samba_nbiosname); + + + output = popen (command_line, "r");