cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version 2.11

Browse Source
This commit is contained in:
espie 2002-03-25 20:21:54 +00:00
parent 510e6a561c
commit 9642761765
4 changed files with 12 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editors/ted/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2002/03/21 20:46:26 espie Exp $
# $OpenBSD: Makefile,v 1.7 2002/03/25 20:21:54 espie Exp $
COMMENT= "X11 based RTF editor"
V=2.10
V=2.11
DISTNAME= ted-$V
CATEGORIES= editors textproc print
NEED_VERSION= 1.515
@ -33,14 +33,15 @@ post-extract:
cd ${WRKDIST}/tedPackage && tar xf TedBindist.tar
post-patch:
cd ${WRKDIST}/tedPackage/info && \
cd ${WRKDIST}/tedPackage/Ted && \
sed -e 's,/usr/local/afm,${AFMDIR},' \
-e 's,/usr/local/ind,${INDDIR},' \
-e 's,/usr/local/info,${INFODIR},' \
-e 's,/usr/local/Ted/TedDocument-en_US.rtf,${INFODIR}/TedDocument-en_US.rtf,' \
Ted.ad.sample >Ted
for d in ${WRKSRC}/Ted ${WRKSRC}/appFrame; do \
cd $$d && \
mv -f config.h.in config.h.in.bak && \
touch config.h.in && mv -f config.h.in config.h.in.bak && \
echo '#define PREFIX "${PREFIX}"' >config.h.in && \
echo '#define INFODIR "${INFODIR}"' >>config.h.in && \
echo '#define INDDIR "${INDDIR}"' >>config.h.in && \
@ -56,7 +57,7 @@ do-install:
${INSTALL_DATA} ${WRKDIST}/tedPackage/afm/* ${AFMDIR}
${INSTALL_DATA_DIR} ${INDDIR}
${INSTALL_DATA_DIR} ${INFODIR}
${INSTALL_DATA} ${WRKDIST}/tedPackage/info/TedDocument.rtf ${INFODIR}
${INSTALL_DATA} ${WRKDIST}/tedPackage/info/Ted ${PREFIX}/lib/X11/app-defaults
${INSTALL_DATA} ${WRKDIST}/tedPackage/Ted/TedDocument-en_US.rtf ${INFODIR}
${INSTALL_DATA} ${WRKDIST}/tedPackage/Ted/Ted ${PREFIX}/lib/X11/app-defaults
.include <bsd.port.mk>

6
editors/ted/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ted-2.10.src.tar.gz) = 32758a4b0dd6d5cd3926960859cc8d54
RMD160 (ted-2.10.src.tar.gz) = abbcdf4d6bbd360c840337d61ad7800871b6101a
SHA1 (ted-2.10.src.tar.gz) = 22768b3c433129fcabc0513305d29fbb185e7976
MD5 (ted-2.11.src.tar.gz) = 04b6f9a142f9c23e2022f89065c126e8
RMD160 (ted-2.11.src.tar.gz) = e3db36b243703648398e62a53b027fc1296bf580
SHA1 (ted-2.11.src.tar.gz) = d4f0ff443a2632d7f665cea8999045b2dbea40a6

106
editors/ted/patches/patch-bitmap_bmpng_c
View File

@ -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;
}

5
editors/ted/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2001/07/13 13:28:28 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2002/03/25 20:21:54 espie Exp $
bin/Ted
lib/X11/app-defaults/Ted
share/Ted/afm/Courier-Bold.afm
@ -14,9 +14,8 @@ 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/doc/Ted/TedDocument.rtf
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