[Midnightbsd-cvs] mports [16813] trunk/graphics/cairo: fix list

[laffer1 at midnightbsd.org]

Revision: 16813
          http://svnweb.midnightbsd.org/mports/?rev=16813
Author:   laffer1
Date:     2014-09-05 08:57:58 -0400 (Fri, 05 Sep 2014)
Log Message:
-----------
fix list

Modified Paths:
--------------
    trunk/graphics/cairo/Makefile
    trunk/graphics/cairo/pkg-plist

Modified: trunk/graphics/cairo/Makefile
===================================================================
--- trunk/graphics/cairo/Makefile	2014-09-05 12:45:21 UTC (rev 16812)
+++ trunk/graphics/cairo/Makefile	2014-09-05 12:57:58 UTC (rev 16813)
@@ -2,8 +2,8 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.10.2
-PORTREVISION=	15
-PORTEPOCH?=	1
+PORTREVISION=	16
+PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -14,27 +14,30 @@
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
-		png15:${PORTSDIR}/graphics/png \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
-		--enable-tee
-USES=		pathfix pkgconfig
+		--enable-tee \
+		--enable-trace
+USES=		libtool:keepla pathfix pkgconfig
 USE_XORG=	pixman
-USE_GNOME=	ltverhack referencehack
-USE_AUTOTOOLS=	libtool
+USE_GNOME=	referencehack
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
-OPTIONS_DEFINE=	OPENGL XCB X11
-OPTIONS_DEFAULT=	XCB X11
+OPTIONS_DEFINE=	OPENGL XCB GLIB X11
+OPTIONS_DEFAULT=	XCB GLIB X11
 XCB_DESC=	Enable XCB (X C-language Binding) Support
+GLIB_DESC=	Enable GObject Functions Feature
 
-.include <bsd.mport.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG+=	xrender
@@ -65,12 +68,14 @@
 PLIST_SUB+=		XCB="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MGLIB}
 USE_GNOME+=	glib20
 PLIST_SUB+=	GLIB=""
-CONFIGURE_ARGS+=	--enable-gobject
+.else
+CONFIGURE_ARGS+=	--enable-gobject=no
+PLIST_SUB+=	GLIB="@comment "
+.endif
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
 		-e '/LIBS/s/-lrt//' \

Modified: trunk/graphics/cairo/pkg-plist
===================================================================
--- trunk/graphics/cairo/pkg-plist	2014-09-05 12:45:21 UTC (rev 16812)
+++ trunk/graphics/cairo/pkg-plist	2014-09-05 12:57:58 UTC (rev 16813)
@@ -21,15 +21,15 @@
 %%GLIB%%lib/libcairo-gobject.a
 %%GLIB%%lib/libcairo-gobject.la
 %%GLIB%%lib/libcairo-gobject.so
-%%GLIB%%lib/libcairo-gobject.so.2
+%%GLIB%%lib/libcairo-gobject.so.11002
 lib/libcairo-script-interpreter.a
 lib/libcairo-script-interpreter.la
 lib/libcairo-script-interpreter.so
-lib/libcairo-script-interpreter.so.2
+lib/libcairo-script-interpreter.so.11002
 lib/libcairo.a
 lib/libcairo.la
 lib/libcairo.so
-lib/libcairo.so.2
+lib/libcairo.so.11002
 libdata/pkgconfig/cairo.pc
 libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc