From leeym@utopia.leeym.com  Fri Mar 18 18:01:40 2005
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D7F5116A4CE; Fri, 18 Mar 2005 18:01:40 +0000 (GMT)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3751843D49; Fri, 18 Mar 2005 18:01:40 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id 44D993EA11E;
	Sat, 19 Mar 2005 02:01:39 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 29709-06; Sat, 19 Mar 2005 02:01:35 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id C78B93EA141; Sat, 19 Mar 2005 02:01:35 +0800 (CST)
Message-Id: <20050318180135.C78B93EA141@utopia.leeym.com>
Date: Sat, 19 Mar 2005 02:01:35 +0800 (CST)
From: Yen-Ming Lee <leeym@utopia.leeym.com>
Reply-To: Yen-Ming Lee <leeym@utopia.leeym.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ache@FreeBSD.org, yssu@CCCA.NCTU.edu.tw
Subject: [update] {news,chinese}/tin: integrate patch
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         78990
>Category:       ports
>Synopsis:       [update] {news,chinese}/tin: integrate patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ache
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 18 18:10:00 GMT 2005
>Closed-Date:    Mon Oct 16 01:43:31 GMT 2006
>Last-Modified:  Mon Oct 16 01:43:31 GMT 2006
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Tue Mar 15 10:20:57 CST 2005 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386


	
>Description:

- update chinese/tin to catch up with news/tin
- add knobs in news/tin to make it easier for chinese/tin to customize settings
- respect WITHOUT_NLS

>How-To-Repeat:
	
>Fix:

	

--- tin.diff begins here ---
Index: chinese/tin/Makefile
===================================================================
RCS file: /home/pcvs/ports/chinese/tin/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- chinese/tin/Makefile	9 Oct 2003 14:14:43 -0000	1.33
+++ chinese/tin/Makefile	18 Mar 2005 17:56:46 -0000
@@ -8,8 +8,6 @@
 
 CATEGORIES=	chinese
 
-MASTERDIR=	${.CURDIR}/../../news/tin
-
 MAINTAINER=	yssu@CCCA.NCTU.edu.tw
 
 EXTRA_PATCHES=	${.CURDIR}/files/patch-attrib.c \
@@ -18,7 +16,11 @@
 		${.CURDIR}/files/patch-init.c \
 		${.CURDIR}/files/patch-tin_defaults
 
-.include "${MASTERDIR}/Makefile"
+MASTERDIR=	${.CURDIR}/../../news/tin
 
-CONFIGURE_ARGS+=	--disable-locale --with-screen=termcap \
-			--with-mime-default-charset=Big5
+MM_CHARSET=	Big5
+SCREEN=		termcap
+
+CONFIGURE_ARGS=	--disable-locale
+
+.include "${MASTERDIR}/Makefile"
Index: chinese/tin/files/patch-cook.c
===================================================================
RCS file: /home/pcvs/ports/chinese/tin/files/patch-cook.c,v
retrieving revision 1.5
diff -u -r1.5 patch-cook.c
--- chinese/tin/files/patch-cook.c	9 Oct 2003 04:14:26 -0000	1.5
+++ chinese/tin/files/patch-cook.c	18 Mar 2005 17:56:46 -0000
@@ -1,15 +1,16 @@
---- src/cook.c.orig	Tue Aug 26 20:34:07 2003
-+++ src/cook.c	Wed Oct  8 15:05:05 2003
-@@ -719,7 +719,12 @@
+--- src/cook.c.orig	Wed Dec  1 18:48:37 2004
++++ src/cook.c	Fri Mar 18 23:34:58 2005
+@@ -408,8 +408,13 @@
+ 		if (!(line && strlen(line)))
  			break;	/* premature end of file, file error etc. */
  
- 		/* convert network to local charset, tex2iso, iso2asc etc. */
 +#ifndef CHARSET_CONVERSION
- 		process_charsets(&line, &max_line_len, get_param(part->params, "charset"), tinrc.mm_local_charset, CURR_GROUP.attribute->tex2iso_conv && art->tex2iso);
+ 		/* convert network to local charset, tex2iso, iso2asc etc. */
+ 		process_charsets(&line, &max_line_len, get_param(part->params, "charset"), tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso);
 +#else
 +		// force to use undeclared_charset first
-+		process_charsets(&line, &max_line_len, (CURR_GROUP.attribute->undeclared_charset) ? (CURR_GROUP.attribute->undeclared_charset) : get_param(part->params, "charset"), tinrc.mm_local_charset, CURR_GROUP.attribute->tex2iso_conv && art->tex2iso);
++		process_charsets(&line, &max_line_len, (curr_group->attribute->undeclared_charset) ? (curr_group->attribute->undeclared_charset) : get_param(part->params, "charset"), tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso);
 +#endif /* !CHARSET_CONVERSION */
  
- 		len = (int) strlen(line);
- 
+ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)
+ 		if (IS_LOCAL_CHARSET("UTF-8"))
Index: news/tin/Makefile
===================================================================
RCS file: /home/pcvs/ports/news/tin/Makefile,v
retrieving revision 1.126
diff -u -r1.126 Makefile
--- news/tin/Makefile	11 Mar 2005 15:24:03 -0000	1.126
+++ news/tin/Makefile	18 Mar 2005 17:56:46 -0000
@@ -24,7 +24,10 @@
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-TIN_EDITOR?=	/usr/bin/ee
+
+EDITOR?=	/usr/bin/ee
+MM_CHARSET?=	US-ASCII
+SCREEN?=	ncurses
 
 # --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii
 # national environment.
@@ -32,13 +35,12 @@
 		--with-spooldir=/var/news \
 		--with-libdir=${PREFIX}/news/lib \
 		--with-defaults-dir=${PREFIX}/etc \
-		--with-editor=${TIN_EDITOR} \
-		--enable-nls \
+		--with-editor=${EDITOR} \
 		--with-pcre=yes \
-		--with-screen=ncurses \
+		--with-screen=${SCREEN} \
 		--enable-break-long-lines \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--with-mime-default-charset=US-ASCII
+		--with-mime-default-charset=${MM_CHARSET}
 CONFIGURE_ENV=	CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
 		CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \
 		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
@@ -47,6 +49,13 @@
 MAN5=		tin.5 mbox.5 mmdf.5
 MLINKS=		tin.1 rtin.1
 
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+CONFIGURE_ARGS+=--disable-nls
+.endif
+
 .if defined(WITH_TIN_NNTP_ONLY)
 CONFIGURE_ARGS+=	--enable-nntp-only
 .endif
@@ -107,7 +116,9 @@
 .endif
 
 post-build:
+.if !defined(WITHOUT_NLS)
 	cd ${WRKSRC}/po; ${GMAKE}
+.endif
 
 post-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} tin.defaults ${PREFIX}/etc/tin.defaults.dist
Index: news/tin/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/news/tin/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- news/tin/pkg-plist	11 Mar 2005 15:24:03 -0000	1.13
+++ news/tin/pkg-plist	18 Mar 2005 17:56:46 -0000
@@ -12,7 +12,7 @@
 @exec [ -f %B/tin.defaults ] || cp %B/%f %B/tin.defaults
 etc/tin.mime.types.dist
 @exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
-share/locale/de/LC_MESSAGES/tin.mo
-share/locale/en_GB/LC_MESSAGES/tin.mo
-share/locale/et/LC_MESSAGES/tin.mo
-share/locale/fr/LC_MESSAGES/tin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/tin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/tin.mo
+%%NLS%%share/locale/et/LC_MESSAGES/tin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/tin.mo
--- tin.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ache 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Fri Mar 18 19:36:39 GMT 2005 
Responsible-Changed-Why:  
Over to the maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78990 
Responsible-Changed-From-To: ache->freebsd-ports-bugs 
Responsible-Changed-By: ache 
Responsible-Changed-When: Sat Mar 19 15:00:35 GMT 2005 
Responsible-Changed-Why:  
1) This is two ports with two different maintainers, please break it into  
two PR's 
2) Anything else than --with-mime-default-charset=US-ASCII will break 
other national charsets. 
3) Visible tunung variables must have WITH_TIN_ prefix to allow set them all 
at once without conflicts in the /etc/make.conf 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78990 

From: Yen-Shuo Su <yssu@no.spam.CCCA.Net>
To: freebsd-gnats-submit@FreeBSD.org, leeym@utopia.leeym.com
Cc:  
Subject: Re: ports/78990: [update] {news,chinese}/tin: integrate patch
Date: Fri, 25 Mar 2005 14:14:19 +0800

 Acknowledged!! :D
 
 BTW... Would anybody like to maintain this ports?
 Since I'm in charge some important projects, there's not much time to care
 about this ports..
 
 
 -- 
 Sincerely Yours,
 Yen-Shuo Su.
 Mobile: +886-937-348222
 Campus Computer Communication Association
 National Chiao Tung University, Taiwan

From: Yen-Ming Lee <leeym@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc: ache@FreeBSD.org
Subject: Re: ports/78990: [update] {news,chinese}/tin: integrate patch
Date: Fri, 25 Mar 2005 18:27:07 +0800

 --opJtzjQTFsWo+cga
 Content-Type: text/plain; charset=big5
 Content-Disposition: inline
 
 On Fri, Mar 25, 2005 at 02:14:19PM +0800, Yen-Shuo Su wrote:
 > Acknowledged!! :D
 > 
 > BTW... Would anybody like to maintain this ports?
 > Since I'm in charge some important projects, there's not much time to care
 > about this ports..
 
 Okay, I'll takeover chinese/tin.
 
 For the issues that ache@ mentioined:
 
 1. please check the news/tin part of this patch, and I'll take care of
    chinese/tin part of it.
 
 2. --with-mime-default-charset will set the default value of MM_CHARSET,
    it is safe to change its value at compile-time or run-time (by setenv).
 
    Unlike --disable-mime-strict-charset, set --with-mime-default-charset
    to charset other than US-ASCII will NOT break other national charsets.
 
    Even add MM_CHARSET variable in news/tin, it's still set to US-ASCII
    by default, but use "?=" to allow users or slave ports to overwrite it.
 
    chinese/tin need to change the default value of MM_CHARSET to Big5,
    otherwise it can't display asciiart correctly. chinese/tin can't work
    with ncurses either. That's why I need to add optional variables with
    default values for "charset" and "screen".
 
 3. It might be reasonable to put TIN_ prefixes to all variables, however,
    some of these variables are commonly used (EDITOR, MM_CHARSET), it will
    be convenient if we can utilize them.
 
    The other WITH/WITHOUT variables can be replaced by using OPTIONS.
    The config result will be saved in /var/db/ports and only apply to the
    port which save it. I myself prefer this alternative way.
 
    But if you insist, add TIN_ prefixes to these variables (TIN_EDITOR,
    TIN_SCREEN, TIN_MM_CHARSET, WITHOUT_TIN_PGP_GPG ...) are okay too.
 
 -- 
 Yen-Ming Lee [utf7:+Z05fZWYO] | KeyID:0x5EB52E51 | Taipei, Taiwan
 
 --opJtzjQTFsWo+cga
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (FreeBSD)
 
 iQCVAwUBQkPne8nMx0NetS5RAQKeJgQA0uPE9Qr4XycqVwe7pMswjBO8ruaXSIKL
 yRbwttozDlKK6QaPGL88GQiXDYINBWpaTbnLhmPbpx9Iv+ip3GsGcHskooEeUsVw
 XGyyxgxNhZeBfD3JP7pfzWITH++ubFV1ZGDr03SVHgRhee7NzkSHgWAO1DpOQmCU
 WFQCrpUJ+ck=
 =6feI
 -----END PGP SIGNATURE-----
 
 --opJtzjQTFsWo+cga--
Responsible-Changed-From-To: freebsd-ports-bugs->ache 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Apr 6 22:54:39 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer of news/tin. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78990 
State-Changed-From-To: open->feedback 
State-Changed-By: ache 
State-Changed-When: Mon Oct 3 11:33:07 GMT 2005 
State-Changed-Why:  
Several changes and PRs/patches requested from submitter during discussion, 
feedback needed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78990 

From: Yen-Ming Lee <leeym@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/78990: [update] {news,chinese}/tin: integrate patch
Date: Tue, 4 Oct 2005 08:48:34 +0800

 --St7VIuEGZ6dlpu13
 Content-Type: multipart/mixed; boundary="cNdxnHkX5QqsyA0e"
 Content-Disposition: inline
 
 
 --cNdxnHkX5QqsyA0e
 Content-Type: text/plain; charset=big5
 Content-Disposition: inline
 
 Please apply this patch to tin, and I'll update zh-tin correspondingly.
 
 Thanks.
 -- 
 Yen-Ming Lee [utf7:+Z05fZWYO] | KeyID:0x5EB52E51 | Taipei, Taiwan
 
 --cNdxnHkX5QqsyA0e
 Content-Type: text/plain; charset=big5
 Content-Disposition: attachment; filename="news.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/news/tin/Makefile,v
 retrieving revision 1.128
 diff -u -r1.128 Makefile
 --- Makefile	28 Jul 2005 13:52:13 -0000	1.128
 +++ Makefile	4 Oct 2005 00:45:16 -0000
 @@ -25,6 +25,7 @@
  USE_ICONV=	yes
  GNU_CONFIGURE=	yes
  WITH_TIN_EDITOR?=	/usr/bin/ee
 +WITH_TIN_SCREEN?=	ncurses
  
  # --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii
  # national environment.
 @@ -35,7 +36,7 @@
  		--with-editor=${WITH_TIN_EDITOR} \
  		--enable-nls \
  		--with-pcre=yes \
 -		--with-screen=ncurses \
 +		--with-screen=${WITH_TIN_SCREEN} \
  		--enable-break-long-lines \
  		--with-libiconv-prefix=${LOCALBASE} \
  		--with-mime-default-charset=US-ASCII
 
 --cNdxnHkX5QqsyA0e--
 
 --St7VIuEGZ6dlpu13
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iQCVAwUBQ0HRYsnMx0NetS5RAQLaiwQAmhm4xtAEH7Ej6zmUIbJLE16+CJw+NQt1
 rManC4pV0SwnTzx3cYR7PrH/Ftinym4TMb+KDTRmljLKZcl6X6uxgfXk9PCX5K0L
 MwdcQhIbDYpdPwL/JTb8c6xQLF8BQ+Z/7CG0uSwQXy183UkUB1QvqfTa70gsPqXj
 1kruaCB/TDQ=
 =xOYH
 -----END PGP SIGNATURE-----
 
 --St7VIuEGZ6dlpu13--
State-Changed-From-To: feedback->closed 
State-Changed-By: leeym 
State-Changed-When: Mon Oct 16 01:43:30 UTC 2006 
State-Changed-Why:  
Outdated PR 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78990 
>Unformatted:
