From 38805e871a0ec7d383e76a6cb1d979ba6c291d56 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 18 Feb 2003 04:51:34 +0000 Subject: Remove the renaming of Xft headers and library from the Xft (Xft2) port. Remove installing of Xft1 from XFree86-4-libraries, and add dependencies to the Xft port by all the ports that use it along with whatever patches are necessary. Approved by: portmgr (kris), marcus --- x11-fonts/libXft/Makefile | 1 + x11-fonts/libXft/files/patch-Makefile.in | 107 +++++++++++++++++++++---------- x11-fonts/libXft/files/patch-configure | 11 ++++ x11-fonts/libXft/files/patch-xft.pc.in | 7 -- x11-fonts/libXft/pkg-plist | 7 +- 5 files changed, 89 insertions(+), 44 deletions(-) create mode 100644 x11-fonts/libXft/files/patch-configure (limited to 'x11-fonts/libXft') diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index 508c4094d2c6..5926df4a5239 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -7,6 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} diff --git a/x11-fonts/libXft/files/patch-Makefile.in b/x11-fonts/libXft/files/patch-Makefile.in index 4beb13b79724..88ae45cf7348 100644 --- a/x11-fonts/libXft/files/patch-Makefile.in +++ b/x11-fonts/libXft/files/patch-Makefile.in @@ -1,13 +1,11 @@ ---- Makefile.in.orig Sun Oct 6 23:14:27 2002 -+++ Makefile.in Sun Oct 6 23:16:21 2002 -@@ -62,9 +62,8 @@ - # include files +--- Makefile.in.orig Fri Feb 7 20:35:02 2003 ++++ Makefile.in Fri Feb 7 20:35:21 2003 +@@ -63,8 +63,7 @@ INCLUDEDIR=$(includedir)/X11/Xft --LIBBASE=libXft.so + LIBBASE=libXft.so -LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@ -LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@ -+LIBBASE=libXft2.so +LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@ LIBS=@LIBS@ @@ -21,7 +19,7 @@ # # Build the library -@@ -118,13 +117,9 @@ +@@ -118,86 +117,25 @@ rm -f $@ $(MKSHLIB) $(OBJS) $(LIBS) @@ -37,44 +35,85 @@ $(OBJS): $(HEADERS) -@@ -151,19 +146,15 @@ - # install library - # - +-# +-# install directories +-# +- +-install:: $(DESTDIR)$(LIBDIR) $(DESTDIR)$(prefix)/libdata/pkgconfig +-install:: $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(BINDIR) +- +-$(DESTDIR)$(LIBDIR): +- mkdir -p $@ +- +-$(DESTDIR)$(prefix)/libdata/pkgconfig: +- mkdir -p $@ +- +-$(DESTDIR)$(INCLUDEDIR): +- mkdir -p $@ +- +-$(DESTDIR)$(BINDIR): +- mkdir -p $@ +- +-# +-# install library +-# +- -install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) -+install:: $(DESTDIR)$(LIBDIR)/$(LIB) - install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE) - - $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE) - $(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR) - +-install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE) +- +-$(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE) +- $(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR) +- -$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE) -+$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE) - rm -f $@ +- rm -f $@ - $(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) - -$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) - rm -f $@ - $(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE) -+ $(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE) - - # - # install xft-config script -@@ -188,10 +179,10 @@ - # install header files - # - +- +-# +-# install xft-config script +-# +- +-install:: $(DESTDIR)$(BINDIR)/xft-config +- +-$(DESTDIR)$(BINDIR)/xft-config: xft-config +- $(INSTALL_SCRIPT) $< $(DESTDIR)$(BINDIR) +- +-# +-# install pkgconfig control file +-# +- +-install:: $(DESTDIR)$(prefix)/libdata/pkgconfig/xft.pc +- +-$(DESTDIR)$(prefix)/libdata/pkgconfig/xft.pc: xft.pc +- $(INSTALL_DATA) $< $(DESTDIR)$(prefix)/libdata/pkgconfig +- +- +-# +-# install header files +-# +- -install::$(DESTDIR)$(INCLUDEDIR)/Xft.h $(DESTDIR)$(INCLUDEDIR)/XftCompat.h -+install::$(DESTDIR)$(INCLUDEDIR)/Xft2.h $(DESTDIR)$(INCLUDEDIR)/XftCompat.h - +- -$(DESTDIR)$(INCLUDEDIR)/Xft.h: Xft.h - $(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR) -+$(DESTDIR)$(INCLUDEDIR)/Xft2.h: Xft.h -+ $(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/Xft2.h +- +-$(DESTDIR)$(INCLUDEDIR)/XftCompat.h: XftCompat.h +- $(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR) ++install:: Xft.h XftCompat.h XftFreetype.h xft-config xft.pc ++ $(INSTALL_DATA) Xft.h $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_DATA) XftCompat.h $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_DATA) XftFreetype.h $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_SCRIPT) xft-config $(DESTDIR)$(BINDIR) ++ mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig ++ $(INSTALL_DATA) xft.pc $(DESTDIR)$(prefix)/libdata/pkgconfig ++ $(INSTALL_PROGRAM) $(LIBFILE) $(DESTDIR)$(LIBDIR) ++ rm -f $(DESTDIR)$(LIBDIR)/$(LIBBASE) ++ $(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE) - $(DESTDIR)$(INCLUDEDIR)/XftCompat.h: XftCompat.h - $(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR) -@@ -200,4 +191,4 @@ + # # delete generated files # clean:: diff --git a/x11-fonts/libXft/files/patch-configure b/x11-fonts/libXft/files/patch-configure new file mode 100644 index 000000000000..87b709ef4d16 --- /dev/null +++ b/x11-fonts/libXft/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Mon Feb 17 17:08:30 2003 ++++ configure Mon Feb 17 17:08:32 2003 +@@ -1316,7 +1316,7 @@ + case "$have_x" in + yes) + XRENDER_CFLAGS="-I$x_includes" +- XRENDER_LIBS="-L$x_libraries -lXrender" ++ XRENDER_LIBS="-L$x_libraries -lXext -lXrender" + + saved_LIBS="$LIBS" + LIBS="$LIBS $XRENDER_LIBS" diff --git a/x11-fonts/libXft/files/patch-xft.pc.in b/x11-fonts/libXft/files/patch-xft.pc.in index d97e0edbec06..249417935f94 100644 --- a/x11-fonts/libXft/files/patch-xft.pc.in +++ b/x11-fonts/libXft/files/patch-xft.pc.in @@ -9,10 +9,3 @@ freetypecflags=@FREETYPE_CFLAGS@ xrenderlibs=@XRENDER_LIBS@ xrendercflags=@XRENDER_CFLAGS@ -@@ -11,5 +11,5 @@ - Description: X FreeType library - Version: @PACKAGE_VERSION@ - Requires: fontconfig --Libs: -L${libdir} -lXft ${freetypelibs} ${xrenderlibs} -+Libs: -L${libdir} -lXft2 ${freetypelibs} ${xrenderlibs} - Cflags: -I${includedir} ${freetypecflags} ${xrendercflags} diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist index e0e33dae7922..0591e9bac912 100644 --- a/x11-fonts/libXft/pkg-plist +++ b/x11-fonts/libXft/pkg-plist @@ -1,6 +1,7 @@ bin/xft-config -include/X11/Xft/Xft2.h +include/X11/Xft/Xft.h include/X11/Xft/XftCompat.h -lib/libXft2.so -lib/libXft2.so.2 +include/X11/Xft/XftFreetype.h +lib/libXft.so +lib/libXft.so.2 libdata/pkgconfig/xft.pc -- cgit v1.2.3