ports/127254: [PATCH] graphics/poppler "make -DWITHOUT_CAIRO package" fails

[Tobias Rehbein]

>Number:         127254
>Category:       ports
>Synopsis:       [PATCH] graphics/poppler "make -DWITHOUT_CAIRO package" fails
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 09 19:10:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Tobias Rehbein
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD sushi.pseudo.local 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #16: Sun Sep 7 17:35:32 CEST 2008 tobi at sushi.pseudo.local:/usr/obj/usr/src/sys/SUSHI i386


	
>Description:
	
	A simple "make package" fails for graphics/poppler if CAIRO support is disabled.
>How-To-Repeat:
	cd /usr/ports/graphics/poppler && make -DWITHOUT_CAIRO package
>Fix:

	

--- poppler-0_8_6-cairo_pc.diff begins here ---
diff -urN graphics/poppler.orig/Makefile graphics/poppler/Makefile
--- graphics/poppler.orig/Makefile	2008-08-25 02:50:54.000000000 +0200
+++ graphics/poppler/Makefile	2008-09-08 10:44:07.000000000 +0200
@@ -90,8 +90,10 @@
 
 .if defined(WITHOUT_CAIRO)
 CONFIGURE_ARGS+=--disable-cairo-output
+PLIST_SUB+=	CAIRO="@comment "
 .else
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+PLIST_SUB+=	CAIRO=""
 .endif
 .endif
 
diff -urN graphics/poppler.orig/pkg-plist graphics/poppler/pkg-plist
--- graphics/poppler.orig/pkg-plist	2008-06-30 22:16:19.000000000 +0200
+++ graphics/poppler/pkg-plist	2008-09-08 10:14:26.000000000 +0200
@@ -95,7 +95,7 @@
 lib/libpoppler.la
 lib/libpoppler.so
 lib/libpoppler.so.3
-libdata/pkgconfig/poppler-cairo.pc
+%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-splash.pc
 libdata/pkgconfig/poppler.pc
 @dirrm include/poppler/splash
--- poppler-0_8_6-cairo_pc.diff ends here ---


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