Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  8 Feb 2013 21:37:47 +0800 (CST)
From:      Po-Chien Lin <linpc@cs.nctu.edu.tw>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/175956: [PATCH] editors/ted: update to 2.23, take maintainership
Message-ID:  <20130208133747.5F1265812C@dev.linpc.org>
Resent-Message-ID: <201302081340.r18De1vL087377@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         175956
>Category:       ports
>Synopsis:       [PATCH] editors/ted: update to 2.23, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 08 13:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Po-Chien Lin
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dev.linpc.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Sat Jan  5 22:32:49 CST
>Description:
- Update to 2.23
- Take maintainership
- Remove ABI version nember of LIB_DEPENDS
- Rename patch to pet portlint(1)
- Sort pkg-plist

Added file(s):
- files/patch-appUtil-utilPrinter.c

Removed file(s):
- files/patch-appUtil::utilPrinter.c

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- ted-2.23.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/editors/ted/Makefile ./Makefile
--- /usr/ports/editors/ted/Makefile	2013-01-05 22:45:19.757029912 +0800
+++ ./Makefile	2013-02-08 12:20:42.540362080 +0800
@@ -1,29 +1,26 @@
-# Ports collection makefile for:  ted
-# Date created:			  23 Aug 2001
-# Whom:				  Kris Kennaway <kris@FreeBSD.org>
-#
+# Created by: Kris Kennaway <kris@FreeBSD.org>
 # $FreeBSD: head/editors/ted/Makefile 308630 2012-12-10 19:11:11Z mm $
-#
 
 PORTNAME=	ted
-PORTVERSION=	2.22
-PORTREVISION=	2
+PORTVERSION=	2.23
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
+MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
+		http://fossies.org/linux/misc/
 EXTRACT_SUFX=	.src.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	linpc@cs.nctu.edu.tw
 COMMENT=	X11 based RTF editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
 		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		paper.2:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+		tiff:${PORTSDIR}/graphics/tiff \
+		paper:${PORTSDIR}/print/libpaper
+RUN_DEPENDS=	gsfonts>0:${PORTSDIR}/print/gsfonts
 
 OPTIONS_DEFINE=	GTK2 DOCS
+GTK2_DESC=	Use GTK2 instead of MOTIF
 
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
@@ -58,7 +55,7 @@
 .endif
 
 post-extract:
-	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
+	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedDatadir.tar
 	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
 
 post-patch:
@@ -72,18 +69,18 @@
 
 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
+	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/examples/rtf2*.sh ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/Ted.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/rtf2*.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/*.ps ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/ps/*.ps ${DATADIR}
 	@${MKDIR} ${AFMDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/afm/*.afm ${AFMDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/*.afm ${AFMDIR}
 	@${MKDIR} ${INDDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/dfa/*.dfa ${INDDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/dfa/*.dfa ${INDDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/editors/ted/distinfo ./distinfo
--- /usr/ports/editors/ted/distinfo	2013-01-05 22:45:19.757029912 +0800
+++ ./distinfo	2013-02-08 10:32:17.120332052 +0800
@@ -1,2 +1,2 @@
-SHA256 (ted-2.22.src.tar.gz) = 93040d5ff259dbf7707a97f8c1ab4a7c1ec8adae63d35760e20dd6f60520fa4a
-SIZE (ted-2.22.src.tar.gz) = 4267772
+SHA256 (ted-2.23.src.tar.gz) = 3fa992c2bc96af3ca788ef941cb5314f4a1d843202efd0201b8b4ee9adbf316c
+SIZE (ted-2.23.src.tar.gz) = 4672208
diff -ruN --exclude=CVS /usr/ports/editors/ted/files/patch-Ted__makefile.in ./files/patch-Ted__makefile.in
--- /usr/ports/editors/ted/files/patch-Ted__makefile.in	2013-01-05 22:45:19.767074323 +0800
+++ ./files/patch-Ted__makefile.in	2013-02-08 10:36:52.060342825 +0800
@@ -1,6 +1,6 @@
 --- Ted/makefile.in.orig	2012-04-01 18:57:26.000000000 +0900
 +++ Ted/makefile.in	2012-04-09 20:45:17.000000000 +0900
-@@ -56,7 +56,8 @@
+@@ -57,7 +57,8 @@
  	-I../bitmap		\
  	-I../ind		\
  	-I../include		\
diff -ruN --exclude=CVS /usr/ports/editors/ted/files/patch-appUtil-utilPrinter.c ./files/patch-appUtil-utilPrinter.c
--- /usr/ports/editors/ted/files/patch-appUtil-utilPrinter.c	1970-01-01 08:00:00.000000000 +0800
+++ ./files/patch-appUtil-utilPrinter.c	2013-02-08 10:38:28.850312629 +0800
@@ -0,0 +1,20 @@
+ $FreeBSD: head/editors/ted/files/patch-appUtil::utilPrinter.c 300896 2012-07-14 13:54:48Z beat $
+ 
+ --- appUtil/utilPrinter.c	Sun Aug 17 19:14:01 2003
+ +++ appUtil/utilPrinter.c	Sun Aug 17 19:15:54 2003
+ @@ -331,14 +331,14 @@
+      /*  1  */
+      if  ( count == 0 )
+  	{
+ -	utilPrinterGetLprPrinters(  "( lpc status ) 2>/dev/null",
+ +	utilPrinterGetLprPrinters(  "( lpc status all) 2>/dev/null",
+  						&defaultPrinter, &count, &pd );
+  	}
+  
+      /*  1b  */
+      if  ( count == 0 )
+  	{
+ -	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status ) 2>/dev/null",
+ +	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status all) 2>/dev/null",
+  						&defaultPrinter, &count, &pd );
+  	}
diff -ruN --exclude=CVS /usr/ports/editors/ted/files/patch-appUtil::utilPrinter.c ./files/patch-appUtil::utilPrinter.c
--- /usr/ports/editors/ted/files/patch-appUtil::utilPrinter.c	2013-01-05 22:45:19.767074323 +0800
+++ ./files/patch-appUtil::utilPrinter.c	1970-01-01 08:00:00.000000000 +0800
@@ -1,20 +0,0 @@
- $FreeBSD: head/editors/ted/files/patch-appUtil::utilPrinter.c 300896 2012-07-14 13:54:48Z beat $
- 
- --- appUtil/utilPrinter.c	Sun Aug 17 19:14:01 2003
- +++ appUtil/utilPrinter.c	Sun Aug 17 19:15:54 2003
- @@ -281,14 +281,14 @@
-      /*  1  */
-      if  ( count == 0 )
-  	{
- -	utilPrinterGetLprPrinters(  "( lpc status ) 2>/dev/null",
- +	utilPrinterGetLprPrinters(  "( lpc status all) 2>/dev/null",
-  						&defaultPrinter, &count, &pd );
-  	}
-  
-      /*  1b  */
-      if  ( count == 0 )
-  	{
- -	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status ) 2>/dev/null",
- +	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status all) 2>/dev/null",
-  						&defaultPrinter, &count, &pd );
-  	}
diff -ruN --exclude=CVS /usr/ports/editors/ted/pkg-plist ./pkg-plist
--- /usr/ports/editors/ted/pkg-plist	2013-01-05 22:45:23.527049467 +0800
+++ ./pkg-plist	2013-02-08 10:53:47.520337773 +0800
@@ -1,9 +1,9 @@
 bin/Ted
+bin/rtf2epub.sh
+bin/rtf2html.sh
 bin/rtf2pdf.sh
 bin/rtf2ps.sh
 bin/rtf2txt.sh
-bin/rtf2epub.sh
-bin/rtf2html.sh
 %%DATADIR%%/afm/AvantGarde-Book.afm
 %%DATADIR%%/afm/AvantGarde-BookOblique.afm
 %%DATADIR%%/afm/AvantGarde-Demi.afm
--- ted-2.23.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130208133747.5F1265812C>