diff options
| author | arved <arved@FreeBSD.org> | 2004-08-21 11:02:37 +0000 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2004-08-21 11:02:37 +0000 |
| commit | 1d9f42dfa7e80c301a7a3b084abe35e93bf489c5 (patch) | |
| tree | a8acb78039651f7c2cb813469b698df44bb13f77 /print | |
| parent | 0dbdd23b3f8784e330aa752dbb0e982e7297dbd4 (diff) | |
| download | FreeBSD-ports-1d9f42dfa7e80c301a7a3b084abe35e93bf489c5.zip FreeBSD-ports-1d9f42dfa7e80c301a7a3b084abe35e93bf489c5.tar.gz | |
- Rename variable ARCH in the freetype Makefile to FTARCH to avoid conflict
with ARCH from the ports infrastructure. This fixes build on amd64.
- Nuke USE_GMAKE while i am here. the port builds fine with our make.
Diffstat (limited to 'print')
| -rw-r--r-- | print/freetype/Makefile | 1 | ||||
| -rw-r--r-- | print/freetype/files/patch-lib::arch::unix::Makefile.in | 54 |
2 files changed, 49 insertions, 6 deletions
diff --git a/print/freetype/Makefile b/print/freetype/Makefile index ffc1f63..9015a26 100644 --- a/print/freetype/Makefile +++ b/print/freetype/Makefile @@ -20,7 +20,6 @@ MASTER_SITE_SUBDIR= freetype1 MAINTAINER= ports@FreeBSD.org COMMENT= A free and portable TrueType font rendering engine -USE_GMAKE= yes USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared diff --git a/print/freetype/files/patch-lib::arch::unix::Makefile.in b/print/freetype/files/patch-lib::arch::unix::Makefile.in index e5519bd..a97729f 100644 --- a/print/freetype/files/patch-lib::arch::unix::Makefile.in +++ b/print/freetype/files/patch-lib::arch::unix::Makefile.in @@ -1,8 +1,25 @@ - -$FreeBSD$ - ---- lib/arch/unix/Makefile.in 2002/03/14 07:15:48 1.1 -+++ lib/arch/unix/Makefile.in 2002/03/14 07:16:24 +--- lib/arch/unix/Makefile.in.orig Sat Jul 31 08:48:17 1999 ++++ lib/arch/unix/Makefile.in Sat Aug 21 12:55:07 2004 +@@ -2,8 +2,8 @@ + # + # lib/arch/unix/Makefile.in + +-ARCH = arch/unix +-FT_MAKEFILE = $(ARCH)/Makefile ++FTARCH = arch/unix ++FT_MAKEFILE = $(FTARCH)/Makefile + + RM = @RM@ + RMF = @RM@ -f +@@ -83,7 +83,7 @@ + $(srcdir)/$(FILESRC) \ + $(srcdir)/$(MEMSRC) \ + $(srcdir)/$(MUTEXSRC) +-SRC_S = $(srcdir)/$(ARCH)/freetype.c ++SRC_S = $(srcdir)/$(FTARCH)/freetype.c + + # all header files + HEADERS = $(srcdir)/freetype.h \ @@ -200,10 +200,10 @@ -version-info $(version_info) $(FT_LIBS) @@ -16,3 +33,30 @@ $FreeBSD$ done uninstall: +@@ -218,15 +218,15 @@ + -$(RMF) file.c memory.c mutex.c + -$(RMF) libttf.la + -$(RMF) *.orig *~ core *.core +- -$(RMF) $(ARCH)/Makefile ++ -$(RMF) $(FTARCH)/Makefile + -$(RMF) .libs/* + -$(RMDIR) .libs + + depend: do_link + (echo '/^#.* PUT NO STUFF BELOW/,$$d' ; echo w ; echo q) | \ +- ed - $(ARCH)/Makefile ++ ed - $(FTARCH)/Makefile + echo '# Dependencies generated by make depend: PUT NO STUFF BELOW' \ +- >> $(ARCH)/Makefile ++ >> $(FTARCH)/Makefile + for file in $(SRC_S) $(SRC_M) $(EXTSRC) ; do \ + $(CPP) $(CPPFLAGS) $(INCLUDES) $$file | \ + sed -n -e 's|^# [1-9][0-9]* "\([^/].*\.h\)".*|\1|p' \ +@@ -239,6 +239,6 @@ + else if ($$1 != last) \ + { print line ; line = last = $$1 } \ + line = line " " $$2 } \ +- END { print line }' >> $(ARCH)/Makefile ++ END { print line }' >> $(FTARCH)/Makefile + + # Dependencies generated by make depend: PUT NO STUFF BELOW |
