diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-10-24 23:37:25 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-10-24 23:37:25 +0000 |
| commit | 4acc6fb2a411b291c9c210d82bafe7c62e71c77d (patch) | |
| tree | bc16420eb52d65511ceb520c00171d219210a473 /print | |
| parent | Mark as broken on amd64-7 (and, presumably, sparc64-7). (diff) | |
Presenting GNOME 2.20.1 and all related works for FreeBSD. The official
GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).
The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD. This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.
This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully. Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).
The FreeBSD GNOME team would also like to thank our various testers and
contributors:
Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)
PRs fixed in this release:
111272, 113470, 115995, 116338
Notes
Notes:
svn path=/head/; revision=201947
Diffstat (limited to 'print')
27 files changed, 168 insertions, 683 deletions
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 9ee188f0cc5e..18aa8a24f00c 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -3,11 +3,11 @@ # Whom: jseger@FreeBSD.org # # $FreeBSD$ +# $MCom: ports/print/freetype2/Makefile,v 1.11 2007/07/06 16:59:40 marcus Exp $ # PORTNAME= freetype2 -PORTVERSION= 2.2.1 -PORTREVISION= 2 +PORTVERSION= 2.3.5 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \ diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo index 208832af0a19..6c426d1468f9 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -1,3 +1,3 @@ -MD5 (freetype-2.2.1.tar.bz2) = 5b2f827082c544392a7701f7423f0781 -SHA256 (freetype-2.2.1.tar.bz2) = 0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006 -SIZE (freetype-2.2.1.tar.bz2) = 1212258 +MD5 (freetype-2.3.5.tar.bz2) = 65234327c5ac46ee00ebda15995d4c1c +SHA256 (freetype-2.3.5.tar.bz2) = 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e +SIZE (freetype-2.3.5.tar.bz2) = 1279861 diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa index 87863d444bb2..32efc9a5d18d 100644 --- a/print/freetype2/files/patch-aa +++ b/print/freetype2/files/patch-aa @@ -1,6 +1,16 @@ ---- builds/unix/detect.mk.orig Tue Aug 22 17:53:59 2006 -+++ builds/unix/detect.mk Tue Aug 22 17:54:09 2006 -@@ -78,9 +78,9 @@ ifeq ($(PLATFORM),unix) +--- builds/unix/detect.mk.orig 2006-12-09 13:51:54.000000000 -0500 ++++ builds/unix/detect.mk 2007-07-06 12:55:05.000000000 -0400 +@@ -21,6 +21,9 @@ ifeq ($(PLATFORM),ansi) + is_unix := $(strip $(wildcard /sbin/init) \ + $(wildcard /usr/sbin/init) \ + $(wildcard /hurd/auth)) ++ # FreeBSD is "unix" so just mandate this to fix the build in ++ # jails that do not have init (see PR#113470). ++ is_unix := true + ifneq ($(is_unix),) + + PLATFORM := unix +@@ -79,9 +82,9 @@ ifeq ($(PLATFORM),unix) ifdef must_configure ifneq ($(have_Makefile),) # we are building FT2 not in the src tree diff --git a/print/freetype2/files/patch-src_pcf_pcfdrivr.c b/print/freetype2/files/patch-src_pcf_pcfdrivr.c deleted file mode 100644 index 01758d8a9091..000000000000 --- a/print/freetype2/files/patch-src_pcf_pcfdrivr.c +++ /dev/null @@ -1,50 +0,0 @@ ---- src/pcf/pcfdrivr.c.orig 2006-02-17 07:40:36.000000000 +0100 -+++ src/pcf/pcfdrivr.c -@@ -203,19 +203,23 @@ THE SOFTWARE. - - /* free properties */ - { -- PCF_Property prop = face->properties; -+ PCF_Property prop; - FT_Int i; - - -- for ( i = 0; i < face->nprops; i++ ) -+ if ( face->properties ) - { -- prop = &face->properties[i]; -+ for ( i = 0; i < face->nprops; i++ ) -+ { -+ prop = &face->properties[i]; - -- FT_FREE( prop->name ); -- if ( prop->isString ) -- FT_FREE( prop->value.atom ); -+ if ( prop ) { -+ FT_FREE( prop->name ); -+ if ( prop->isString ) -+ FT_FREE( prop->value.atom ); -+ } -+ } - } -- - FT_FREE( face->properties ); - } - -@@ -258,6 +262,8 @@ THE SOFTWARE. - FT_Error error2; - - -+ PCF_Face_Done( pcfface ); -+ - /* this didn't work, try gzip support! */ - error2 = FT_Stream_OpenGzip( &face->gzip_stream, stream ); - if ( FT_ERROR_BASE( error2 ) == FT_Err_Unimplemented_Feature ) -@@ -357,6 +363,7 @@ THE SOFTWARE. - - Fail: - FT_TRACE2(( "[not a valid PCF file]\n" )); -+ PCF_Face_Done( pcfface ); - error = PCF_Err_Unknown_File_Format; /* error */ - goto Exit; - } diff --git a/print/freetype2/files/patch-src_pcf_pcfread.c b/print/freetype2/files/patch-src_pcf_pcfread.c deleted file mode 100644 index c9117f2062cc..000000000000 --- a/print/freetype2/files/patch-src_pcf_pcfread.c +++ /dev/null @@ -1,455 +0,0 @@ ---- src/pcf/pcfread.c.orig 2006-01-23 17:35:18.000000000 +0100 -+++ src/pcf/pcfread.c -@@ -102,7 +102,8 @@ THE SOFTWARE. - return PCF_Err_Cannot_Open_Resource; - - if ( toc->version != PCF_FILE_VERSION || -- toc->count > FT_ARRAY_MAX( face->toc.tables ) ) -+ toc->count > FT_ARRAY_MAX( face->toc.tables ) || -+ toc->count == 0 ) - return PCF_Err_Invalid_File_Format; - - if ( FT_NEW_ARRAY( face->toc.tables, toc->count ) ) -@@ -116,6 +117,41 @@ THE SOFTWARE. - tables++; - } - -+ /* Sort tables and check for overlaps. Because they are almost */ -+ /* always ordered already, an in-place bubble sort with simultaneous */ -+ /* boundary checking seems appropriate. */ -+ tables = face->toc.tables; -+ -+ for ( n = 0; n < toc->count - 1; n++ ) -+ { -+ FT_UInt i, have_change; -+ -+ -+ have_change = 0; -+ -+ for ( i = 0; i < toc->count - 1 - n; i++ ) -+ { -+ PCF_TableRec tmp; -+ -+ -+ if ( tables[i].offset > tables[i + 1].offset ) -+ { -+ tmp = tables[i]; -+ tables[i] = tables[i + 1]; -+ tables[i + 1] = tmp; -+ -+ have_change = 1; -+ } -+ -+ if ( ( tables[i].size > tables[i + 1].offset ) || -+ ( tables[i].offset > tables[i + 1].offset - tables[i].size ) ) -+ return PCF_Err_Invalid_Offset; -+ } -+ -+ if ( !have_change ) -+ break; -+ } -+ - #if defined( FT_DEBUG_LEVEL_TRACE ) - - { -@@ -130,7 +166,8 @@ THE SOFTWARE. - tables = face->toc.tables; - for ( i = 0; i < toc->count; i++ ) - { -- for( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] ); j++ ) -+ for ( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] ); -+ j++ ) - if ( tables[i].type == (FT_UInt)( 1 << j ) ) - name = tableNames[j]; - -@@ -153,13 +190,15 @@ THE SOFTWARE. - } - - -+#define PCF_METRIC_SIZE 12 -+ - static - const FT_Frame_Field pcf_metric_header[] = - { - #undef FT_STRUCTURE - #define FT_STRUCTURE PCF_MetricRec - -- FT_FRAME_START( 12 ), -+ FT_FRAME_START( PCF_METRIC_SIZE ), - FT_FRAME_SHORT_LE( leftSideBearing ), - FT_FRAME_SHORT_LE( rightSideBearing ), - FT_FRAME_SHORT_LE( characterWidth ), -@@ -176,7 +215,7 @@ THE SOFTWARE. - #undef FT_STRUCTURE - #define FT_STRUCTURE PCF_MetricRec - -- FT_FRAME_START( 12 ), -+ FT_FRAME_START( PCF_METRIC_SIZE ), - FT_FRAME_SHORT( leftSideBearing ), - FT_FRAME_SHORT( rightSideBearing ), - FT_FRAME_SHORT( characterWidth ), -@@ -187,13 +226,15 @@ THE SOFTWARE. - }; - - -+#define PCF_COMPRESSED_METRIC_SIZE 5 -+ - static - const FT_Frame_Field pcf_compressed_metric_header[] = - { - #undef FT_STRUCTURE - #define FT_STRUCTURE PCF_Compressed_MetricRec - -- FT_FRAME_START( 5 ), -+ FT_FRAME_START( PCF_COMPRESSED_METRIC_SIZE ), - FT_FRAME_BYTE( leftSideBearing ), - FT_FRAME_BYTE( rightSideBearing ), - FT_FRAME_BYTE( characterWidth ), -@@ -221,7 +262,7 @@ THE SOFTWARE. - ? pcf_metric_msb_header - : pcf_metric_header; - -- /* the following sets 'error' but doesn't return in case of failure */ -+ /* the following sets `error' but doesn't return in case of failure */ - (void)FT_STREAM_READ_FIELDS( fields, metric ); - } - else -@@ -261,17 +302,19 @@ THE SOFTWARE. - for ( i = 0; i < ntables; i++ ) - if ( tables[i].type == type ) - { -- if ( stream->pos > tables[i].offset ) { -+ if ( stream->pos > tables[i].offset ) -+ { - error = PCF_Err_Invalid_Stream_Skip; - goto Fail; - } - -- if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) ) { -+ if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) ) -+ { - error = PCF_Err_Invalid_Stream_Skip; - goto Fail; - } - -- *asize = tables[i].size; /* unused - to be removed */ -+ *asize = tables[i].size; - *aformat = tables[i].format; - - return PCF_Err_Ok; -@@ -298,13 +341,15 @@ THE SOFTWARE. - } - - -+#define PCF_PROPERTY_SIZE 9 -+ - static - const FT_Frame_Field pcf_property_header[] = - { - #undef FT_STRUCTURE - #define FT_STRUCTURE PCF_ParsePropertyRec - -- FT_FRAME_START( 9 ), -+ FT_FRAME_START( PCF_PROPERTY_SIZE ), - FT_FRAME_LONG_LE( name ), - FT_FRAME_BYTE ( isString ), - FT_FRAME_LONG_LE( value ), -@@ -318,7 +363,7 @@ THE SOFTWARE. - #undef FT_STRUCTURE - #define FT_STRUCTURE PCF_ParsePropertyRec - -- FT_FRAME_START( 9 ), -+ FT_FRAME_START( PCF_PROPERTY_SIZE ), - FT_FRAME_LONG( name ), - FT_FRAME_BYTE( isString ), - FT_FRAME_LONG( value ), -@@ -353,8 +398,8 @@ THE SOFTWARE. - PCF_Face face ) - { - PCF_ParseProperty props = 0; -- PCF_Property properties = 0; -- FT_Int nprops, i; -+ PCF_Property properties; -+ FT_UInt nprops, i; - FT_ULong format, size; - FT_Error error; - FT_Memory memory = FT_FACE(face)->memory; -@@ -390,6 +435,15 @@ THE SOFTWARE. - - FT_TRACE4(( " nprop = %d\n", nprops )); - -+ /* rough estimate */ -+ if ( nprops > size / PCF_PROPERTY_SIZE ) -+ { -+ error = PCF_Err_Invalid_Table; -+ goto Bail; -+ } -+ -+ face->nprops = nprops; -+ - if ( FT_NEW_ARRAY( props, nprops ) ) - goto Bail; - -@@ -427,6 +481,13 @@ THE SOFTWARE. - - FT_TRACE4(( " string_size = %ld\n", string_size )); - -+ /* rough estimate */ -+ if ( string_size > size - nprops * PCF_PROPERTY_SIZE ) -+ { -+ error = PCF_Err_Invalid_Table; -+ goto Bail; -+ } -+ - if ( FT_NEW_ARRAY( strings, string_size ) ) - goto Bail; - -@@ -437,13 +498,24 @@ THE SOFTWARE. - if ( FT_NEW_ARRAY( properties, nprops ) ) - goto Bail; - -+ face->properties = properties; -+ - for ( i = 0; i < nprops; i++ ) - { -- /* XXX: make atom */ -+ FT_Long name_offset = props[i].name; -+ -+ -+ if ( ( name_offset < 0 ) || -+ ( (FT_ULong)name_offset > string_size ) ) -+ { -+ error = PCF_Err_Invalid_Offset; -+ goto Bail; -+ } -+ - if ( FT_NEW_ARRAY( properties[i].name, -- ft_strlen( strings + props[i].name ) + 1 ) ) -+ ft_strlen( strings + name_offset ) + 1 ) ) - goto Bail; -- ft_strcpy( properties[i].name, strings + props[i].name ); -+ ft_strcpy( properties[i].name, strings + name_offset ); - - FT_TRACE4(( " %s:", properties[i].name )); - -@@ -451,8 +523,18 @@ THE SOFTWARE. - - if ( props[i].isString ) - { -+ FT_Long value_offset = props[i].value; -+ -+ -+ if ( ( value_offset < 0 ) || -+ ( (FT_ULong)value_offset > string_size ) ) -+ { -+ error = PCF_Err_Invalid_Offset; -+ goto Bail; -+ } -+ - if ( FT_NEW_ARRAY( properties[i].value.atom, -- ft_strlen( strings + props[i].value ) + 1 ) ) -+ ft_strlen( strings + value_offset ) + 1 ) ) - goto Bail; - ft_strcpy( properties[i].value.atom, strings + props[i].value ); - -@@ -466,14 +548,8 @@ THE SOFTWARE. - } - } - -- face->properties = properties; -- face->nprops = nprops; -- -- FT_FREE( props ); -- FT_FREE( strings ); -- -- return PCF_Err_Ok; -- -+ error = PCF_Err_Ok; -+ - Bail: - FT_FREE( props ); - FT_FREE( strings ); -@@ -488,11 +564,9 @@ THE SOFTWARE. - { - FT_Error error = PCF_Err_Ok; - FT_Memory memory = FT_FACE(face)->memory; -- FT_ULong format = 0; -- FT_ULong size = 0; -+ FT_ULong format, size; - PCF_Metric metrics = 0; -- int i; -- int nmetrics = -1; -+ FT_ULong nmetrics, i; - - - error = pcf_seek_to_table_type( stream, -@@ -504,7 +578,8 @@ THE SOFTWARE. - if ( error ) - return error; - -- error = FT_READ_ULONG_LE( format ); -+ if ( FT_READ_ULONG_LE( format ) ) -+ goto Bail; - - if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) && - !PCF_FORMAT_MATCH( format, PCF_COMPRESSED_METRICS ) ) -@@ -524,16 +599,30 @@ THE SOFTWARE. - else - (void)FT_READ_USHORT_LE( nmetrics ); - } -- if ( error || nmetrics == -1 ) -+ if ( error ) - return PCF_Err_Invalid_File_Format; - - face->nmetrics = nmetrics; - -+ FT_TRACE4(( "pcf_get_metrics:\n" )); -+ -+ FT_TRACE4(( " number of metrics: %d\n", nmetrics )); -+ -+ /* rough estimate */ -+ if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) ) -+ { -+ if ( nmetrics > size / PCF_METRIC_SIZE ) -+ return PCF_Err_Invalid_Table; -+ } -+ else -+ { -+ if ( nmetrics > size / PCF_COMPRESSED_METRIC_SIZE ) -+ return PCF_Err_Invalid_Table; -+ } -+ - if ( FT_NEW_ARRAY( face->metrics, nmetrics ) ) - return PCF_Err_Out_Of_Memory; - -- FT_TRACE4(( "pcf_get_metrics:\n" )); -- - metrics = face->metrics; - for ( i = 0; i < nmetrics; i++ ) - { -@@ -541,7 +630,7 @@ THE SOFTWARE. - - metrics[i].bits = 0; - -- FT_TRACE4(( " idx %d: width=%d, " -+ FT_TRACE5(( " idx %d: width=%d, " - "lsb=%d, rsb=%d, ascent=%d, descent=%d, swidth=%d\n", - i, - ( metrics + i )->characterWidth, -@@ -557,6 +646,8 @@ THE SOFTWARE. - - if ( error ) - FT_FREE( face->metrics ); -+ -+ Bail: - return error; - } - -@@ -597,14 +688,16 @@ THE SOFTWARE. - if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) ) - return PCF_Err_Invalid_File_Format; - -+ FT_TRACE4(( "pcf_get_bitmaps:\n" )); -+ -+ FT_TRACE4(( " number of bitmaps: %d\n", nbitmaps )); -+ - if ( nbitmaps != face->nmetrics ) - return PCF_Err_Invalid_File_Format; - - if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) - return error; - -- FT_TRACE4(( "pcf_get_bitmaps:\n" )); -- - for ( i = 0; i < nbitmaps; i++ ) - { - if ( PCF_BYTE_ORDER( format ) == MSBFirst ) -@@ -612,7 +705,7 @@ THE SOFTWARE. - else - (void)FT_READ_LONG_LE( offsets[i] ); - -- FT_TRACE4(( " bitmap %d: offset %ld (0x%lX)\n", -+ FT_TRACE5(( " bitmap %d: offset %ld (0x%lX)\n", - i, offsets[i], offsets[i] )); - } - if ( error ) -@@ -640,15 +733,22 @@ THE SOFTWARE. - FT_UNUSED( sizebitmaps ); /* only used for debugging */ - - for ( i = 0; i < nbitmaps; i++ ) -- face->metrics[i].bits = stream->pos + offsets[i]; -+ { -+ /* rough estimate */ -+ if ( ( offsets[i] < 0 ) || -+ ( (FT_ULong)offsets[i] > size ) ) -+ { -+ FT_ERROR(( "pcf_get_bitmaps:")); -+ FT_ERROR(( " invalid offset to bitmap data of glyph %d\n", i )); -+ } -+ else -+ face->metrics[i].bits = stream->pos + offsets[i]; -+ } - - face->bitmapsFormat = format; - -- FT_FREE ( offsets ); -- return error; -- - Bail: -- FT_FREE ( offsets ); -+ FT_FREE( offsets ); - return error; - } - -@@ -734,7 +834,7 @@ THE SOFTWARE. - - tmpEncoding[j].glyph = (FT_Short)encodingOffset; - -- FT_TRACE4(( " code %d (0x%04X): idx %d\n", -+ FT_TRACE5(( " code %d (0x%04X): idx %d\n", - tmpEncoding[j].enc, tmpEncoding[j].enc, - tmpEncoding[j].glyph )); - -@@ -828,7 +928,8 @@ THE SOFTWARE. - if ( error ) - goto Bail; - -- error = FT_READ_ULONG_LE( format ); -+ if ( FT_READ_ULONG_LE( format ) ) -+ goto Bail; - - if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) && - !PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) ) -@@ -876,7 +977,6 @@ THE SOFTWARE. - accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */ - accel->ink_maxbounds = accel->maxbounds; - } -- return error; - - Bail: - return error; -@@ -1082,11 +1182,12 @@ THE SOFTWARE. - else - root->family_name = NULL; - -- /* Note: We shift all glyph indices by +1 since we must -+ /* -+ * Note: We shift all glyph indices by +1 since we must - * respect the convention that glyph 0 always corresponds -- * to the "missing glyph". -+ * to the `missing glyph'. - * -- * This implies bumping the number of "available" glyphs by 1. -+ * This implies bumping the number of `available' glyphs by 1. - */ - root->num_glyphs = face->nmetrics + 1; - -@@ -1171,7 +1272,7 @@ THE SOFTWARE. - Exit: - if ( error ) - { -- /* this is done to respect the behaviour of the original */ -+ /* This is done to respect the behaviour of the original */ - /* PCF font driver. */ - error = PCF_Err_Invalid_File_Format; - } diff --git a/print/freetype2/files/patch-src_truetype_ttgload.c b/print/freetype2/files/patch-src_truetype_ttgload.c deleted file mode 100644 index 803bdeeb30e8..000000000000 --- a/print/freetype2/files/patch-src_truetype_ttgload.c +++ /dev/null @@ -1,32 +0,0 @@ ---- src/truetype/ttgload.c.orig Tue Feb 14 12:44:56 2006 -+++ src/truetype/ttgload.c Fri May 18 13:05:34 2007 -@@ -269,7 +269,11 @@ - - n_points = 0; - if ( n_contours > 0 ) -+ { - n_points = cont[-1] + 1; -+ if ( n_points < 0 ) -+ goto Invalid_Outline; -+ } - - /* note that we will add four phantom points later */ - error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 ); -@@ -677,7 +681,7 @@ - FT_GlyphLoader gloader = loader->gloader; - FT_Error error = TT_Err_Ok; - FT_Outline* outline; -- FT_UInt n_points; -+ FT_Int n_points; - - - outline = &gloader->current.outline; -@@ -704,7 +708,7 @@ - /* Deltas apply to the unscaled data. */ - FT_Vector* deltas; - FT_Memory memory = loader->face->memory; -- FT_UInt i; -+ FT_Int i; - - - error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face), diff --git a/print/freetype2/pkg-descr b/print/freetype2/pkg-descr index 538d9a8f8fa2..57ec2a4c68fc 100644 --- a/print/freetype2/pkg-descr +++ b/print/freetype2/pkg-descr @@ -7,4 +7,4 @@ ttf2bdf: Produce bitmapped fonts from TrueType files for your X11 applications. ttfbanner: make posters using a TrueType font -WWW: http://freetype.sourceforge.net/freetype1/projects.html +WWW: http://freetype.sourceforge.net/ diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist index 1be8c735027d..501381bcee13 100644 --- a/print/freetype2/pkg-plist +++ b/print/freetype2/pkg-plist @@ -12,11 +12,13 @@ include/freetype2/freetype/ftcache.h include/freetype2/freetype/ftchapters.h include/freetype2/freetype/fterrdef.h include/freetype2/freetype/fterrors.h +include/freetype2/freetype/ftgasp.h include/freetype2/freetype/ftglyph.h include/freetype2/freetype/ftgxval.h include/freetype2/freetype/ftgzip.h include/freetype2/freetype/ftimage.h include/freetype2/freetype/ftincrem.h +include/freetype2/freetype/ftlcdfil.h include/freetype2/freetype/ftlist.h include/freetype2/freetype/ftlzw.h include/freetype2/freetype/ftmac.h diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile index 71d3218c24fd..9375587700e8 100644 --- a/print/gfontview/Makefile +++ b/print/gfontview/Makefile @@ -8,7 +8,7 @@ PORTNAME= gfontview PORTVERSION= 0.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/print/gfontview/pkg-plist b/print/gfontview/pkg-plist index 196217ed532f..517d2ad80fbf 100644 --- a/print/gfontview/pkg-plist +++ b/print/gfontview/pkg-plist @@ -1,7 +1,7 @@ bin/gfontview -share/gnome/gfontviewrc +share/gfontviewrc share/gnome/apps/Utilities/gfontview.desktop -share/gnome/pixmaps/gfontview.png +share/pixmaps/gfontview.png share/locale/de/LC_MESSAGES/gfontview.mo share/locale/es/LC_MESSAGES/gfontview.mo share/locale/fr/LC_MESSAGES/gfontview.mo diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 7ea57f479fb2..424bef417de1 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/ggv/Makefile,v 1.5 2005/09/05 20:16:08 marcus Exp $ +# $MCom: ports/print/ggv/Makefile,v 1.8 2007/09/24 19:40:45 mezz Exp $ # PORTNAME= ggv PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist index b4b027581f3a..b1a063dd664e 100644 --- a/print/ggv/pkg-plist +++ b/print/ggv/pkg-plist @@ -1,11 +1,11 @@ bin/ggv libdata/bonobo/servers/GNOME_GGV.server libexec/ggv-postscript-viewer -share/gnome/applications/ggv.desktop +share/applications/ggv.desktop @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -share/gnome/gnome-2.0/ui/ggv-control-ui.xml -share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml -share/gnome/gnome-2.0/ui/ggv-ui.xml +share/gnome-2.0/ui/ggv-control-ui.xml +share/gnome-2.0/ui/ggv-postscript-view-ui.xml +share/gnome-2.0/ui/ggv-ui.xml share/gnome/help/ggv/C/figures/ggv_window.png share/gnome/help/ggv/C/ggv.xml share/gnome/help/ggv/C/legal.xml @@ -40,25 +40,25 @@ share/gnome/help/ggv/zh_CN/legal.xml share/gnome/help/ggv/zh_TW/figures/ggv_window.png share/gnome/help/ggv/zh_TW/ggv.xml share/gnome/help/ggv/zh_TW/legal.xml -share/gnome/idl/Ggv.idl -share/gnome/omf/ggv/ggv-C.omf -share/gnome/omf/ggv/ggv-de.omf -share/gnome/omf/ggv/ggv-es.omf -share/gnome/omf/ggv/ggv-fr.omf -share/gnome/omf/ggv/ggv-it.omf -share/gnome/omf/ggv/ggv-ja.omf -share/gnome/omf/ggv/ggv-ko.omf -share/gnome/omf/ggv/ggv-sv.omf -share/gnome/omf/ggv/ggv-zh_CN.omf -share/gnome/omf/ggv/ggv-zh_TW.omf -share/gnome/pixmaps/ggv/clearall.xpm -share/gnome/pixmaps/ggv/fitwidth.png -share/gnome/pixmaps/ggv/ggv-splash.png -share/gnome/pixmaps/ggv/toggleall.xpm -share/gnome/pixmaps/ggv/toggleeven.xpm -share/gnome/pixmaps/ggv/toggleodd.xpm -share/gnome/pixmaps/ggv/zoom.xpm -share/gnome/pixmaps/gnome-ghostview.png +share/idl/Ggv.idl +share/omf/ggv/ggv-C.omf +share/omf/ggv/ggv-de.omf +share/omf/ggv/ggv-es.omf +share/omf/ggv/ggv-fr.omf +share/omf/ggv/ggv-it.omf +share/omf/ggv/ggv-ja.omf +share/omf/ggv/ggv-ko.omf +share/omf/ggv/ggv-sv.omf +share/omf/ggv/ggv-zh_CN.omf +share/omf/ggv/ggv-zh_TW.omf +share/pixmaps/ggv/clearall.xpm +share/pixmaps/ggv/fitwidth.png +share/pixmaps/ggv/ggv-splash.png +share/pixmaps/ggv/toggleall.xpm +share/pixmaps/ggv/toggleeven.xpm +share/pixmaps/ggv/toggleodd.xpm +share/pixmaps/ggv/zoom.xpm +share/pixmaps/gnome-ghostview.png share/locale/af/LC_MESSAGES/ggv.mo share/locale/am/LC_MESSAGES/ggv.mo share/locale/ar/LC_MESSAGES/ggv.mo @@ -126,8 +126,8 @@ share/locale/vi/LC_MESSAGES/ggv.mo share/locale/xh/LC_MESSAGES/ggv.mo share/locale/zh_CN/LC_MESSAGES/ggv.mo share/locale/zh_TW/LC_MESSAGES/ggv.mo -@dirrm share/gnome/pixmaps/ggv -@dirrm share/gnome/omf/ggv +@dirrm share/pixmaps/ggv +@dirrm share/omf/ggv @dirrm share/gnome/help/ggv/zh_TW/figures @dirrm share/gnome/help/ggv/zh_TW @dirrm share/gnome/help/ggv/zh_CN/figures @@ -150,3 +150,8 @@ share/locale/zh_TW/LC_MESSAGES/ggv.mo @dirrm share/gnome/help/ggv/C @dirrm share/gnome/help/ggv @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/applications diff --git a/print/gimp-gutenprint/Makefile b/print/gimp-gutenprint/Makefile index df8a571c8466..ebee7e9a85c7 100644 --- a/print/gimp-gutenprint/Makefile +++ b/print/gimp-gutenprint/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/gimp-gutenprint/Makefile,v 1.2 2007/03/30 16:42:46 ahze Exp $ +# $MCom: ports/print/gimp-gutenprint/Makefile,v 1.5 2007/10/24 21:05:40 ahze Exp $ PORTREVISION= 2 PORTEPOCH= 0 @@ -15,7 +15,7 @@ COMMENT= Gimp print plug-in MASTERDIR= ${.CURDIR}/../../print/gutenprint-base -GUT_SLAVE= gimp +GUT_SLAVE= gimp-devel PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/print/gimp-gutenprint/pkg-plist b/print/gimp-gutenprint/pkg-plist index af87e9adcdbe..9d281e62629e 100644 --- a/print/gimp-gutenprint/pkg-plist +++ b/print/gimp-gutenprint/pkg-plist @@ -1 +1 @@ -libexec/gimp/2.2/plug-ins/print +libexec/gimp/2.2/plug-ins/gutenprint diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile index 66163b21bcfa..e64a36f766b0 100644 --- a/print/gnome-cups-manager/Makefile +++ b/print/gnome-cups-manager/Makefile @@ -3,11 +3,12 @@ # Whom: Glenn Johnson <glennpj@charter.net> # # $FreeBSD$ +# $MCom: ports/print/gnome-cups-manager/Makefile,v 1.8 2007/07/20 01:11:31 mezz Exp $ # PORTNAME= gnome-cups-manager PORTVERSION= 0.31 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -43,8 +44,8 @@ post-patch: ${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c post-install: - ${MKDIR} ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \ - ${PREFIX}/share/gnome/applications + ${PREFIX}/share/applications .include <bsd.port.mk> diff --git a/print/gnome-cups-manager/pkg-plist b/print/gnome-cups-manager/pkg-plist index 43ea9b7a402b..35719294310a 100644 --- a/print/gnome-cups-manager/pkg-plist +++ b/print/gnome-cups-manager/pkg-plist @@ -14,16 +14,14 @@ lib/libgnomecupsui-1.0.so.1 libdata/bonobo/servers/Gnome_CupsManager.server libdata/pkgconfig/libgnomecupsui-1.0.pc sbin/gnome-cups-switch -share/gnome/applications/gnome-cups-manager.desktop -share/gnome/gnome-cups-manager/gnome-cups-add-druid.png -share/gnome/gnome-cups-manager/gnome-cups-add.glade -share/gnome/gnome-cups-manager/gnome-cups-manager.glade -share/gnome/gnome-cups-manager/gnome-cups-ui-connection.glade -share/gnome/gnome-cups-manager/gnome-cups-ui-driver.glade -share/gnome/gnome-cups-manager/xd2-testpage-a4.eps -share/gnome/gnome-cups-manager/xd2-testpage-letter.eps -share/gnome/pixmaps/gnome-cups-manager/printer-tray-normal.png -share/gnome/pixmaps/gnome-cups-manager/printer-tray-stopped.png +share/applications/gnome-cups-manager.desktop +%%DATADIR%%/gnome-cups-add-druid.png +%%DATADIR%%/gnome-cups-add.glade +%%DATADIR%%/gnome-cups-manager.glade +%%DATADIR%%/gnome-cups-ui-connection.glade +%%DATADIR%%/gnome-cups-ui-driver.glade +%%DATADIR%%/xd2-testpage-a4.eps +%%DATADIR%%/xd2-testpage-letter.eps share/icons/hicolor/48x48/devices/gnome-dev-printer-network.png share/icons/hicolor/48x48/devices/gnome-dev-printer-new.png share/icons/hicolor/48x48/devices/gnome-dev-printer.png @@ -66,8 +64,10 @@ share/locale/uk/LC_MESSAGES/gnome-cups-manager.mo share/locale/xh/LC_MESSAGES/gnome-cups-manager.mo share/locale/zh_CN/LC_MESSAGES/gnome-cups-manager.mo share/locale/zh_TW/LC_MESSAGES/gnome-cups-manager.mo -@dirrm share/gnome/pixmaps/gnome-cups-manager -@dirrm share/gnome/gnome-cups-manager +share/pixmaps/gnome-cups-manager/printer-tray-normal.png +share/pixmaps/gnome-cups-manager/printer-tray-stopped.png +@dirrm share/pixmaps/gnome-cups-manager +@dirrm %%DATADIR%% @unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true @dirrmtry include/libgnomecups-1/libgnomecups @dirrmtry include/libgnomecups-1 @@ -75,3 +75,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-cups-manager.mo @dirrmtry share/locale/xh @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/applications diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 656c0a58b94f..b97db20f14ac 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/gnome-print/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $ +# $MCom: ports/print/gnome-print/Makefile,v 1.6 2007/09/24 19:40:45 mezz Exp $ # PORTNAME= gnome-print PORTVERSION= 0.37 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-print/0.37 diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist index 0ebdefdb5faa..9e46a7faa853 100644 --- a/print/gnome-print/pkg-plist +++ b/print/gnome-print/pkg-plist @@ -30,54 +30,54 @@ lib/libgnomeprint.a lib/libgnomeprint.la lib/libgnomeprint.so lib/libgnomeprint.so.16 -share/gnome/fonts/README.binaries -share/gnome/fonts/README.installer +share/fonts/README.binaries +share/fonts/README.installer +share/fonts/afms/adobe/pagd8a.afm +share/fonts/afms/adobe/pagdo8a.afm +share/fonts/afms/adobe/pagk8a.afm +share/fonts/afms/adobe/pagko8a.afm +share/fonts/afms/adobe/pbkd8a.afm +share/fonts/afms/adobe/pbkdi8a.afm +share/fonts/afms/adobe/pbkl8a.afm +share/fonts/afms/adobe/pbkli8a.afm +share/fonts/afms/adobe/pcrb8a.afm +share/fonts/afms/adobe/pcrbo8a.afm +share/fonts/afms/adobe/pcrr8a.afm +share/fonts/afms/adobe/pcrro8a.afm +share/fonts/afms/adobe/phvb8a.afm +share/fonts/afms/adobe/phvb8an.afm +share/fonts/afms/adobe/phvbo8a.afm +share/fonts/afms/adobe/phvbo8an.afm +share/fonts/afms/adobe/phvl8a.afm +share/fonts/afms/adobe/phvlo8a.afm +share/fonts/afms/adobe/phvr8a.afm +share/fonts/afms/adobe/phvr8an.afm +share/fonts/afms/adobe/phvro8a.afm +share/fonts/afms/adobe/phvro8an.afm +share/fonts/afms/adobe/pncb8a.afm +share/fonts/afms/adobe/pncbi8a.afm +share/fonts/afms/adobe/pncr8a.afm +share/fonts/afms/adobe/pncri8a.afm +share/fonts/afms/adobe/pplb8a.afm +share/fonts/afms/adobe/pplbi8a.afm +share/fonts/afms/adobe/pplr8a.afm +share/fonts/afms/adobe/pplri8a.afm +share/fonts/afms/adobe/psyr.afm +share/fonts/afms/adobe/ptmb8a.afm +share/fonts/afms/adobe/ptmbi8a.afm +share/fonts/afms/adobe/ptmr8a.afm +share/fonts/afms/adobe/ptmri8a.afm +share/fonts/afms/adobe/putb8a.afm +share/fonts/afms/adobe/putbi8a.afm +share/fonts/afms/adobe/putr8a.afm +share/fonts/afms/adobe/putri8a.afm +share/fonts/afms/adobe/pzcmi8a.afm +share/fonts/afms/adobe/pzdr.afm +%%DATADIR%%/profiles/PostscriptOptimized.profile +%%DATADIR%%/profiles/fax-g3.profile +%%DATADIR%%/profiles/pdf.profile share/gnome/fonts/adobe-urw.font -share/gnome/fonts/afms/adobe/pagd8a.afm -share/gnome/fonts/afms/adobe/pagdo8a.afm -share/gnome/fonts/afms/adobe/pagk8a.afm -share/gnome/fonts/afms/adobe/pagko8a.afm -share/gnome/fonts/afms/adobe/pbkd8a.afm -share/gnome/fonts/afms/adobe/pbkdi8a.afm -share/gnome/fonts/afms/adobe/pbkl8a.afm -share/gnome/fonts/afms/adobe/pbkli8a.afm -share/gnome/fonts/afms/adobe/pcrb8a.afm -share/gnome/fonts/afms/adobe/pcrbo8a.afm -share/gnome/fonts/afms/adobe/pcrr8a.afm -share/gnome/fonts/afms/adobe/pcrro8a.afm -share/gnome/fonts/afms/adobe/phvb8a.afm -share/gnome/fonts/afms/adobe/phvb8an.afm -share/gnome/fonts/afms/adobe/phvbo8a.afm -share/gnome/fonts/afms/adobe/phvbo8an.afm -share/gnome/fonts/afms/adobe/phvl8a.afm -share/gnome/fonts/afms/adobe/phvlo8a.afm -share/gnome/fonts/afms/adobe/phvr8a.afm -share/gnome/fonts/afms/adobe/phvr8an.afm -share/gnome/fonts/afms/adobe/phvro8a.afm -share/gnome/fonts/afms/adobe/phvro8an.afm -share/gnome/fonts/afms/adobe/pncb8a.afm -share/gnome/fonts/afms/adobe/pncbi8a.afm -share/gnome/fonts/afms/adobe/pncr8a.afm -share/gnome/fonts/afms/adobe/pncri8a.afm -share/gnome/fonts/afms/adobe/pplb8a.afm -share/gnome/fonts/afms/adobe/pplbi8a.afm -share/gnome/fonts/afms/adobe/pplr8a.afm -share/gnome/fonts/afms/adobe/pplri8a.afm -share/gnome/fonts/afms/adobe/psyr.afm -share/gnome/fonts/afms/adobe/ptmb8a.afm -share/gnome/fonts/afms/adobe/ptmbi8a.afm -share/gnome/fonts/afms/adobe/ptmr8a.afm -share/gnome/fonts/afms/adobe/ptmri8a.afm -share/gnome/fonts/afms/adobe/putb8a.afm -share/gnome/fonts/afms/adobe/putbi8a.afm -share/gnome/fonts/afms/adobe/putr8a.afm -share/gnome/fonts/afms/adobe/putri8a.afm -share/gnome/fonts/afms/adobe/pzcmi8a.afm -share/gnome/fonts/afms/adobe/pzdr.afm share/gnome/fonts/defaults.fontmap -share/gnome/gnome-print/profiles/PostscriptOptimized.profile -share/gnome/gnome-print/profiles/fax-g3.profile -share/gnome/gnome-print/profiles/pdf.profile share/locale/az/LC_MESSAGES/gnome-print.mo share/locale/bg/LC_MESSAGES/gnome-print.mo share/locale/ca/LC_MESSAGES/gnome-print.mo @@ -113,9 +113,11 @@ share/locale/uk/LC_MESSAGES/gnome-print.mo share/locale/wa/LC_MESSAGES/gnome-print.mo share/locale/zh_CN/LC_MESSAGES/gnome-print.mo share/locale/zh_TW/LC_MESSAGES/gnome-print.mo -@dirrm share/gnome/gnome-print/profiles -@dirrm share/gnome/gnome-print -@dirrm share/gnome/fonts/afms/adobe -@dirrm share/gnome/fonts/afms +@dirrmtry share/gnome/fonts +@dirrm %%DATADIR%%/profiles +@dirrm %%DATADIR%% +@dirrm share/fonts/afms/adobe +@dirrm share/fonts/afms +@dirrmtry share/fonts @dirrm include/gnome-1.0/libgnomeprint @dirrm etc/gnome/fonts diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile index ffd0056a6bb8..3d4a5050f2ea 100644 --- a/print/gnomephotoprinter/Makefile +++ b/print/gnomephotoprinter/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomephotoprinter PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print gnome MASTER_SITES= http://www.fogman.de/gpp/ DISTNAME= gpp-${PORTVERSION} diff --git a/print/gnomephotoprinter/pkg-plist b/print/gnomephotoprinter/pkg-plist index f66c5042dc3a..26b91e3cbdee 100644 --- a/print/gnomephotoprinter/pkg-plist +++ b/print/gnomephotoprinter/pkg-plist @@ -1,12 +1,13 @@ bin/gnome-photo-printer -share/gnome/applications/gnome-photo-printer.desktop -share/gnome/gnome-photo-printer/gpp.glade -share/gnome/gnome-photo-printer/scale_with_ratio.jpg -share/gnome/gnome-photo-printer/scale_without_ratio.jpg +share/applications/gnome-photo-printer.desktop +share/gnome-photo-printer/gpp.glade +share/gnome-photo-printer/scale_with_ratio.jpg +share/gnome-photo-printer/scale_without_ratio.jpg share/icons/hicolor/16x16/apps/gnome-photo-printer.png share/icons/hicolor/22x22/apps/gnome-photo-printer.png share/icons/hicolor/32x32/apps/gnome-photo-printer.png share/icons/hicolor/48x48/apps/gnome-photo-printer.png share/icons/hicolor/scalable/apps/gnome-photo-printer.svg share/locale/de/LC_MESSAGES/gnome-photo-printer.mo -@dirrm share/gnome/gnome-photo-printer +@dirrm share/gnome-photo-printer +@dirrmtry share/applications diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile index cbecf9f9f140..089a5cc939ad 100644 --- a/print/gribouy/Makefile +++ b/print/gribouy/Makefile @@ -7,7 +7,7 @@ PORTNAME= gribouy PORTVERSION= 0.0.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= print gnome #MASTER_SITES= ${MASTER_SITE_SAVANNAH} #MASTER_SITE_SUBDIR= gribouy/unstable.pkg/${PORTVERSION:R} diff --git a/print/gribouy/pkg-plist b/print/gribouy/pkg-plist index e446c5bf3b9b..b0584c957726 100644 --- a/print/gribouy/pkg-plist +++ b/print/gribouy/pkg-plist @@ -1,10 +1,11 @@ bin/gribouy -share/gnome/applications/gribouy.desktop -share/gnome/gnome-2.0/ui/gribouy-ui.xml -share/gnome/gribouy/glade/gribouy.glade -share/gnome/pixmaps/gribouy.png -share/gnome/pixmaps/gribouy/gribouy-graphics.png -share/gnome/pixmaps/gribouy/gribouy-logo.jpg -@dirrm share/gnome/pixmaps/gribouy -@dirrm share/gnome/gribouy/glade -@dirrm share/gnome/gribouy +share/applications/gribouy.desktop +share/gnome-2.0/ui/gribouy-ui.xml +share/gribouy/glade/gribouy.glade +share/pixmaps/gribouy.png +share/pixmaps/gribouy/gribouy-graphics.png +share/pixmaps/gribouy/gribouy-logo.jpg +@dirrm share/pixmaps/gribouy +@dirrm share/gribouy/glade +@dirrm share/gribouy +@dirrmtry share/applications diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 7380df7185bc..ebff6059d909 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -3,11 +3,11 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/libgnomeprint/Makefile,v 1.64 2007/03/13 12:57:41 ahze Exp $ +# $MCom: ports/print/libgnomeprint/Makefile,v 1.71 2007/10/17 21:36:12 mezz Exp $ # PORTNAME= libgnomeprint -PORTVERSION= 2.18.1 +PORTVERSION= 2.18.2 PORTREVISION?= 1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index 52b40c8b4d31..7d75b5bcf593 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeprint-2.18.1.tar.bz2) = be87a17490c4976a85488537f22bcfde -SHA256 (gnome2/libgnomeprint-2.18.1.tar.bz2) = a64ce84b67552c32bd6cc322dbad2056ca9bdc43d825eb126109841adb67d18b -SIZE (gnome2/libgnomeprint-2.18.1.tar.bz2) = 870168 +MD5 (gnome2/libgnomeprint-2.18.2.tar.bz2) = b1f6c95a8dbb8ce17ab00fc2eea2aa91 +SHA256 (gnome2/libgnomeprint-2.18.2.tar.bz2) = a55b91288aa00b3523feafae155cb7182abb6b646dc86b8bfaf191076389dda4 +SIZE (gnome2/libgnomeprint-2.18.2.tar.bz2) = 867762 diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index 3608f935e5e6..296d23cfd9ea 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -85,13 +85,13 @@ lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.a lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.la lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so libdata/pkgconfig/libgnomeprint-%%LIBVERSION%%.pc -share/gnome/libgnomeprint/%%VERSION%%/globals.xml -share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml -share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml -share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml -share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml -share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml -share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml +%%DATADIR%%/%%VERSION%%/globals.xml +%%DATADIR%%/%%VERSION%%/models/GNOME-GENERIC-PS.xml +%%DATADIR%%/%%VERSION%%/models/GNOME-PDF-WRITER.xml +%%DATADIR%%/%%VERSION%%/models/uninstalled/GNOME-META.xml +%%DATADIR%%/%%VERSION%%/printers/GENERIC.xml +%%DATADIR%%/%%VERSION%%/printers/PDF-WRITER.xml +%%DATADIR%%/%%VERSION%%/printers/uninstalled/META.xml share/locale/am/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ar/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @@ -167,12 +167,12 @@ share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/zh_HK/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo -@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled -@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers -@dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled -@dirrm share/gnome/libgnomeprint/%%VERSION%%/models -@dirrm share/gnome/libgnomeprint/%%VERSION%% -@dirrm share/gnome/libgnomeprint +@dirrm %%DATADIR%%/%%VERSION%%/printers/uninstalled +@dirrm %%DATADIR%%/%%VERSION%%/printers +@dirrm %%DATADIR%%/%%VERSION%%/models/uninstalled +@dirrm %%DATADIR%%/%%VERSION%%/models +@dirrm %%DATADIR%%/%%VERSION%% +@dirrm %%DATADIR%% @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports @dirrm lib/libgnomeprint/%%VERSION%%/modules/filters @dirrm lib/libgnomeprint/%%VERSION%%/modules diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 50b3049962b5..774e02beffc0 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -9,7 +9,7 @@ PORTNAME= lilypond PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print audio MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/:src \ http://distfiles.master.finkmirrors.net/:rpm @@ -21,7 +21,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The GNU music typesetter BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX \ - scrollkeeper-install:${PORTSDIR}/textproc/scrollkeeper + rarian-sk-config:${PORTSDIR}/textproc/rarian LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist index 5910bccaf35c..e782e4eb738d 100644 --- a/print/lilypond/pkg-plist +++ b/print/lilypond/pkg-plist @@ -974,7 +974,6 @@ share/locale/sv/LC_MESSAGES/lilypond.mo %%CONDITIONAL%%@dirrm %%DATADIR%%/%%PORTVERSION%%/vim %%CONDITIONAL%%@dirrm share/omf/lilypond/%%PORTVERSION%% %%CONDITIONAL%%@dirrm share/omf/lilypond -%%CONDITIONAL%%@dirrm share/omf @dirrm %%DATADIR%%/%%PORTVERSION%%/python @dirrm %%DATADIR%%/%%PORTVERSION%%/fonts/source @dirrm %%DATADIR%%/%%PORTVERSION%%/fonts/afm |