ports/146885: [patch] fix make package for x11-toolkits/gtk20 when WITHOUT_CUPS set

[Garrett Cooper]

>Number:         146885
>Category:       ports
>Synopsis:       [patch] fix make package for x11-toolkits/gtk20 when WITHOUT_CUPS set
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 23 22:06:59 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        9-CURRENT
>Organization:
Cisco Systems, Inc.
>Environment:
>Description:
cd /usr/ports/x11-toolkits/gtk20
make clean
make package

currently fails as follows:

===>   Generating temporary packing list
Creating package /usr/ports/packages/All/gtk-2.20.1_1.tbz
Registering depends: atk-1.30.0 cups-client-1.4.3 gnutls-2.8.6 libgcrypt-1.4.5 libgpg-error-1.7 pango-1.28.0 gobject-introspection-0.6.10 bison-2.4.1,1 shared-mime-info-0.71 gio-fam-backend-2.24.1 gamin-0.1.10_3 glib-2.24.1 gettext-0.17_1 libxml2-2.7.7 libiconv-1.13.1_1 libffi-3.0.9 libXinerama-1.1,1 libXi-1.3,1 libXrandr-1.3.0 libXcomposite-0.4.1,1 libXext-1.1.1,1 cairo-1.8.10_1,1 libXft-2.1.14 libXcursor-1.1.10 libXrender-0.9.5 libXdamage-1.1.2 libXfixes-4.0.4 libX11-1.3.3,1 xcb-util-0.3.6_1 libxcb-1.6 libpthread-stubs-0.3_3 m4-1.4.14,1 libsigsegv-2.5 pcre-8.02 libXau-1.0.5 libXdmcp-1.0.3 xorg-fonts-truetype-7.5 font-bh-ttf-1.0.1 font-misc-meltho-1.0.1 font-misc-ethiopic-1.0.1 mkfontdir-1.0.5 mkfontscale-1.0.7 libfontenc-1.0.5 xproto-7.0.16 bitstream-vera-1.10_4 fontconfig-2.8.0,1 freetype2-2.3.12 pixman-0.16.6 pkg-config-0.23_1 jasper-1.900.1_9 tiff-3.9.2_1 jbigkit-1.6 jpeg-8_2 png-1.4.1_1 perl-5.10.1_1 python26-2.6.5 hicolor-icon-theme-0.12 expat-2.0.1_1 encodings-1.0.3,1
  font-util-1.0.2 compositeproto-0.4.1 damageproto-1.2.0 fixesproto-4.1.1 inputproto-2.0 kbproto-1.0.4 randrproto-1.3.1 renderproto-0.11 xextproto-7.1.1 xineramaproto-1.2.
Creating bzip'd tar ball in '/usr/ports/packages/All/gtk-2.20.1_1.tbz'
tar: lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.a: Cannot stat: No such file or directory
tar: lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la: Cannot stat: No such file or directory
tar: lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so: Cannot stat: No such file or directory
tar: Error exit delayed from previous errors.
pkg_create: make_dist: tar command failed with code 256
*** Error code 1

Stop in /usr/ports/x11-toolkits/gtk20.
*** Error code 1

Stop in /usr/ports/x11-toolkits/gtk20.
*** Error code 1
>How-To-Repeat:
cd /usr/ports/x11-toolkits/gtk20
make clean
make package
>Fix:
See attached patch.

Patch attached with submission follows:

--- Makefile~	2010-05-23 18:53:50.000000000 +0000
+++ Makefile	2010-05-23 18:56:02.000000000 +0000
@@ -63,14 +63,14 @@
 
 .include <bsd.port.pre.mk>
 
-.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
+.if (defined(WITH_CUPS) || exists(${PREFIX}/lib/libcups.so)) && \
 	!defined(WITHOUT_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=--enable-cups=auto
-PLIST_SUB+=	CUPS:=""
+PLIST_SUB+=	CUPS=""
 .else
 CONFIGURE_ARGS+=--disable-cups
-PLIST_SUB+=	CUPS:="@comment "
+PLIST_SUB+=	CUPS="@comment "
 .endif
 
 post-patch:
--- pkg-plist~	2010-05-23 19:05:01.000000000 +0000
+++ pkg-plist	2010-05-23 18:55:46.000000000 +0000
@@ -367,9 +367,9 @@
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
+%%CUPS%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
+%%CUPS%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la
 lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so


>Release-Note:
>Audit-Trail:
>Unformatted: