diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:40:44 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2006-02-23 10:40:44 +0000 |
| commit | 8503536d3896846d823f7f76be54e0a99da8d8b6 (patch) | |
| tree | 1a89e4038216ead71b008f2a5091474964e1c341 /x11-fonts/ttmkfdir | |
| parent | Unbreak: make it fetchable again (diff) | |
Conversion to a single libtool environment.
Approved by: portmgr (kris)
Notes
Notes:
svn path=/head/; revision=156749
Diffstat (limited to 'x11-fonts/ttmkfdir')
| -rw-r--r-- | x11-fonts/ttmkfdir/Makefile | 4 | ||||
| -rw-r--r-- | x11-fonts/ttmkfdir/files/patch-Makefile | 21 |
2 files changed, 6 insertions, 19 deletions
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 |