[Midnightbsd-cvs] mports [17879] trunk/x11-fonts/fontconfig: fix fontconfig build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Dec 14 09:19:57 EST 2014


Revision: 17879
          http://svnweb.midnightbsd.org/mports/?rev=17879
Author:   laffer1
Date:     2014-12-14 09:19:56 -0500 (Sun, 14 Dec 2014)
Log Message:
-----------
fix fontconfig build

Modified Paths:
--------------
    trunk/x11-fonts/fontconfig/Makefile
    trunk/x11-fonts/fontconfig/pkg-plist

Modified: trunk/x11-fonts/fontconfig/Makefile
===================================================================
--- trunk/x11-fonts/fontconfig/Makefile	2014-12-14 14:16:06 UTC (rev 17878)
+++ trunk/x11-fonts/fontconfig/Makefile	2014-12-14 14:19:56 UTC (rev 17879)
@@ -2,7 +2,7 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.11.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.freedesktop.org/software/fontconfig/release/
@@ -16,13 +16,12 @@
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
-		expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libexpat.so:${PORTSDIR}/textproc/expat2
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USES+=		gmake pathfix pkgconfig
-USE_GNOME=	ltverhack
+USES+=		gmake libtool pathfix pkgconfig
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
 		--with-templatedir=${PREFIX}/etc/fonts/conf.avail \
 		--with-xmldir=${PREFIX}/etc/fonts \
@@ -60,7 +59,7 @@
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
-	@${STRIP_CMD} ${PREFIX}/lib/libfontconfig.so.1
+	@${STRIP_CMD} ${PREFIX}/lib/libfontconfig.so.9
 
 .include <bsd.port.mk>
 

Modified: trunk/x11-fonts/fontconfig/pkg-plist
===================================================================
--- trunk/x11-fonts/fontconfig/pkg-plist	2014-12-14 14:16:06 UTC (rev 17878)
+++ trunk/x11-fonts/fontconfig/pkg-plist	2014-12-14 14:19:56 UTC (rev 17879)
@@ -58,10 +58,8 @@
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
 include/fontconfig/fontconfig.h
-lib/libfontconfig.a
-lib/libfontconfig.la
 lib/libfontconfig.so
-lib/libfontconfig.so.1
+lib/libfontconfig.so.9
 libdata/pkgconfig/fontconfig.pc
 man/man1/fc-cache.1.gz
 man/man1/fc-cat.1.gz



More information about the Midnightbsd-cvs mailing list