From tkato432@yahoo.com  Thu Jun 25 18:00:54 2009
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BBEB1106564A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 25 Jun 2009 18:00:54 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166])
	by mx1.freebsd.org (Postfix) with ESMTP id 654028FC16
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 25 Jun 2009 18:00:54 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from localhost.localdomain (ZT028142.ppp.dion.ne.jp [59.128.28.142])
	by msa103lp.auone-net.jp (au one net msa) with ESMTP id BF9C047C031
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 26 Jun 2009 03:00:47 +0900 (JST)
Message-Id: <20090626030010.e9ef5705.tkato432@yahoo.com>
Date: Fri, 26 Jun 2009 03:00:10 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: editors/ted to 2.20

>Number:         136043
>Category:       ports
>Synopsis:       Update port: editors/ted to 2.20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 25 18:10:01 UTC 2009
>Closed-Date:    Sat Jul 04 20:55:55 UTC 2009
>Last-Modified:  Sat Jul  4 21:00:09 UTC 2009
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 2.20

New file:
files/patch-Ted__makefile.in

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/editors/ted/Makefile editors/ted/Makefile
--- /usr/ports/editors/ted/Makefile	2009-06-08 22:51:17.000000000 +0900
+++ editors/ted/Makefile	2009-06-26 01:07:40.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ted
-PORTVERSION=	2.17
-PORTREVISION=	1
+PORTVERSION=	2.20
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 EXTRACT_SUFX=	.src.tar.gz
@@ -25,35 +24,47 @@
 USE_XORG=	xpm xp xmu xt xext sm ice x11
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
-MAKE_ENV+=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \
-		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}\\\"\"" \
-		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\""
+CONFIGURE_ARGS=	--with-MOTIF
+MAKE_ENV=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}/\\\"\"" \
+		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \
+		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
+		DEF_PSSCRIPT_DIR="-DPSSCRIPT_DIR=\"\\\"${DATADIR}/\\\"\""
 ALL_TARGET=	compile.shared
 
-AFMDIR=		${PREFIX}/share/Ted/afm
-INDDIR=		${PREFIX}/share/Ted/ind
+MAN1=		Ted.1 rtf2pdf.1 rtf2ps.1
+
+DATADIR=	${PREFIX}/share/Ted
+DOCSDIR=	${PREFIX}/share/doc/Ted
+
+AFMDIR=		${DATADIR}/afm
+INDDIR=		${DATADIR}/dfa
 
 post-extract:
-	cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
-	${CP} -p ${FILESDIR}/configure ${WRKSRC}/configure
-	${CHMOD} +x ${WRKSRC}/configure
+	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
+	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
 
 post-patch:
-	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/*/configure
-	${REINPLACE_CMD} \
-		's|DEF_PKGDIR|DEF_DOCUMENT_DIR|g' ${WRKSRC}/Ted/makefile.in
+	@${FIND} ${WRKSRC} -name "configure" -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -e \
+		's|/usr/local|${LOCALBASE}|g ; \
+		 s|/iconv.so|/libiconv.so|g'
+	@${REINPLACE_CMD} -e \
+		's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/appUtil/csvsheet.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/Ted/rtf2*.sh ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/Ted/Ted.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/Ted/rtf2*.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR} 
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/*.ps ${DATADIR}
 	@${MKDIR} ${AFMDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/* ${AFMDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/afm/*.afm ${AFMDIR}
 	@${MKDIR} ${INDDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/ind/US_English.ind ${INDDIR}
-
-post-install:
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/dfa/*.dfa ${INDDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR}  ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${DOCSDIR}
 .endif
+
 .include <bsd.port.mk>
diff -urN /usr/ports/editors/ted/distinfo editors/ted/distinfo
--- /usr/ports/editors/ted/distinfo	2006-01-22 22:03:42.000000000 +0900
+++ editors/ted/distinfo	2009-06-23 03:43:51.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (ted-2.17.src.tar.gz) = 8adc2ab0a67954b2b5068c9be243c82d
-SHA256 (ted-2.17.src.tar.gz) = e080ef452173ec781feb60026b4b01f37343e06c1a0083ca8ccc899c97c2368a
-SIZE (ted-2.17.src.tar.gz) = 3000864
+MD5 (ted-2.20.src.tar.gz) = f4e613951107dc9ea53d75b811d7ccb0
+SHA256 (ted-2.20.src.tar.gz) = 5cc58ccb7bc38f7f0dacc1dfc836a43d35ac94a32cde54275b583b2e4d6f5335
+SIZE (ted-2.20.src.tar.gz) = 3903673
diff -urN /usr/ports/editors/ted/files/configure editors/ted/files/configure
--- /usr/ports/editors/ted/files/configure	2009-06-08 22:51:17.000000000 +0900
+++ editors/ted/files/configure	2009-06-23 23:21:28.000000000 +0900
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-dirs="Ted appFrame appUtil bitmap ind libreg tedPackage"
+dirs="Ted appFrame appUtil bitmap ind docBuf tedPackage"
 
 for d in $dirs; do
   (cd $d && echo -n "./configure $* in:" && pwd && ./configure $*)
diff -urN /usr/ports/editors/ted/files/patch-Ted__makefile.in editors/ted/files/patch-Ted__makefile.in
--- /usr/ports/editors/ted/files/patch-Ted__makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ editors/ted/files/patch-Ted__makefile.in	2009-06-26 01:01:10.000000000 +0900
@@ -0,0 +1,12 @@
+--- Ted/makefile.in.orig	2009-06-10 14:41:19.000000000 +0900
++++ Ted/makefile.in	2009-06-26 01:00:56.000000000 +0900
+@@ -42,7 +42,8 @@
+ 	-I../bitmap	\
+ 	-I../ind	\
+ 	-I../include	\
+-	$(DEF_PKGDIR)
++	$(DEF_DOCUMENT_DIR)	\
++	$(DEF_PSSCRIPT_DIR)
+ 
+ CFLAGS=			\
+ 	@CFLAGS@	\
diff -urN /usr/ports/editors/ted/pkg-descr editors/ted/pkg-descr
--- /usr/ports/editors/ted/pkg-descr	2005-02-26 15:56:03.000000000 +0900
+++ editors/ted/pkg-descr	2009-06-26 01:28:29.000000000 +0900
@@ -1,4 +1,4 @@
-Ted 2.17 is a text editor running under X Windows on Unix/Linux systems.
+Ted is a text editor running under X11 on Unix/Linux systems.
 
 Features 
 --------   
@@ -15,7 +15,7 @@
   * Symbols and accented characters are fully supported.
   * Hyperlinks. 
   * Saving a document in HTML format.
-  * Save to *.pdf using /usr/X11R6/bin/rtf2pdf.sh
+  * Save to *.pdf using /usr/local/bin/rtf2pdf.sh
   * Numbered or bulleted lists 
 
 WWW: http://www.nllgg.nl/Ted/
diff -urN /usr/ports/editors/ted/pkg-plist editors/ted/pkg-plist
--- /usr/ports/editors/ted/pkg-plist	2005-02-26 15:56:03.000000000 +0900
+++ editors/ted/pkg-plist	2009-06-24 01:13:45.000000000 +0900
@@ -1,22 +1,48 @@
 bin/Ted
 bin/rtf2pdf.sh
 bin/rtf2ps.sh
-share/Ted/afm/Courier-Bold.afm
-share/Ted/afm/Courier-BoldOblique.afm
-share/Ted/afm/Courier-Oblique.afm
-share/Ted/afm/Courier.afm
-share/Ted/afm/Helvetica-Bold.afm
-share/Ted/afm/Helvetica-BoldOblique.afm
-share/Ted/afm/Helvetica-Oblique.afm
-share/Ted/afm/Helvetica.afm
-share/Ted/afm/Symbol.afm
-share/Ted/afm/Times-Bold.afm
-share/Ted/afm/Times-BoldItalic.afm
-share/Ted/afm/Times-Italic.afm
-share/Ted/afm/Times-Roman.afm
-share/Ted/ind/US_English.ind
+bin/rtf2txt.sh
+%%DATADIR%%/afm/AvantGarde-Book.afm
+%%DATADIR%%/afm/AvantGarde-BookOblique.afm
+%%DATADIR%%/afm/AvantGarde-Demi.afm
+%%DATADIR%%/afm/AvantGarde-DemiOblique.afm
+%%DATADIR%%/afm/Bookman-Demi.afm
+%%DATADIR%%/afm/Bookman-DemiItalic.afm
+%%DATADIR%%/afm/Bookman-Light.afm
+%%DATADIR%%/afm/Bookman-LightItalic.afm
+%%DATADIR%%/afm/Courier-Bold.afm
+%%DATADIR%%/afm/Courier-BoldOblique.afm
+%%DATADIR%%/afm/Courier-Oblique.afm
+%%DATADIR%%/afm/Courier.afm
+%%DATADIR%%/afm/Helvetica-Bold.afm
+%%DATADIR%%/afm/Helvetica-BoldOblique.afm
+%%DATADIR%%/afm/Helvetica-Narrow-Bold.afm
+%%DATADIR%%/afm/Helvetica-Narrow-BoldOblique.afm
+%%DATADIR%%/afm/Helvetica-Narrow-Oblique.afm
+%%DATADIR%%/afm/Helvetica-Narrow.afm
+%%DATADIR%%/afm/Helvetica-Oblique.afm
+%%DATADIR%%/afm/Helvetica.afm
+%%DATADIR%%/afm/NewCenturySchlbk-Bold.afm
+%%DATADIR%%/afm/NewCenturySchlbk-BoldItalic.afm
+%%DATADIR%%/afm/NewCenturySchlbk-Italic.afm
+%%DATADIR%%/afm/NewCenturySchlbk-Roman.afm
+%%DATADIR%%/afm/Palatino-Bold.afm
+%%DATADIR%%/afm/Palatino-BoldItalic.afm
+%%DATADIR%%/afm/Palatino-Italic.afm
+%%DATADIR%%/afm/Palatino-Roman.afm
+%%DATADIR%%/afm/Symbol.afm
+%%DATADIR%%/afm/Times-Bold.afm
+%%DATADIR%%/afm/Times-BoldItalic.afm
+%%DATADIR%%/afm/Times-Italic.afm
+%%DATADIR%%/afm/Times-Roman.afm
+%%DATADIR%%/afm/ZapfChancery-MediumItalic.afm
+%%DATADIR%%/afm/ZapfDingbats.afm
+%%DATADIR%%/dfa/en_US.dfa
+%%DATADIR%%/gsfontmetrics.ps
+%%DATADIR%%/gslibpath.ps
+%%DATADIR%%/gslsfonts.ps
 %%PORTDOCS%%%%DOCSDIR%%/TedDocument-en_US.rtf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/Ted/ind
-@dirrm share/Ted/afm
-@dirrm share/Ted
+@dirrm %%DATADIR%%/dfa
+@dirrm %%DATADIR%%/afm
+@dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: dhn 
Responsible-Changed-When: Thu Jun 25 19:04:03 UTC 2009 
Responsible-Changed-Why:  
miwi want it :) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136043 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Fri Jun 26 10:30:49 UTC 2009 
State-Changed-Why:  

Hi Kato 

Build failed here: 

http://64bit.miwibox.org/index.php?action=describe_port&id=1031 
http://32bit.miwibox.org/index.php?action=describe_port&id=1019 

Like you please to take a look 


http://www.freebsd.org/cgi/query-pr.cgi?pr=136043 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jul 4 20:55:54 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/136043: commit references a PR
Date: Sat,  4 Jul 2009 20:54:46 +0000 (UTC)

 miwi        2009-07-04 20:54:37 UTC
 
   FreeBSD ports repository
 
   Modified files:
     editors/ted          Makefile distinfo pkg-descr pkg-plist 
     editors/ted/files    configure 
   Added files:
     editors/ted/files    patch-Ted__makefile.in 
   Log:
   - Update to 2.20
   
   PR:             136043
   Submitted by:   Ports Fury
   
   Revision  Changes    Path
   1.29      +35 -21    ports/editors/ted/Makefile
   1.7       +3 -3      ports/editors/ted/distinfo
   1.3       +1 -1      ports/editors/ted/files/configure
   1.1       +12 -0     ports/editors/ted/files/patch-Ted__makefile.in (new)
   1.5       +2 -2      ports/editors/ted/pkg-descr
   1.5       +43 -17    ports/editors/ted/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
