1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
freebsd-ports/print/cups-base
Boris Samorodov 5d2ca95e1b print/cups-client via print/cups-base: treat avahi/dnssd explicitely
1. The port's configure script is auto-detecting if avahi exists
(unless avahi is explicitely disabled):
---
   9096 if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
   9097         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Avahi" >&5
   9098 $as_echo_n "checking for Avahi... " >&6; }
   9099         if $PKGCONFIG --exists avahi-client; then
   9100                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   9101 $as_echo "yes" >&6; }
---

So if avahi-lib is installed one get config.log:
---
configure:9097: checking for Avahi
configure:9100: result: yes
[...]
#define HAVE_AVAHI 1
---

And later avahi is used while building:
---
Using LIBS=-lcups  -lssl -lcrypto -L/usr/local/lib -lavahi-common -lavahi-client   -lz -pthread -lm -lcrypt   -lz
---

Then print/cups-client installs libraries which are linked with avahi, ex.:
---
% ldd libcups.so | grep avahi
        libavahi-common.so.3 => /usr/local/lib/libavahi-common.so.3 (0x801cda000)
        libavahi-client.so.3 => /usr/local/lib/libavahi-client.so.3 (0x801ee6000)
---

Which leads to print/cups-base build failure (even if avahi is unset by options):
---
Linking ippserver...
cc -L../cgi-bin -L../cups -L../filter -L../ppdc -L../scheduler -L/usr/local/lib -Wl,-rpath,/usr/lib:/usr/local/lib -fstack-protector -Wl,-R/usr/local/lib   -Wall -Wno-format-y2k -Wunused -fPIC -Os -g -fstack-protector -Wno-tautological-compare -o ippserver ippserver.o  ../cups/libcups.a \
         -lssl -lcrypto -ldns_sd -pthread -lm -lcrypt   -lz -lz
../cups/libcups.a(http-support.o): In function `_httpResolveURI':
---

Let's reflect this fact.

2. Bump PORTREVISION for print/cups-client, it's default options and dependencies
were changed.

PR:		ports/195743
Submitted by:	O. Hartmann <ohartman@zedat.fu-berlin.de>
Discussed at:	ports@
Tested by:	O. Hartmann <ohartman@zedat.fu-berlin.de>
2015-01-04 13:50:41 +00:00
..
files - Let the rc script require the mdnsd or avahi_daemon rc scripts [1] 2014-11-07 13:03:09 +00:00
distinfo - Update to 1.7.3 2014-07-01 19:15:35 +00:00
Makefile print/cups-client via print/cups-base: treat avahi/dnssd explicitely 2015-01-04 13:50:41 +00:00
pkg-descr
pkg-descr.client
pkg-descr.image
pkg-message
pkg-plist print/cups-base: Fix build when PAM option is enabled 2014-11-28 11:51:30 +00:00
pkg-plist.client Cleanup plist 2014-11-13 07:41:17 +00:00
pkg-plist.image Cleanup plist 2014-11-13 07:41:17 +00:00