Date: Fri, 26 Jul 2002 16:51:25 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/41030: Update port: editors/ted to 2.11 Message-ID: <200207262351.g6QNpPMc038319@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 41030 >Category: ports >Synopsis: Update port: editors/ted to 2.11 >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: Fri Jul 26 17:00:05 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.11 Remove file: files/patch-aa files/patch-ab >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/ted/Makefile editors/ted/Makefile --- /usr/ports/editors/ted/Makefile Sat Jun 22 02:04:00 2002 +++ editors/ted/Makefile Thu Jul 25 00:33:07 2002 @@ -6,8 +6,7 @@ # PORTNAME= ted -PORTVERSION= 2.10 -PORTREVISION= 1 +PORTVERSION= 2.11 CATEGORIES= editors textproc print MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ EXTRACT_SUFX= .src.tar.gz @@ -20,29 +19,33 @@ WRKSRC= ${WRKDIR}/Ted-${PORTVERSION} -USE_REINPLACE= yes USE_X_PREFIX= yes -USE_MOTIF= yes +USE_XPM= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/Ted CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" -CONFIGURE_ARGS= --with-MOTIF +CONFIGURE_ARGS= --with-GTK +MAKE_ENV= DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \ + DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}\\\"\"" \ + DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${INFODIR}/\\\"\"" ALL_TARGET= compile.shared AFMDIR= ${PREFIX}/share/Ted/afm -INDDIR= ${PREFIX}/share/Ted/ind +INDDIR= ${PREFIX}/share/Ted/ind INFODIR= ${PREFIX}/share/doc/Ted post-extract: cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar post-patch: - cd ${WRKSRC}/tedPackage/info && \ - ${SED} -e 's,/usr/local/afm,${AFMDIR},' \ - -e 's,/usr/local/ind,${INDDIR},' \ - -e 's,/usr/local/info,${INFODIR},' \ - Ted.ad.sample >Ted - ${REINPLACE_CMD} -e 's|/usr/apps|${LOCALBASE}|g' ${WRKSRC}/bitmap/configure + ${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|/usr/apps|${LOCALBASE}|g ; \ + s|gtk-config|${GTK_CONFIG:T}|g' + ${REINPLACE_CMD} \ + 's|DEF_PKGDIR|DEF_DOCUMENT_DIR|g' ${WRKSRC}/Ted/makefile.in post-configure: .for dir in appFrame appUtil bitmap ind libreg @@ -55,8 +58,8 @@ @${MKDIR} ${AFMDIR} ${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/* ${AFMDIR} @${MKDIR} ${INDDIR} + ${INSTALL_DATA} ${WRKSRC}/tedPackage/ind/US_English.ind ${INDDIR} @${MKDIR} ${INFODIR} - ${INSTALL_DATA} ${WRKSRC}/tedPackage/info/TedDocument.rtf ${INFODIR} - ${INSTALL_DATA} ${WRKSRC}/tedPackage/info/Ted ${PREFIX}/lib/X11/app-defaults + ${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${INFODIR} .include <bsd.port.mk> diff -urN /usr/ports/editors/ted/distinfo editors/ted/distinfo --- /usr/ports/editors/ted/distinfo Fri Aug 24 17:32:19 2001 +++ editors/ted/distinfo Wed Jul 24 03:17:25 2002 @@ -1 +1 @@ -MD5 (ted-2.10.src.tar.gz) = 32758a4b0dd6d5cd3926960859cc8d54 +MD5 (ted-2.11.src.tar.gz) = 04b6f9a142f9c23e2022f89065c126e8 diff -urN /usr/ports/editors/ted/files/patch-aa editors/ted/files/patch-aa --- /usr/ports/editors/ted/files/patch-aa Fri Aug 24 17:32:19 2001 +++ editors/ted/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ -$OpenBSD: patch-appFrame_appFileChooserMotif_c,v 1.2 2001/07/13 13:28:25 espie Exp $ ---- appFrame/appFileChooserMotif.c.orig Sun Apr 8 18:05:30 2001 -+++ appFrame/appFileChooserMotif.c Fri Jul 13 15:04:41 2001 -@@ -524,7 +524,7 @@ static int appMakeFileChooser( AppChoose - XtSetArg( al[ac], XmNuseAsyncGeometry, True ); ac++; - - XtSetArg( al[ac], XmNchildPlacement,XmPLACE_ABOVE_SELECTION ); ac++; --# if XmVersion >= 2000 -+# if XmVersion >= 2000 && !defined(LESSTIF_VERSION) - XtSetArg( al[ac], XmNfileFilterStyle, - XmFILTER_HIDDEN_FILES ); ac++; - # endif diff -urN /usr/ports/editors/ted/files/patch-ab editors/ted/files/patch-ab --- /usr/ports/editors/ted/files/patch-ab Fri Aug 24 17:32:20 2001 +++ editors/ted/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,106 +0,0 @@ -$OpenBSD: patch-bitmap_bmpng_c,v 1.1 2001/07/13 13:28:26 espie Exp $ ---- bitmap/bmpng.c.orig Fri Jul 13 15:07:41 2001 -+++ bitmap/bmpng.c Fri Jul 13 15:15:19 2001 -@@ -148,7 +148,7 @@ int bmReadPngFile( const char * filenam - FILE * f; - - png_struct png; -- png_info pngi; -+ png_infop pngi; - - unsigned char * buffer; - -@@ -167,30 +167,30 @@ int bmReadPngFile( const char * filenam - if ( setjmp( png.jmpbuf ) ) - { - SDEB(filename); -- png_read_destroy( &png, &pngi, (png_info *)0 ); -+ png_read_destroy( &png, pngi, (png_info *)0 ); - fclose( f ); - return -1; - } - -- png_info_init( &pngi ); -+ pngi = png_create_info_struct(&png); - png_read_init( &png ); - - png_init_io( &png, f ); - -- png_read_info( &png, &pngi ); -+ png_read_info( &png, pngi ); - -- if ( bpPngiToBitmap( &pngi, bd ) ) -+ if ( bpPngiToBitmap( pngi, bd ) ) - { - LLDEB(bd->bdColorCount,bd->bdRGB8Palette); -- png_read_destroy( &png, &pngi, (png_info *)0 ); -+ png_read_destroy( &png, pngi, (png_info *)0 ); - fclose( f ); - return -1; - } - -- if ( bmPngReadContents( &pngi, &png, bd, &buffer ) ) -+ if ( bmPngReadContents( pngi, &png, bd, &buffer ) ) - { - LLDEB(bd->bdBufferLength,buffer); -- png_read_destroy( &png, &pngi, (png_info *)0 ); -+ png_read_destroy( &png, pngi, (png_info *)0 ); - fclose( f ); - return -1; - } -@@ -200,6 +200,8 @@ int bmReadPngFile( const char * filenam - *pBuffer= buffer; - *pPrivateFormat= 0; - -+ png_destroy_info_struct(&png, &pngi); -+ - return 0; - } - -@@ -227,37 +229,38 @@ int bmPngReadPng( BitmapDescription * bd - SimpleInputStream * sis ) - { - png_struct png; -- png_info pngi; -+ png_infop pngi; - - unsigned char * buffer; - - if ( setjmp( png.jmpbuf ) ) -- { LDEB(1); png_read_destroy( &png, &pngi, (png_info *)0 ); return -1; } -+ { LDEB(1); png_read_destroy( &png, pngi, (png_info *)0 ); return -1; } - -- png_info_init( &pngi ); -+ pngi = png_create_info_struct(&png); - png_read_init( &png ); - - png_init_io( &png, (FILE *)0 ); - png_set_read_fn( &png, (void *)sis, bmReadPngBytes ); - -- png_read_info( &png, &pngi ); -+ png_read_info( &png, pngi ); - -- if ( bpPngiToBitmap( &pngi, bd ) ) -+ if ( bpPngiToBitmap( pngi, bd ) ) - { - LLDEB(bd->bdColorCount,bd->bdRGB8Palette); -- png_read_destroy( &png, &pngi, (png_info *)0 ); -+ png_read_destroy( &png, pngi, (png_info *)0 ); - return -1; - } - -- if ( bmPngReadContents( &pngi, &png, bd, &buffer ) ) -+ if ( bmPngReadContents( pngi, &png, bd, &buffer ) ) - { - LLDEB(bd->bdBufferLength,buffer); -- png_read_destroy( &png, &pngi, (png_info *)0 ); -+ png_read_destroy( &png, pngi, (png_info *)0 ); - return -1; - } - - *pBuffer= buffer; - -+ png_destroy_info_struct(&png, &pngi); - return 0; - } - diff -urN /usr/ports/editors/ted/pkg-plist editors/ted/pkg-plist --- /usr/ports/editors/ted/pkg-plist Fri Aug 24 17:32:19 2001 +++ editors/ted/pkg-plist Thu Jul 25 00:26:27 2002 @@ -1,5 +1,4 @@ bin/Ted -lib/X11/app-defaults/Ted share/Ted/afm/Courier-Bold.afm share/Ted/afm/Courier-BoldOblique.afm share/Ted/afm/Courier-Oblique.afm @@ -13,9 +12,9 @@ share/Ted/afm/Times-BoldItalic.afm share/Ted/afm/Times-Italic.afm share/Ted/afm/Times-Roman.afm -share/doc/Ted/TedDocument.rtf +share/Ted/ind/US_English.ind +share/doc/Ted/TedDocument-en_US.rtf @dirrm share/doc/Ted -@exec mkdir -p %D/share/Ted/ind @dirrm share/Ted/ind @dirrm share/Ted/afm @dirrm share/Ted >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?200207262351.g6QNpPMc038319>