FreeBSD Bugzilla – Attachment 10809 Details for
Bug 21552
Update port: net/tintin++ to 1.5pl9
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 17.65 KB, created by
Park JongHwan
on 2000-09-26 05:40:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Park JongHwan
Created:
2000-09-26 05:40:01 UTC
Size:
17.65 KB
patch
obsolete
>diff -urN ../net/tintin++/Makefile tintin++/Makefile >--- ../net/tintin++/Makefile Tue Sep 26 07:04:51 2000 >+++ tintin++/Makefile Tue Sep 26 07:59:28 2000 >@@ -6,17 +6,14 @@ > # > > PORTNAME= tintin >-PORTVERSION= 1.5.6 >+PORTVERSION= 1.5.9 > CATEGORIES= net games >-MASTER_SITES= ftp://ftp.walrus.com/pub/avatar/clients/ \ >- ftp://ftp.cctpu.edu.ru/pub/comp/networking/mud/ \ >- ftp://iclub.nsu.ru/pub/mud/clients/tintin++/ >-DISTNAME= tintin++v1.5pl6 >-EXTRACT_SUFX= .tar.Z >+MASTER_SITES= http://mail.newclear.net/tintin/download/ >+DISTNAME= tintin++v1.5pl9 > > MAINTAINER= ports@FreeBSD.org > >-WRKSRC= ${WRKDIR}/tintin++/src >+WRKSRC= ${WRKDIR}/tintin++/v1.5/src > GNU_CONFIGURE= yes > > .include <bsd.port.mk> >diff -urN ../net/tintin++/files/md5 tintin++/files/md5 >--- ../net/tintin++/files/md5 Tue Sep 26 07:04:51 2000 >+++ tintin++/files/md5 Tue Sep 26 07:54:46 2000 >@@ -1 +1 @@ >-MD5 (tintin++v1.5pl6.tar.Z) = 35e53d661606d035c3e92a249e44160f >+MD5 (tintin++v1.5pl9.tar.gz) = 0635a327e074d83e7c4b1f70149b6b35 >diff -urN ../net/tintin++/patches/patch-aa tintin++/patches/patch-aa >--- ../net/tintin++/patches/patch-aa Tue Sep 26 07:04:51 2000 >+++ tintin++/patches/patch-aa Tue Sep 26 08:59:37 2000 >@@ -1,160 +1,44 @@ >-*** Makefile.in.orig Fri Sep 9 19:35:20 1994 >---- Makefile.in Tue Nov 15 02:07:48 1994 >-*************** >-*** 10,17 **** >- # try uncommenting the 'gcc' line and commenting the 'cc' one. >- # Tintin++ doesn't *need* an ANSI compiler anymore, but gcc >- # is still better than cc on many platforms... >-! CC = @CC@ -O >-! CFLAGS = @DEFS@ >- LIBS = @LIBS@ >- PIPE = @PIPE@ >- # If you plan on doing debugging (with gdb), it is very helpful to turn all >---- 10,16 ---- >- # try uncommenting the 'gcc' line and commenting the 'cc' one. >- # Tintin++ doesn't *need* an ANSI compiler anymore, but gcc >- # is still better than cc on many platforms... >-! CFLAGS += @DEFS@ >- LIBS = @LIBS@ >- PIPE = @PIPE@ >- # If you plan on doing debugging (with gdb), it is very helpful to turn all >-*************** >-*** 22,31 **** >- >- # BINDIR is the directory you wish tt++ to be placed if you wish to use >- # make install. >-! BINDIR = .. >- >- # DEFAULT_FILE_DIR is the path to tintin files. >-! DEFAULT_FILE_DIR = @HOME@ >- >- ######################################### >- # You shouldn't need to change anything # >---- 21,30 ---- >- >- # BINDIR is the directory you wish tt++ to be placed if you wish to use >- # make install. >-! BINDIR = /usr/local/bin >- >- # DEFAULT_FILE_DIR is the path to tintin files. >-! DEFAULT_FILE_DIR = /usr/local/lib/tintin >- >- ######################################### >- # You shouldn't need to change anything # >-*************** >-*** 41,54 **** >- variables.c highlight.c antisub.c ivars.c help.c text.c glob.c >- OFILES = $(CFILES:.c=.o) >- >-! all: tintin++ install >- >- tintin++: $(OFILES) tintin.h >- @echo "Linking..." >- $(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS) >- >-! install: all >-! @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) $(COMPRESSED_HELP) >- >- # Autocompile all .c files into .o files using this rule: >- .c.o: >---- 40,54 ---- >- variables.c highlight.c antisub.c ivars.c help.c text.c glob.c >- OFILES = $(CFILES:.c=.o) >- >-! all: tintin++ >- >- tintin++: $(OFILES) tintin.h >- @echo "Linking..." >- $(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS) >- >-! install: >-! @mkdir -p $(DEFAULT_FILE_DIR) >-! @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) Ok >- >- # Autocompile all .c files into .o files using this rule: >- .c.o: >-*** configure.old Sun Aug 28 14:06:38 1994 >---- configure Tue Nov 15 01:42:46 1994 >-*************** >-*** 474,489 **** >- OLD_CFLAGS="$CFLAGS" >- CFLAGS="$CFLAGS -pipe" >- >-! echo "Do you want the helpfile to be compressed (yes/no)? " >-! read YESNO >-! if test $YESNO; then >-! if echo "$YESNO"|grep -i "no" >/dev/null; then >-! DEFS="$DEFS -DCOMPRESSED_HELP=0" >-! else >-! DEFS="$DEFS -DCOMPRESSED_HELP=1" >-! COMPRESSED_HELP="Ok" >-! fi >-! fi >- >- test -n "$silent" || echo "checking for -pipe" >- cat > conftest.${ac_ext} <<EOF >---- 474,492 ---- >- OLD_CFLAGS="$CFLAGS" >- CFLAGS="$CFLAGS -pipe" >- >-! DEFS="$DEFS -DCOMPRESSED_HELP=1" >-! COMPRESSED_HELP="Ok" >-! >-! #echo "Do you want the helpfile to be compressed (yes/no)? " >-! #read YESNO >-! #if test $YESNO; then >-! # if echo "$YESNO"|grep -i "no" >/dev/null; then >-! # DEFS="$DEFS -DCOMPRESSED_HELP=0" >-! # else >-! # DEFS="$DEFS -DCOMPRESSED_HELP=1" >-! # COMPRESSED_HELP="Ok" >-! # fi >-! #fi >- >- test -n "$silent" || echo "checking for -pipe" >- cat > conftest.${ac_ext} <<EOF >-*************** >-*** 854,860 **** >- :; >- fi >- >-! for ac_func in bcopy >- do >- ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` >- test -n "$silent" || echo "checking for ${ac_func}" >---- 857,863 ---- >- :; >- fi >- >-! for ac_func in >- do >- ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` >- test -n "$silent" || echo "checking for ${ac_func}" >-*** install.sh.old Fri Sep 9 05:43:26 1994 >---- install.sh Tue Nov 15 02:05:24 1994 >-*************** >-*** 5,16 **** >- >- echo " " >- echo "Copying the tintin++ executable to \"$1\"..." >-! strip tt++ >-! cp tt++ "$1" >- >- echo "Copying the tintin++ help file to \"$2\"..." >- if [ "$3" ]; then >-! cp support/.tt_help.txt.Z "$2/" >- else >- echo Uncompressing. >- uncompress -c support/.tt_help.txt.Z | cat > "$2"/.tt_help.txt >---- 5,15 ---- >- >- echo " " >- echo "Copying the tintin++ executable to \"$1\"..." >-! install -c -s -o bin -g bin -m 555 tt++ "$1" >- >- echo "Copying the tintin++ help file to \"$2\"..." >- if [ "$3" ]; then >-! install -c -o bin -g bin -m 444 support/.tt_help.txt.Z "$2" >- else >- echo Uncompressing. >- uncompress -c support/.tt_help.txt.Z | cat > "$2"/.tt_help.txt >+--- Makefile.in.orig Thu Mar 25 12:03:34 1999 >++++ Makefile.in Tue Sep 26 08:59:14 2000 >+@@ -10,8 +10,7 @@ >+ # try uncommenting the 'gcc' line and commenting the 'cc' one. >+ # Tintin++ doesn't *need* an ANSI compiler anymore, but gcc >+ # is still better than cc on many platforms... >+-CC = @CC@ -O >+-CFLAGS = @DEFS@ >++CFLAGS += @DEFS@ >+ LIBS = @LIBS@ >+ PIPE = @PIPE@ >+ # If you plan on doing debugging (with gdb), it is very helpful to turn all >+@@ -22,10 +21,10 @@ >+ >+ # BINDIR is the directory you wish tt++ to be placed if you wish to use >+ # make install. >+-BINDIR = .. >++BINDIR = /usr/local/bin >+ >+ # DEFAULT_FILE_DIR is the path to tintin files. >+-DEFAULT_FILE_DIR = ~ >++DEFAULT_FILE_DIR = /usr/local/lib/tintin >+ >+ ######################################### >+ # You shouldn't need to change anything # >+@@ -41,14 +40,15 @@ >+ variables.c highlight.c antisub.c ivars.c help.c text.c glob.c >+ OFILES = $(CFILES:.c=.o) >+ >+-all: tintin++ install >++all: tintin++ >+ >+ tintin++: $(OFILES) tintin.h >+ @echo "Linking..." >+ $(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS) >+ >+-install: all >+- @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) $(COMPRESSED_HELP) >++install: >++ @mkdir -p $(DEFAULT_FILE_DIR) >++ @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) >+ >+ # Autocompile all .c files into .o files using this rule: >+ .c.o: >diff -urN ../net/tintin++/patches/patch-ab tintin++/patches/patch-ab >--- ../net/tintin++/patches/patch-ab Tue Sep 26 07:04:52 2000 >+++ tintin++/patches/patch-ab Tue Sep 26 09:14:35 2000 >@@ -1,175 +1,18 @@ >-*** utils.c.old Sun Aug 28 18:12:16 1994 >---- utils.c Tue Nov 15 01:58:20 1994 >-*************** >-*** 21,26 **** >---- 21,28 ---- >- #include <unistd.h> >- #endif >- >-+ #include <sys/param.h> >-+ >- void syserr(); >- >- /*********************************************/ >-*************** >-*** 56,62 **** >---- 58,66 ---- >- char *msg; >- { >- extern int errno, sys_nerr; >-+ #if !defined(BSD) || (BSD < 199306) >- extern char *sys_errlist[]; >-+ #endif >- >- fprintf(stderr,"ERROR: %s (%d",msg, errno); >- if(errno>0 && errno<sys_nerr) >-*** parse.c.bak Sun Aug 28 18:12:10 1994 >---- parse.c Tue Nov 15 02:21:20 1994 >-*************** >-*** 670,679 **** >- if(ses && !PSEUDO_PROMPT) >- write_line_mud("", ses); >- else if (!is_split) >-! write(1,"> ", 3); >- else { >- sprintf(strng,"8> 7[%d;%df", input_row, input_col); >-! write(1,strng, strlen(strng)+1); >- display_col+=2; >- } >- } >---- 670,679 ---- >- if(ses && !PSEUDO_PROMPT) >- write_line_mud("", ses); >- else if (!is_split) >-! write(1,"> ", 2); >- else { >- sprintf(strng,"8> 7[%d;%df", input_row, input_col); >-! write(1,strng, strlen(strng)); >- display_col+=2; >- } >- } >-*** misc.c.bak Sun Aug 28 18:12:08 1994 >---- misc.c Tue Nov 15 02:28:26 1994 >-*************** >-*** 106,112 **** >- char temp[2]; >- temp[0]=7; >- temp[1]=0; >-! write(1, temp, 2); >- } >- >- >---- 106,112 ---- >- char temp[2]; >- temp[0]=7; >- temp[1]=0; >-! write(1, temp, 1); >- } >- >- >-*************** >-*** 172,178 **** >- cleanup_session(sesptr); >- ses=NULL; >- if (is_split) >-! write(1, "c", 3); >- tintin_puts2("TINTIN suffers from bloodlack, and the lack of a beating heart...", ses); >- tintin_puts2("TINTIN is dead! R.I.P.", ses); >- tintin_puts2("Your blood freezes as you hear TINTIN's death cry.", ses); >---- 172,178 ---- >- cleanup_session(sesptr); >- ses=NULL; >- if (is_split) >-! write(1, "c", 2); >- tintin_puts2("TINTIN suffers from bloodlack, and the lack of a beating heart...", ses); >- tintin_puts2("TINTIN is dead! R.I.P.", ses); >- tintin_puts2("Your blood freezes as you hear TINTIN's death cry.", ses); >-*** main.c.bak Sun Aug 28 18:12:06 1994 >---- main.c Tue Nov 15 02:33:37 1994 >-*************** >-*** 562,568 **** >- if(ses->logfile) { >- if (!OLD_LOG) { >- count=0; >-! for(n=0;n<=didget;n++) >- if (buffer[n]!='\r') { >- temp[count]=buffer[n]; >- count++; >---- 562,568 ---- >- if(ses->logfile) { >- if (!OLD_LOG) { >- count=0; >-! for(n=0;n<didget;n++) >- if (buffer[n]!='\r') { >- temp[count]=buffer[n]; >- count++; >-*************** >-*** 732,738 **** >- sprintf(strng,"%c8%s\n\r%c7%c[%d;%df", E, cptr, E, E, input_row, input_col); >- else >- sprintf(strng,"%s\n\r", cptr); >-! write(1,strng, strlen(strng)+1); >- display_col=1; >- if (redraw && term_echoing && !is_split) >- write(1, k_input, strlen(k_input)); >---- 732,738 ---- >- sprintf(strng,"%c8%s\n\r%c7%c[%d;%df", E, cptr, E, E, input_row, input_col); >- else >- sprintf(strng,"%s\n\r", cptr); >-! write(1,strng, strlen(strng)); >- display_col=1; >- if (redraw && term_echoing && !is_split) >- write(1, k_input, strlen(k_input)); >-*************** >-*** 764,770 **** >- cptr++; >- sprintf(strng,"%s\n\r", cptr); >- } >-! write(1,strng, strlen(strng)+1); >- display_col=1; >- } >- text_came=TRUE; >---- 764,770 ---- >- cptr++; >- sprintf(strng,"%s\n\r", cptr); >- } >-! write(1,strng, strlen(strng)); >- display_col=1; >- } >- text_came=TRUE; >-*************** >-*** 832,838 **** >- input_col=1; >- sprintf(fn, "%c[2J%c[1;%dr%c[%d;1f", E, E, display_row, E, split_line); >- write(1,fn, strlen(fn)); >-! write(1,"-------------------------------------------------------------------------------", 80); >- sprintf(fn, "%c[%d;1f%c7", E, split_line-1, E); >- write(1,fn,strlen(fn)); >- sprintf(fn, "%c[%d;1f", E, input_row); >---- 832,838 ---- >- input_col=1; >- sprintf(fn, "%c[2J%c[1;%dr%c[%d;1f", E, E, display_row, E, split_line); >- write(1,fn, strlen(fn)); >-! write(1,"--------------------------------------------------------------------------------", 80); >- sprintf(fn, "%c[%d;1f%c7", E, split_line-1, E); >- write(1,fn,strlen(fn)); >- sprintf(fn, "%c[%d;1f", E, input_row); >-*** net.c.bak Sun Aug 28 18:12:10 1994 >---- net.c Tue Nov 15 03:27:09 1994 >-*************** >-*** 80,86 **** >- >- tintin_puts("#Trying to connect..", ses); >- >-! alarm(15); /* We'll allow connect to hang in 15seconds! NO MORE! */ >- ticker_interrupted=FALSE; >- connectresult=connect(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); >- #if defined(DEBUG) >---- 80,86 ---- >- >- tintin_puts("#Trying to connect..", ses); >- >-! alarm(30); /* We'll allow connect to hang in 30seconds! NO MORE! */ >- ticker_interrupted=FALSE; >- connectresult=connect(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); >- #if defined(DEBUG) >+--- install.sh.orig Tue Sep 26 09:13:19 2000 >++++ install.sh Tue Sep 26 09:13:55 2000 >+@@ -5,13 +5,10 @@ >+ >+ echo " " >+ echo "Copying the tintin++ executable to \"$1\"..." >+-#strip tt++ >+-cp tt++ "$1" >++install -c -s -o bin -g bin -m 555 tt++ "$1" >+ >+ echo "Copying the tintin++ help file to \"$2\"..." >+-if [ "$3" ]; then >+- cp support/.tt_help.txt.Z "$2/" >+-fi >++install -c -o bin -g bin -m 444 support/.tt_help.txt.Z "$2" >+ >+ echo >+ echo "You'll have to do 1 thing before you continue with using tintin++." >diff -urN ../net/tintin++/patches/patch-ac tintin++/patches/patch-ac >--- ../net/tintin++/patches/patch-ac Thu Jan 1 09:00:00 1970 >+++ tintin++/patches/patch-ac Tue Sep 26 08:51:18 2000 >@@ -0,0 +1,11 @@ >+--- configure.orig Fri Mar 5 02:55:01 1999 >++++ configure Tue Sep 26 08:51:00 2000 >+@@ -1456,7 +1456,7 @@ >+ fi >+ >+ >+-for ac_func in bcopy >++for ac_func in >+ do >+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 >+ echo "configure:1463: checking for $ac_func" >&5 >diff -urN ../net/tintin++/patches/patch-ad tintin++/patches/patch-ad >--- ../net/tintin++/patches/patch-ad Thu Jan 1 09:00:00 1970 >+++ tintin++/patches/patch-ad Tue Sep 26 08:49:06 2000 >@@ -0,0 +1,62 @@ >+--- main.c.orig Thu Mar 25 12:26:53 1999 >++++ main.c Tue Sep 26 08:43:19 2000 >+@@ -106,12 +106,14 @@ >+ #else >+ #include <termio.h> >+ #endif >++#ifdef HAVE_TCFLAG_T >+ tcflag_t c_lflag; >+ cc_t c_cc[NCCS]; >+ #else >+ unsigned char c_cc[NCC]; >+ unsigned short c_lflag; >+ #endif >++#endif >+ >+ /* CHANGED to get rid of double-echoing bug when tintin++ gets suspended */ >+ void tstphandler(sig, code, scp, addr) >+@@ -580,7 +582,7 @@ >+ if(ses->logfile) { >+ if (!OLD_LOG) { >+ count=0; >+- for(n=0;n<=didget;n++) >++ for(n=0;n<didget;n++) >+ if (buffer[n]!='\r') { >+ temp[count]=buffer[n]; >+ count++; >+@@ -750,7 +752,7 @@ >+ sprintf(strng,"%c8%s\n\r%c7%c[%d;%df", E, cptr, E, E, input_row, input_col); >+ else >+ sprintf(strng,"%s\n\r", cptr); >+- write(1,strng, strlen(strng)+1); >++ write(1,strng, strlen(strng)); >+ display_col=1; >+ if (redraw && term_echoing && !is_split) >+ write(1, k_input, strlen(k_input)); >+@@ -774,7 +776,7 @@ >+ sprintf(strng, "%c8%s%c7%c[%d;%df", E, cptr, E, E, input_row, input_col); >+ else >+ sprintf(strng, "%s", cptr); >+- write(1, strng, strlen(strng)+1); >++ write(1, strng, strlen(strng)); >+ display_col=1; >+ if (redraw && term_echoing && !is_split) >+ write(1, k_input, strlen(k_input)); >+@@ -806,7 +808,7 @@ >+ cptr++; >+ sprintf(strng,"%s\n\r", cptr); >+ } >+- write(1,strng, strlen(strng)+1); >++ write(1,strng, strlen(strng)); >+ display_col=1; >+ } >+ text_came=TRUE; >+@@ -876,7 +878,7 @@ >+ input_col=1; >+ sprintf(fn, "%c[2J%c[1;%dr%c[%d;1f", E, E, display_row, E, split_line); >+ write(1,fn, strlen(fn)); >+- write(1,"-------------------------------------------------------------------------------", 80); >++ write(1,"--------------------------------------------------------------------------------", 80); >+ sprintf(fn, "%c[%d;1f%c7", E, split_line-1, E); >+ write(1,fn,strlen(fn)); >+ sprintf(fn, "%c[%d;1f", E, input_row); >diff -urN ../net/tintin++/patches/patch-ae tintin++/patches/patch-ae >--- ../net/tintin++/patches/patch-ae Thu Jan 1 09:00:00 1970 >+++ tintin++/patches/patch-ae Tue Sep 26 08:49:26 2000 >@@ -0,0 +1,20 @@ >+--- misc.c.orig Mar 5 22:40:11 1999 >++++ misc.c Tue Sep 26 08:34:10 2000 >+@@ -106,7 +106,7 @@ >+ char temp[2]; >+ temp[0]=7; >+ temp[1]=0; >+- write(1, temp, 2); >++ write(1, temp, 1); >+ } >+ >+ >+@@ -176,7 +176,7 @@ >+ } >+ ses=NULL; >+ if (is_split) >+- write(1, "c", 3); >++ write(1, "c", 2); >+ tintin_puts2("TINTIN suffers from bloodlack, and the lack of a beating heart...", ses); >+ tintin_puts2("TINTIN is dead! R.I.P.", ses); >+ tintin_puts2("Your blood freezes as you hear TINTIN's death cry.", ses); >diff -urN ../net/tintin++/patches/patch-af tintin++/patches/patch-af >--- ../net/tintin++/patches/patch-af Thu Jan 1 09:00:00 1970 >+++ tintin++/patches/patch-af Tue Sep 26 08:33:08 2000 >@@ -0,0 +1,15 @@ >+--- parse.c.orig Sun Aug 28 23:12:10 1994 >++++ parse.c Tue Sep 26 08:32:50 2000 >+@@ -670,10 +670,10 @@ >+ if(ses && !PSEUDO_PROMPT) >+ write_line_mud("", ses); >+ else if (!is_split) >+- write(1,"> ", 3); >++ write(1,"> ", 2); >+ else { >+ sprintf(strng,"8> 7[%d;%df", input_row, input_col); >+- write(1,strng, strlen(strng)+1); >++ write(1,strng, strlen(strng)); >+ display_col+=2; >+ } >+ } >diff -urN ../net/tintin++/pkg/DESCR tintin++/pkg/DESCR >--- ../net/tintin++/pkg/DESCR Tue Sep 26 07:04:52 2000 >+++ tintin++/pkg/DESCR Tue Sep 26 12:58:59 2000 >@@ -1,6 +1,8 @@ >- TINTIN++ is a client program specialized to help playing muds. >- This is a souped up version of TINTIN III, many new features >- have been added since III. We saw room for improvement on the >- features available from TINTIN, and since we like the format of >- the program, we decided to use TINTIN as a base for what we >- hope to make one of the most powerful clients around. >+TINTIN++ is a client program specialized to help playing muds. >+This is a souped up version of TINTIN III, many new features >+have been added since III. We saw room for improvement on the >+features available from TINTIN, and since we like the format of >+the program, we decided to use TINTIN as a base for what we >+hope to make one of the most powerful clients around. >+ >+WWW: http://mail.newclear.net/tintin/
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=10809">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 21552
: 10809