diff options
| author | snj <snj@pkgsrc.org> | 2004-02-16 20:36:04 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2004-02-16 20:36:04 +0000 |
| commit | 762c4af33bedb4bf754d41959f12234c4b1e6299 (patch) | |
| tree | 95b345de0925c703d4a10ce98fbe7afcc68b8de8 /sysutils | |
| parent | 4b44008c846ef4ec90c3a7eb43608ed815528f27 (diff) | |
| download | pkgsrc-762c4af33bedb4bf754d41959f12234c4b1e6299.tar.gz | |
Fix build on FreeBSD 4.9-STABLE. From Michal Pasternak in PR pkg/23864.
While here, move PKGREVISION to silence pkglint.
Okayed by jmmv.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-vfs2/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gnome-vfs2/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/gnome-vfs2/patches/patch-aa | 28 |
3 files changed, 32 insertions, 3 deletions
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index aac90afb65a..be19ab6f8a3 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2004/02/14 18:26:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/16 20:36:04 snj Exp $ # DISTNAME= gnome-vfs-2.4.2 -PKGREVISION= 3 PKGNAME= ${DISTNAME:S/vfs/vfs2/} +PKGREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.4/} EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 37525d8c64e..706d2cf963d 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2004/02/09 18:45:52 jmmv Exp $ +$NetBSD: distinfo,v 1.14 2004/02/16 20:36:04 snj Exp $ SHA1 (gnome-vfs-2.4.2.tar.bz2) = a5439bdabc10b6ec8c8dbe01f90c772aa2d3e0f8 Size (gnome-vfs-2.4.2.tar.bz2) = 1067445 bytes +SHA1 (patch-aa) = 88cefbcb5cadf275c6be00c34b5e5b5c5fd6976e SHA1 (patch-ab) = a162ffe1e0b396599d57af2c50a7843e75d9dbc1 SHA1 (patch-ag) = 8dda137fe56462ee2336678a872a43611b11984f SHA1 (patch-ai) = d89edb0dc089818191c12360ae542c0edc9fe414 diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa new file mode 100644 index 00000000000..2b70c6ae641 --- /dev/null +++ b/sysutils/gnome-vfs2/patches/patch-aa @@ -0,0 +1,28 @@ +$NetBSD: patch-aa,v 1.8 2004/02/16 20:36:04 snj Exp $ + +--- modules/cdda-method.c.orig 2004-02-16 11:08:48.000000000 -0800 ++++ modules/cdda-method.c 2004-02-16 11:11:24.000000000 -0800 +@@ -623,7 +623,11 @@ do_get_file_info (GnomeVFSMethod *method + /* Check and see if we already have opened and stashed this drive */ + if (!use_base) { + if (global_context != NULL) { ++#ifndef __FreeBSD__ + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { ++#else ++ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { ++#endif + use_cache = TRUE; + cdda_close (drive); + gnome_vfs_file_info_copy (file_info, global_context->file_info); +@@ -709,7 +713,11 @@ do_open_directory (GnomeVFSMethod *metho + if (!use_base) { + /* Check for cache */ + if (global_context != NULL) { ++#ifndef __FreeBSD__ + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { ++#else ++ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { ++#endif + /* Clear old cache */ + cdda_context_free (global_context); + global_context = cdda_context_new (drive, uri); |