Conversion to a single libtool environment.

Approved by:	portmgr (kris)

6 files changed, 12 insertions, 22 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index cb43506fcba5..41eb8325ea89 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/release/
@@ -22,7 +22,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 USE_GMAKE=	yes
 PREFIX?=	${X11BASE}
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 		--with-expat-includes=${LOCALBASE}/include \
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 3a117143f845..9da7d644e027 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -15,6 +15,7 @@ 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
 libdata/pkgconfig/fontconfig.pc
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 74c47b83bbad..343738b21c41 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libXft
 PORTVERSION=	2.1.7
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
@@ -20,7 +21,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
 
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index 775edc9e6719..5cc50dcb281a 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -2,6 +2,7 @@ bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
 lib/libXft.a
+lib/libXft.la
 lib/libXft.so
 lib/libXft.so.2
 libdata/pkgconfig/xft.pc
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index ae4258c2305c..c60ead9348d6 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -17,14 +17,14 @@ COMMENT=	Create fonts.scale file for use with TrueType font server
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-USE_AUTOTOOLS=	libtool:13:env
+USE_AUTOTOOLS=	libtool:15:env
 PLIST_FILES=	bin/ttmkfdir
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
 USE_X_PREFIX=	yes
 
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}" CXX="${CXX}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
diff --git a/x11-fonts/ttmkfdir/files/patch-Makefile b/x11-fonts/ttmkfdir/files/patch-Makefile
index 64b1cfaa7e72..f763d0d3a871 100644
--- a/x11-fonts/ttmkfdir/files/patch-Makefile
+++ b/x11-fonts/ttmkfdir/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Mar 14 15:03:49 2002
-+++ Makefile	Sat Dec  6 23:57:59 2003
-@@ -1,25 +1,22 @@
+--- Makefile.orig	Thu Mar 14 14:03:49 2002
++++ Makefile	Sun Jan 22 20:15:17 2006
+@@ -1,10 +1,7 @@
 -FREETYPE_BASE=/usr/include/freetype2
 -FREETYPE_INCL=-I$(FREETYPE_BASE)/.
 -FREETYPE_LIB=/usr/lib/libfreetype.so
@@ -16,21 +16,8 @@
 +
 +LDFLAGS+=$(FREETYPE_LIB)
  
- .PHONY: clean
- 
- all: ttmkfdir
- 
- .cpp.o:
--	libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
-+	libtool13 --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
- 
- ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o
--	libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
-+	libtool13 --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
- 
+@@ -21,3 +18,3 @@
  parser.cpp: encoding.l
 -	    flex -i -8 -o$@ $<
 +	    lex -i -8 -o$@ $<
  
- clean:
- 	-rm -f *.o *~ ttmkfdir core parser.cpp