diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-06 21:31:28 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-06 21:31:28 +0000 |
| commit | 81739f4ec535a19d5c3a3efd46388115348fc888 (patch) | |
| tree | 7e30476852bfeca5fc593e4a6106c8bef43e03c2 /x11-fonts/libXft/files | |
| parent | cdfc1500dd78bc6f016bf33e2cfd1559b98e7234 (diff) | |
Notes
Diffstat (limited to 'x11-fonts/libXft/files')
| -rw-r--r-- | x11-fonts/libXft/files/patch-Makefile.in | 71 | ||||
| -rw-r--r-- | x11-fonts/libXft/files/patch-xft.pc.in | 9 |
2 files changed, 80 insertions, 0 deletions
diff --git a/x11-fonts/libXft/files/patch-Makefile.in b/x11-fonts/libXft/files/patch-Makefile.in new file mode 100644 index 000000000000..3fa9820768b0 --- /dev/null +++ b/x11-fonts/libXft/files/patch-Makefile.in @@ -0,0 +1,71 @@ +--- 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) + # include files +-INCLUDEDIR=$(includedir)/X11/Xft ++INCLUDEDIR=$(includedir)/X11/Xft2 + +-LIBBASE=libXft.so +-LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@ +-LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@ ++LIBBASE=libXft2.so ++LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@ + + LIBS=@LIBS@ + +@@ -109,7 +108,7 @@ + .c.@OBJEXT@: + $(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) -c $< -o $@ + +-all:: $(LIBFILE) $(LIBMAJOR) $(LIBBASE) ++all:: $(LIBFILE) $(LIBBASE) + + # + # Build the library +@@ -118,13 +117,9 @@ + rm -f $@ + $(MKSHLIB) $(OBJS) $(LIBS) + +-$(LIBMAJOR): $(LIBFILE) +- rm -f $@ +- $(LN_S) $(LIBFILE) $(LIBMAJOR) +- +-$(LIBBASE): $(LIBMAJOR) ++$(LIBBASE): $(LIBFILE) + rm -f $@ +- $(LN_S) $(LIBMAJOR) $(LIBBASE) ++ $(LN_S) $(LIBFILE) $(LIBBASE) + + $(OBJS): $(HEADERS) + +@@ -151,19 +146,15 @@ + # 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) + +-$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(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 $@ +- $(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE) ++ $(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE) + + # + # install xft-config script +@@ -200,4 +191,4 @@ + # delete generated files + # + clean:: +- rm -f $(LIBFILE) $(LIBMAJOR) $(LIBBASE) $(OBJS) ++ rm -f $(LIBFILE) $(LIBFILE) $(LIBBASE) $(OBJS) diff --git a/x11-fonts/libXft/files/patch-xft.pc.in b/x11-fonts/libXft/files/patch-xft.pc.in new file mode 100644 index 000000000000..9b2456b9f4e5 --- /dev/null +++ b/x11-fonts/libXft/files/patch-xft.pc.in @@ -0,0 +1,9 @@ +--- xft.pc.in.orig Sun Oct 6 17:17:59 2002 ++++ xft.pc.in Sun Oct 6 17:18:10 2002 +@@ -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} |