- Update to 2.3.2

Feature safe:	yes
This commit is contained in:
Jose Alonso Cardenas Marquez 2010-12-20 17:05:28 +00:00
parent 0651b55c98
commit 9cc5cbe610
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=266655
5 changed files with 4 additions and 74 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= msn
PORTVERSION= 2.3
PORTREVISION= 3
PORTVERSION= 2.3.2
CATEGORIES= net-im
MASTER_SITES= http://mor-pah.net/code/
PKGNAMEPREFIX= cli-
@ -24,6 +23,7 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
WRKSRC= ${WRKDIR}/climsn
SUB_FILES= pkg-message
PLIST_FILES= bin/cli-msn \
share/${PKGNAMEPREFIX}${PORTNAME}/msn.conf \

View file

@ -1,3 +1,2 @@
MD5 (CLI-MSN-2.3.tar.gz) = 8c573200138bf2bfc7765fce8a24d9f7
SHA256 (CLI-MSN-2.3.tar.gz) = 14e03aa250a3b2ef66b59adf594a38a30fa7b7ebefed3400f853e9ee95b4c6f6
SIZE (CLI-MSN-2.3.tar.gz) = 220402
SHA256 (CLI-MSN-2.3.2.tar.gz) = 1c14d333c9ed1745d707b85b50ed89037cd7e03160431c8f60ca364c1e8c641e
SIZE (CLI-MSN-2.3.2.tar.gz) = 227993

View file

@ -1,48 +0,0 @@
--- src/conf.c Mon Dec 19 16:25:35 2005
+++ src/conf.c Fri Mar 31 20:56:39 2006
@@ -6,6 +6,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include "headers/defs.h"
#include "headers/conf.h"
@@ -15,15 +16,35 @@
int ctr, tmp;
int flag = 0;
FILE *fp;
+ char *homedir;
char ch;
+ char home_directory[255];
char pre[255]; /* Temp Buffer for config lines */
char _confstr[MAX_NO_LINES][MAX_LINE_LENGTH]; /* Temp buffer for valid config lines */
+
+ homedir = getenv("HOME");
+ if (homedir == NULL)
+ {
+ homedir = getenv("USER");
+ if (homedir == NULL)
+ {
+ homedir = getenv("USERNAME");
+ if (homedir == NULL)
+ {
+ cli_msg( stderr, "Could not find user's home directory!\n" );
+ }
+ }
+ strcpy(home_directory,"/home/");
+ }
+
+ strcpy(home_directory,homedir);
+ strcat(home_directory,"/.msn/msn.conf");
- if ( (fp = fopen(CONF_LOCATION, "r")) != NULL ){
+ if ( (fp = fopen(home_directory, "r")) != NULL ){
cli_msg("Reading msn.conf...\n");
}
else {
- cli_msg("No config file found at: %s\n", CONF_LOCATION);
+ cli_msg("No config file found at: %s\n", home_directory);
cli_msg("Continuing with command line args and defaults\n");
return;
}

View file

@ -1,10 +0,0 @@
--- src/headers/defs.h Wed Jan 4 10:52:17 2006
+++ src/headers/defs.h Fri Mar 31 20:29:12 2006
@@ -1,7 +1,6 @@
#define VERSION "CLI-MSN-2.3"
#define MAX_LINE_LENGTH 255 /* Config File line length */
#define MAX_NO_LINES 5 /* Config File No. Lines */
-#define CONF_LOCATION "msn.conf" /* Default locality of msn.conf */
#define MAX_LIST_SIZE 150
#define MAX_ACCOUNT_LEN 130
#define MAX_NICK_LEN 130

View file

@ -1,11 +0,0 @@
--- src/tcp_sock.c 2006-04-19 12:13:21.000000000 -0800
+++ src/tcp_sock.c 2007-10-01 13:31:39.000000000 -0800
@@ -153,7 +153,6 @@
void tcp_sockdcon(int sock_num)
{
close((int) tcp_sock[sock_num]);
- (int) tcp_sock[sock_num] = 0;
}
/* Read Data Function (Data IN)*/
Common subdirectories: src.orig/windows and src/windows