diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-07 16:44:27 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-07 16:44:27 +0000 |
| commit | bcb11baa632448689d5358e687517f74aa31cdad (patch) | |
| tree | e551d9ee27776bd9a784ad86c667c56286b8286a /x11-fonts/Xft | |
| parent | Fix a problem with the shared library installation. (diff) | |
Install the headers in the ${X11BASE}/include/X11/Xft directory for
better portability. To avoid conflicts, the Xft.h from this port will be
installed as Xft2.h.
Notes
Notes:
svn path=/head/; revision=67566
Diffstat (limited to 'x11-fonts/Xft')
| -rw-r--r-- | x11-fonts/Xft/Makefile | 1 | ||||
| -rw-r--r-- | x11-fonts/Xft/files/patch-Makefile.in | 31 | ||||
| -rw-r--r-- | x11-fonts/Xft/files/patch-xft.pc.in | 13 | ||||
| -rw-r--r-- | x11-fonts/Xft/pkg-plist | 5 |
4 files changed, 35 insertions, 15 deletions
diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile index 0f56d51c03a7..c729f83857aa 100644 --- a/x11-fonts/Xft/Makefile +++ b/x11-fonts/Xft/Makefile @@ -7,6 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} diff --git a/x11-fonts/Xft/files/patch-Makefile.in b/x11-fonts/Xft/files/patch-Makefile.in index 3fa9820768b0..4beb13b79724 100644 --- a/x11-fonts/Xft/files/patch-Makefile.in +++ b/x11-fonts/Xft/files/patch-Makefile.in @@ -1,11 +1,8 @@ ---- Makefile.in.orig Sun Oct 6 17:20:05 2002 -+++ Makefile.in Sun Oct 6 17:24:38 2002 -@@ -60,11 +60,10 @@ - # programs - BINDIR=$(bindir) +--- 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 --INCLUDEDIR=$(includedir)/X11/Xft -+INCLUDEDIR=$(includedir)/X11/Xft2 + INCLUDEDIR=$(includedir)/X11/Xft -LIBBASE=libXft.so -LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@ @@ -52,17 +49,31 @@ $(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR) -$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE) -- rm -f $@ ++$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE) + rm -f $@ - $(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) - -$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) -+$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE) - rm -f $@ +- 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::$(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) @@ -200,4 +191,4 @@ # delete generated files # diff --git a/x11-fonts/Xft/files/patch-xft.pc.in b/x11-fonts/Xft/files/patch-xft.pc.in index 9b2456b9f4e5..d97e0edbec06 100644 --- a/x11-fonts/Xft/files/patch-xft.pc.in +++ b/x11-fonts/Xft/files/patch-xft.pc.in @@ -1,5 +1,14 @@ ---- xft.pc.in.orig Sun Oct 6 17:17:59 2002 -+++ xft.pc.in Sun Oct 6 17:18:10 2002 +--- xft.pc.in.orig Thu May 23 19:01:56 2002 ++++ xft.pc.in Mon Oct 7 00:54:46 2002 +@@ -2,7 +2,7 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-freetypelibs=@FREETYPE_LIBS@ ++freetypelibs=@FREETYPE_LIBS@ -lXext + freetypecflags=@FREETYPE_CFLAGS@ + xrenderlibs=@XRENDER_LIBS@ + xrendercflags=@XRENDER_CFLAGS@ @@ -11,5 +11,5 @@ Description: X FreeType library Version: @PACKAGE_VERSION@ diff --git a/x11-fonts/Xft/pkg-plist b/x11-fonts/Xft/pkg-plist index 3b7fd1f1c46a..e0e33dae7922 100644 --- a/x11-fonts/Xft/pkg-plist +++ b/x11-fonts/Xft/pkg-plist @@ -1,7 +1,6 @@ bin/xft-config -include/X11/Xft2/Xft.h -include/X11/Xft2/XftCompat.h +include/X11/Xft/Xft2.h +include/X11/Xft/XftCompat.h lib/libXft2.so lib/libXft2.so.2 libdata/pkgconfig/xft.pc -@dirrm include/X11/Xft2 |