Date: Sat, 23 Sep 2000 16:23:33 +0800 (CST) From: clive@CirX.ORG To: FreeBSD-gnats-submit@freebsd.org Subject: ports/21496: Update and enslave chinese/tin Message-ID: <200009230823.e8N8NXY04095@cartier.cirx.org>
next in thread | raw e-mail | index | archive | help
>Number: 21496 >Category: ports >Synopsis: Update and enslave zh-tin >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 23 01:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Clive Lin <clive@CirX.ORG> >Release: FreeBSD 5.0-CURRENT i386 >Organization: This site doesnt' exist >Environment: FreeBSD 5.0-CURRENT #0: Thu Sep 21 15:46:48 CST 2000 root@cartier.cirx.org:/home/nexus/obj/usr/local/src/sys/CARTIER >Description: Update chinese/tin. Added files: patches/patch-charset.c patches/patch-cook.c patches/patch-init.c Removed files: files/md5 patches/patch-aa patches/patch-ab pkg/COMMENT pkg/DESCR pkg/PLIST >How-To-Repeat: Apply patch below. >Fix: diff -ruN tin~/Makefile tin/Makefile --- tin~/Makefile Thu Apr 13 16:28:17 2000 +++ tin/Makefile Sat Sep 23 16:02:12 2000 @@ -6,59 +6,16 @@ # $FreeBSD: ports/chinese/tin/Makefile,v 1.20 2000/04/13 08:28:17 asami Exp $ # -PORTNAME= tin -PORTVERSION= 1.4.2 -CATEGORIES= chinese news -MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v1.4/ \ - ftp://nuxi.ucdavis.edu/pub/tin/v1.4/ \ - ftp://ftp.nuxi.com/pub/tin/v1.4/ +MASTERDIR= ${.CURDIR}/../../news/tin MAINTAINER= yssu@CCCA.NCTU.edu.tw -LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib - -USE_BZIP2= yes -WRKSRC= ${WRKDIR}/${DISTNAME:S/pre-1.4//} -GNU_CONFIGURE= yes - -# Curses support too buggy to activate -# --enable-curses \ -# --with-ncurses \ -# -CONFIGURE_ARGS= --with-nntp-default-server=news \ - --with-spooldir=/var/news \ - --with-libdir=${PREFIX}/news/lib \ - --with-defaults-dir=${PREFIX}/etc \ - --with-editor=/usr/bin/ee \ - --with-mime-default-charset=ISO-8859-1 \ - --enable-forgery \ - --enable-break-long-lines \ - --with-pgp=${PREFIX}/bin/pgp \ - --with-ispell=${PREFIX}/bin/ispell \ - --with-metamail=${PREFIX}/bin/metamail \ - --disable-locale -CONFIGURE_ENV= CFLAGS='${CFLAGS} -I${PREFIX}/include -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \ - CPPFLAGS='${CPPFLAGS} -I${PREFIX}/include' \ - LDFLAGS='${LDFLAGS} -L${PREFIX}/lib' -MAKEFILE= makefile -ALL_TARGET= build -MAN1= tin.1 - -.if defined(NNTP_ONLY) -CONFIGURE_ARGS+= --enable-nntp-only -.endif - -post-patch: - @${MV} ${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.1.dist - @${SED} -e 's:/var/spool/news:/var/news:' \ - -e 's:/etc/nntpserver:${PREFIX}/etc/nntpserver:' \ - -e 's:/usr/lib/news:${PREFIX}/news/lib:' \ - <${WRKSRC}/doc/tin.1.dist >${WRKSRC}/doc/tin.1 - -post-install: - cd ${WRKSRC}/doc; ${INSTALL_DATA} tin.defaults ${PREFIX}/etc/tin.defaults.dist - if [ ! -f ${PREFIX}/etc/tin.defaults ] ; then \ - ${CP} ${PREFIX}/etc/tin.defaults.dist ${PREFIX}/etc/tin.defaults; \ - fi - -.include <bsd.port.mk> +EXTRA_PATCHES= ${.CURDIR}/patches/patch-charset.c \ + ${.CURDIR}/patches/patch-cook.c \ + ${.CURDIR}/patches/patch-init.c + +.include "${MASTERDIR}/Makefile" + +CONFIGURE_ARGS+= --disable-curses \ + --without-ncurses \ + --with-mime-default-charset=big5 diff -ruN tin~/files/md5 tin/files/md5 --- tin~/files/md5 Sun Feb 27 12:41:36 2000 +++ tin/files/md5 Thu Jan 1 08:00:00 1970 @@ -1 +0,0 @@ -MD5 (tin-1.4.2.tar.bz2) = 420a3e5a8fc7164184d6d67f233f275a diff -ruN tin~/patches/patch-aa tin/patches/patch-aa --- tin~/patches/patch-aa Sun Feb 27 12:41:37 2000 +++ tin/patches/patch-aa Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Thu Sep 16 07:25:22 1999 -+++ src/Makefile.in Tue Sep 28 08:05:51 1999 -@@ -28,7 +28,7 @@ - YACC = @YACC@ - - CANLIB = # -L../libcanlock -lcanlock --LIBS = -L../pcre -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@ -+LIBS = ../pcre/libpcre.a $(CANLIB) @LIBS@ @INN_NNTPLIB@ ../pcre/libpcre.a - - # Where do you want the binary & manual page installed? - INSTALL_PREFIX = @INSTALL_PREFIX@ diff -ruN tin~/patches/patch-ab tin/patches/patch-ab --- tin~/patches/patch-ab Wed Dec 10 21:56:24 1997 +++ tin/patches/patch-ab Thu Jan 1 08:00:00 1970 @@ -1,31 +0,0 @@ ---- src/charset.c.orig Tue Dec 2 04:34:34 1997 -+++ src/charset.c Tue Dec 2 04:35:27 1997 -@@ -311,7 +311,7 @@ - { - unsigned char *c; - for (c= (unsigned char *)buf; *c; c++) { -- if (!my_isprint(*c)) -+ if (!my_isprint(*c) && *c != 27) - *c = '?'; - } - } -@@ -326,7 +326,7 @@ - { - unsigned char *c; - for (c = (unsigned char *)buf; *c; c++) { -- if (!(my_isprint(*c) || *c==8 || *c==9 || *c==12)) -+ if (!(my_isprint(*c) || *c==8 || *c==9 || *c==12 || *c==27)) - *c = '?'; - } - } ---- src/page.c.orig Tue Dec 2 04:33:32 1997 -+++ src/page.c Tue Dec 2 04:34:11 1997 -@@ -795,7 +795,7 @@ - while (i++ < j) - *q++ = ' '; - -- } else if (((*p) & 0xFF) < ' ') { -+ } else if (((*p) & 0xFF) < ' ' && *p != 27) { - *q++ = '^'; - *q++ = ((*p) & 0xFF) + '@'; - if (*p == 12) ctrl_L = TRUE; diff -ruN tin~/patches/patch-charset.c tin/patches/patch-charset.c --- tin~/patches/patch-charset.c Thu Jan 1 08:00:00 1970 +++ tin/patches/patch-charset.c Sat Sep 23 14:03:39 2000 @@ -0,0 +1,20 @@ +--- src/charset.c.orig Mon Jul 24 21:30:22 2000 ++++ src/charset.c Sat Sep 23 14:03:14 2000 +@@ -330,7 +330,7 @@ + unsigned char *c; + + for (c= (unsigned char *)buf; *c; c++) { +- if (!my_isprint(*c)) ++ if (!my_isprint(*c) && *c != 27) + *c = '?'; + } + } +@@ -348,7 +348,7 @@ + unsigned char *c; + + for (c = (unsigned char *)buf; *c; c++) { +- if (!(my_isprint(*c) || *c == 8 || *c == 9 || *c == 10 || *c == 12 || *c == 13)) ++ if (!(my_isprint(*c) || *c == 8 || *c == 9 || *c == 10 || *c == 12 || *c == 13 || *c==27)) + *c = '?'; + } + } diff -ruN tin~/patches/patch-cook.c tin/patches/patch-cook.c --- tin~/patches/patch-cook.c Thu Jan 1 08:00:00 1970 +++ tin/patches/patch-cook.c Sat Sep 23 14:35:01 2000 @@ -0,0 +1,11 @@ +--- src/cook.c.orig Sat Sep 23 14:34:20 2000 ++++ src/cook.c Sat Sep 23 14:34:41 2000 +@@ -109,7 +109,7 @@ + while (i++ < j) + *q++ = ' '; + +- } else if (((*p) & 0xFF) < ' ' && *p != '\n') { /* Literal ctrl chars */ ++ } else if (((*p) & 0xFF) < ' ' && *p != '\n' && *p != 27) { /* Literal ctrl chars */ + *q++ = '^'; + *q++ = ((*p) & 0xFF) + '@'; + if (*p == '\f') /* ^L detected */ diff -ruN tin~/patches/patch-init.c tin/patches/patch-init.c --- tin~/patches/patch-init.c Thu Jan 1 08:00:00 1970 +++ tin/patches/patch-init.c Sat Sep 23 16:02:39 2000 @@ -0,0 +1,36 @@ +--- src/init.c.orig Sat Sep 23 15:52:42 2000 ++++ src/init.c Sat Sep 23 15:55:26 2000 +@@ -270,8 +270,8 @@ + 2, /* recent_time */ + 32, /* groupname_max_length */ + KILL_READ, /* kill_level */ +- MIME_ENCODING_7BIT, /* mail_mime_encoding */ +- MIME_ENCODING_7BIT, /* post_mime_encoding */ ++ MIME_ENCODING_8BIT, /* mail_mime_encoding */ ++ MIME_ENCODING_8BIT, /* post_mime_encoding */ + POST_PROC_NONE, /* post_process */ + REREAD_ACTIVE_FILE_SECS, /* reread_active_file_secs */ + SHOW_FROM_NAME, /* show_author */ +@@ -302,7 +302,7 @@ + 0, /* col_title (initialised later) */ + 2, /* word_h_display_marks */ + TRUE, /* word_highlight */ +- FALSE, /* use_color */ ++ TRUE, /* use_color */ + #endif /* HAVE_COLOR */ + TRUE, /* add_posted_to_filter */ + TRUE, /* advertising */ +@@ -335,11 +335,11 @@ + TRUE, /* keep_dead_articles */ + TRUE, /* keep_posted_articles */ + POSTED_FILE, /* keep_posted_articles_file */ +- FALSE, /* mail_8bit_header */ ++ TRUE, /* mail_8bit_header */ + TRUE, /* mark_saved_read */ + TRUE, /* pgdn_goto_next */ + TRUE, /* pos_first_unread */ +- FALSE, /* post_8bit_header */ ++ TRUE, /* post_8bit_header */ + TRUE, /* post_process_view */ + #ifndef DISABLE_PRINTING + FALSE, /* print_header */ diff -ruN tin~/pkg/COMMENT tin/pkg/COMMENT --- tin~/pkg/COMMENT Mon Aug 30 03:19:15 1999 +++ tin/pkg/COMMENT Thu Jan 1 08:00:00 1970 @@ -1 +0,0 @@ -Easy-to-use console-based newsreader diff -ruN tin~/pkg/DESCR tin/pkg/DESCR --- tin~/pkg/DESCR Tue Dec 2 05:16:51 1997 +++ tin/pkg/DESCR Thu Jan 1 08:00:00 1970 @@ -1 +0,0 @@ -TIN: Easy to use threaded newsreader with NOV/NNTP support. diff -ruN tin~/pkg/PLIST tin/pkg/PLIST --- tin~/pkg/PLIST Sun Feb 27 12:41:37 2000 +++ tin/pkg/PLIST Thu Jan 1 08:00:00 1970 @@ -1,5 +0,0 @@ -bin/tin -@exec ln -fs %f %B/rtin -@unexec rm -f %B/rtin -etc/tin.defaults -etc/tin.defaults.dist >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200009230823.e8N8NXY04095>