Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/freetype/freetype revert previous; it ...



details:   https://anonhg.NetBSD.org/src/rev/657621bc1e9a
branches:  trunk
changeset: 787236:657621bc1e9a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jun 08 00:37:33 2013 +0000

description:
revert previous; it was already done in the previous previous.

while here, make freetype-config depend upon Makefile, so it
will be rebuilt for update builds properly.

diffstat:

 external/mit/xorg/lib/freetype/freetype/Makefile |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 063e3717a7cf -r 657621bc1e9a external/mit/xorg/lib/freetype/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/Makefile  Fri Jun 07 23:37:53 2013 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/Makefile  Sat Jun 08 00:37:33 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2013/06/07 19:28:25 martin Exp $
+#      $NetBSD: Makefile,v 1.14 2013/06/08 00:37:33 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -31,15 +31,15 @@
                -e 's,%includedir%,${X11INCDIR},' \
                -e 's,%ft_version%,${FT_VERSION},' \
                -e 's,%build_libtool_libs%,yes,' \
-               -e 's,@FT2_EXTRA_LIBS@,,' \
-               -e 's,@LIBZ@,-lz,' \
-               -e 's,@LIBBZ2@,-lbz2,' \
+               -e 's,%FT2_EXTRA_LIBS%,,' \
+               -e 's,%LIBZ%,-lz,' \
+               -e 's,%LIBBZ2%,-lbz2,' \
                -e 's,@FT2_EXTRA_LIBS@,,' \
                -e 's,@LIBZ@,-lz,' \
                -e 's,@LIBBZ2@,-lbz2,'
 
 .PATH: ${X11SRCDIR.freetype}/builds/unix
-freetype-config: freetype-config.in
+freetype-config: freetype-config.in Makefile
        ${_MKTARGET_CREATE}
        ${CONFIG_SUBST} < ${.ALLSRC} > ${.TARGET}
 



Home | Main Index | Thread Index | Old Index