diff options
| author | tron <tron@pkgsrc.org> | 2010-07-14 09:15:07 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-07-14 09:15:07 +0000 |
| commit | d5ef39784031cceb7ba45f7512e95117fe3a9063 (patch) | |
| tree | ce06cba45fb6277f6a42bfeb2a9686a8bc2a131b /print | |
| parent | 6d9780ac0eaefb3468ab73e899e29228b6e0b55e (diff) | |
| download | pkgsrc-d5ef39784031cceb7ba45f7512e95117fe3a9063.tar.gz | |
Pullup ticket #3164 - requested by sbd
print/cups: build fix
Revisions pulled up:
- print/cups/Makefile 1.168
- print/cups/distinfo 1.75
- print/cups/patches/patch-bd 1.5
---
Module Name: pkgsrc
Committed By: sbd
Date: Tue Jul 13 10:59:43 UTC 2010
Modified Files:
pkgsrc/print/cups: Makefile distinfo
pkgsrc/print/cups/patches: patch-bd
Log Message:
the st_gen member of stat(2) is a BSD extension
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/Makefile | 4 | ||||
| -rw-r--r-- | print/cups/distinfo | 4 | ||||
| -rw-r--r-- | print/cups/patches/patch-bd | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index a7bd802a006..d1b2644578b 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.167 2010/06/16 18:18:26 drochner Exp $ +# $NetBSD: Makefile,v 1.167.2.1 2010/07/14 09:15:07 tron Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -8,7 +8,7 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${DIST_VERS:S/-/./g} BASE_VERS= 1.4.3 DIST_VERS= ${BASE_VERS} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= print MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ diff --git a/print/cups/distinfo b/print/cups/distinfo index 25dc19be91e..3d3a031c3e4 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.74 2010/06/16 21:15:17 sbd Exp $ +$NetBSD: distinfo,v 1.74.2.1 2010/07/14 09:15:07 tron Exp $ SHA1 (cups-1.4.3-source.tar.bz2) = 0dd9e3d709614d26cce77728b9263556c94c9559 RMD160 (cups-1.4.3-source.tar.bz2) = 6c5ab282405d6a1132163c727583f3a572307d88 @@ -23,4 +23,4 @@ SHA1 (patch-at) = aee1f0e8cbcd9e2dbcfa9af3fb675ea7ce1ce622 SHA1 (patch-ba) = caf7c85d5c23cb36711b56cc401ae3b6f7e366df SHA1 (patch-bb) = 4a554f5815c8dd7a79d2a0c7080b8b5095b37515 SHA1 (patch-bc) = c3d05049ae35245073a43138ca17d0a96818f428 -SHA1 (patch-bd) = f826293e7795bdba91a434d4bfd921c870b67a38 +SHA1 (patch-bd) = 1cd37b0a54057973dca3d961fd7acf4024c7bfd9 diff --git a/print/cups/patches/patch-bd b/print/cups/patches/patch-bd index a245fc62730..810ec96f134 100644 --- a/print/cups/patches/patch-bd +++ b/print/cups/patches/patch-bd @@ -1,4 +1,4 @@ -$NetBSD: patch-bd,v 1.4 2010/06/16 21:15:18 sbd Exp $ +$NetBSD: patch-bd,v 1.4.2.1 2010/07/14 09:15:07 tron Exp $ Incorporate str3510.patch from http://www.cups.org/str.php?L3510 @@ -51,7 +51,7 @@ http://www.cups.org/str.php?L3510 break; case 's' : /* Read/write socket */ -@@ -2207,6 +2220,86 @@ cups_fill(cups_file_t *fp) /* I - CUPS +@@ -2207,6 +2220,88 @@ cups_fill(cups_file_t *fp) /* I - CUPS return (bytes); } @@ -119,7 +119,9 @@ http://www.cups.org/str.php?L3510 + if (S_ISLNK(linkinfo.st_mode) || + fileinfo.st_dev != linkinfo.st_dev || + fileinfo.st_ino != linkinfo.st_ino || ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) + fileinfo.st_gen != linkinfo.st_gen || ++#endif + fileinfo.st_nlink != linkinfo.st_nlink || + fileinfo.st_mode != linkinfo.st_mode) + { |