FreeBSD Port: cups-base-1.1.20.0

[Juha Saarinen]

Michael Nottebrock wrote:

> The diffs are in the PR... please let me know how they work out for you.

The patches with the diffs in the PR apply cleanly to cups, cups-lpr and 
cups-base but the port doesn't build (see output below). Can send the 
Makefile*.rej if needed, but it looks like the man page patches need to 
be updated too.

-- 
Juha


$ sudo portupgrade -ra
** Detected a package name change: bind9-base (dns/bind9) -> 'bind9' 
(dns/bind9)
** No need to upgrade 'bind9-base-9.3.0' (>= bind9-9.3.0). (specify -f 
to force)
--->  Upgrading 'cups-lpr-1.1.20.0' to 'cups-lpr-1.1.21.0' (print/cups-lpr)
--->  Building '/usr/ports/print/cups-lpr'
===>  Cleaning for libiconv-1.9.2_1
===>  Cleaning for gettext-0.13.1_1
===>  Cleaning for gmake-3.80_2
===>  Cleaning for libtool-1.3.5_2
===>  Cleaning for libtool-1.5.8
===>  Cleaning for jpeg-6b_3
===>  Cleaning for png-1.2.6
===>  Cleaning for tiff-3.6.1_2
===>  Cleaning for perl-5.8.5
===>  Cleaning for expat-1.95.8
===>  Cleaning for cups-lpr-1.1.21.0
 >> cups-1.1.21-source.tar.bz2 doesn't seem to exist in 
/usr/ports/distfiles/.
 >> Attempting to fetch from 
ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.1.21/.
cups-1.1.21-source.tar.bz2                    100% of 8348 kB   31 kBps 
00m00s
===>  Extracting for cups-lpr-1.1.21.0
 >> Checksum OK for cups-1.1.21-source.tar.bz2.
===>  Patching for cups-lpr-1.1.21.0
===>  Applying FreeBSD patches for cups-lpr-1.1.21.0
2 out of 2 hunks failed--saving rejects to man/Makefile.common.rej
 >> Patch patch-man-Makefile.common failed to apply cleanly.
 >> Patch(es) patch-Makefile applied cleanly.
*** Error code 1

Stop in /usr/ports/print/cups-lpr.
** Command failed [exit code 1]: /usr/bin/script -qa 
/tmp/portupgrade97232.54 make
** Fix the problem and try again.
** Fix the problem and try again.
--->  Upgrading 'cups-base-1.1.20.0' to 'cups-base-1.1.21.0' 
(print/cups-base)
--->  Building '/usr/ports/print/cups-base'
===>  Cleaning for libiconv-1.9.2_1
===>  Cleaning for gettext-0.13.1_1
===>  Cleaning for gmake-3.80_2
===>  Cleaning for libtool-1.3.5_2
===>  Cleaning for libtool-1.5.8
===>  Cleaning for jpeg-6b_3
===>  Cleaning for png-1.2.6
===>  Cleaning for tiff-3.6.1_2
===>  Cleaning for perl-5.8.5
===>  Cleaning for expat-1.95.8
===>  Cleaning for cups-base-1.1.21.0
===>  Extracting for cups-base-1.1.21.0
 >> Checksum OK for cups-1.1.21-source.tar.bz2.
===>  Patching for cups-base-1.1.21.0
===>  Applying FreeBSD patches for cups-base-1.1.21.0
1 out of 1 hunks failed--saving rejects to man/Makefile.common.rej
 >> Patch patch-man-Makefile.common failed to apply cleanly.
 >> Patch(es) patch-Makefile applied cleanly.
*** Error code 1

Stop in /usr/ports/print/cups-base.
** Command failed [exit code 1]: /usr/bin/script -qa 
/tmp/portupgrade97232.6 make
** Fix the problem and try again.
--->  Skipping 'net/samba3' (samba-3.0.7,1) because a requisite package 
'cups-base-1.1.20.0' (print/cups-base) failed (specify -k to force)
--->  Skipping 'print/cups-pstoraster' (cups-pstoraster-7.07_1) because 
a requisite package 'cups-base-1.1.20.0' (print/cups-base) failed 
(specify -k to force)
--->  Skipping 'print/cups-pdf' (cups-pdf-1.4.2) because a requisite 
package 'cups-base-1.1.20.0' (print/cups-base) failed (specify -k to force)
--->  Skipping 'print/cups' (cups-1.1.20.0) because a requisite package 
'cups-pstoraster-7.07_1' (print/cups-pstoraster) failed (specify -k to 
force)
** Listing the failed packages (*:skipped / !:failed)
         ! print/cups-lpr (cups-lpr-1.1.20.0)    (patch error)
         ! print/cups-base (cups-base-1.1.20.0)  (patch error)
         * net/samba3 (samba-3.0.7,1)
         * print/cups-pstoraster (cups-pstoraster-7.07_1)
         * print/cups-pdf (cups-pdf-1.4.2)
         * print/cups (cups-1.1.20.0)
--->  Packages processed: 0 done, 90 ignored, 4 skipped and 2 failed