diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-07 16:43:11 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-07 16:43:11 +0000 |
| commit | c7c57e81e51e4a824b30ce80cf84de0cc2763c71 (patch) | |
| tree | e3046ad013b1c193328a259f7cdffef4e7e5a019 /x11-fonts | |
| parent | Add to message mentioning installing pstoraster if not using a ps printer. (diff) | |
Fix a problem with the shared library installation.
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/fontconfig/Makefile | 1 | ||||
| -rw-r--r-- | x11-fonts/fontconfig/files/patch-src_Makefile.in | 48 |
2 files changed, 44 insertions, 5 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 42c2c3726096..d15118b60e13 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -7,6 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} diff --git a/x11-fonts/fontconfig/files/patch-src_Makefile.in b/x11-fonts/fontconfig/files/patch-src_Makefile.in index 16e62724d1b8..f4869f5675a6 100644 --- a/x11-fonts/fontconfig/files/patch-src_Makefile.in +++ b/x11-fonts/fontconfig/files/patch-src_Makefile.in @@ -1,6 +1,15 @@ ---- src/Makefile.in.orig Sun Oct 6 16:42:26 2002 -+++ src/Makefile.in Sun Oct 6 16:42:42 2002 -@@ -80,10 +80,6 @@ +--- src/Makefile.in.orig Sun Oct 6 23:23:09 2002 ++++ src/Makefile.in Sun Oct 6 23:26:11 2002 +@@ -71,7 +71,7 @@ + .c.@OBJEXT@: + $(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) -c $< -o $@ + +-all:: $(LIBFILE) $(LIBMAJOR) $(LIBBASE) ++all:: $(LIBFILE) $(LIBBASE) + + # + # build the library and the various version links +@@ -80,13 +80,9 @@ rm -f $@ $(MKSHLIB) $(OBJS) $(LIBS) @@ -8,6 +17,35 @@ - rm -f $@ - $(LN_S) $(LIBFILE) $(LIBMAJOR) - - $(LIBBASE): $(LIBMAJOR) +-$(LIBBASE): $(LIBMAJOR) ++$(LIBBASE): $(LIBFILE) rm -f $@ - $(LN_S) $(LIBMAJOR) $(LIBBASE) +- $(LN_S) $(LIBMAJOR) $(LIBBASE) ++ $(LN_S) $(LIBFILE) $(LIBBASE) + + $(OBJS): fcint.h $(HEADERS) + +@@ -102,19 +98,15 @@ + # install library + # + +-install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) ++install:: $(DESTDIR)$(LIBDIR)/$(LIBFILE) + install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE) + + $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE) + $(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)/$< + +-$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE) +- rm -f $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) +- $(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) +- +-$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) ++$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE) + rm -f $(DESTDIR)$(LIBDIR)/$(LIBBASE) +- $(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE) ++ $(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE) + + clean:: +- rm -f $(LIBFILE) $(LIBMAJOR) $(LIBBASE) $(OBJS) ++ rm -f $(LIBFILE) $(LIBBASE) $(OBJS) |