Module Name: src Committed By: yamt Date: Thu May 22 11:43:17 UTC 2014
Modified Files: src/x11/bin/glxinfo [yamt-pagecache]: Makefile src/x11/lib/GLU [yamt-pagecache]: Makefile src/x11/share/fonts/bdf [yamt-pagecache]: Makefile.bdf src/x11/share/fonts/encodings [yamt-pagecache]: Makefile.enc Log Message: sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.54.1 src/x11/bin/glxinfo/Makefile cvs rdiff -u -r1.8 -r1.8.2.1 src/x11/lib/GLU/Makefile cvs rdiff -u -r1.7 -r1.7.6.1 src/x11/share/fonts/bdf/Makefile.bdf cvs rdiff -u -r1.8 -r1.8.6.1 src/x11/share/fonts/encodings/Makefile.enc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/x11/bin/glxinfo/Makefile diff -u src/x11/bin/glxinfo/Makefile:1.3 src/x11/bin/glxinfo/Makefile:1.3.54.1 --- src/x11/bin/glxinfo/Makefile:1.3 Tue Sep 23 11:01:20 2003 +++ src/x11/bin/glxinfo/Makefile Thu May 22 11:43:17 2014 @@ -1,14 +1,17 @@ -# $NetBSD: Makefile,v 1.3 2003/09/23 11:01:20 lukem Exp $ +# $NetBSD: Makefile,v 1.3.54.1 2014/05/22 11:43:17 yamt Exp $ .include <bsd.own.mk> -PROG= glxinfo +.if ${MKPIC} == "no" || ${LDSTATIC:U} != "" +PROG_CXX= glxinfo +.else +PROG= glxinfo +.endif CPPFLAGS+=${X11FLAGS.THREADS} -DDO_GLU -LDADD+= -lGLU -lGL -lXext -lX11 -lpthread -lstdc++ -lm -DPADD+= ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} -DPADD+= ${LIBSTDCXX} ${LIBM} +LDADD+= -lGLU -lGL -lXext -lX11 -lpthread -lm +DPADD+= ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM} .PATH: ${X11SRCDIR.xc}/programs/${PROG} Index: src/x11/lib/GLU/Makefile diff -u src/x11/lib/GLU/Makefile:1.8 src/x11/lib/GLU/Makefile:1.8.2.1 --- src/x11/lib/GLU/Makefile:1.8 Thu Jul 21 03:36:29 2011 +++ src/x11/lib/GLU/Makefile Thu May 22 11:43:17 2014 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2011/07/21 03:36:29 mrg Exp $ +# $NetBSD: Makefile,v 1.8.2.1 2014/05/22 11:43:17 yamt Exp $ NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :( .include <bsd.own.mk> LIB= GLU +LIBISCXX= yes GLUDIR= ${X11SRCDIR.xc}/extras/ogl-sample/main/gfx/lib/glu @@ -61,10 +62,8 @@ SRCS= ${SRCS.libutil} ${SRCS.libtess} \ ${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess} LIBDPLIBS=\ - GL ${.CURDIR}/../GL - -LDADD+= -lstdc++ -lm -DPADD+= ${LIBSTDCXX} ${LIBM} + GL ${.CURDIR}/../GL \ + m ${NETBSDSRCDIR}/lib/libm .include <bsd.x11.mk> .include <bsd.lib.mk> @@ -74,3 +73,8 @@ DPADD+= ${LIBSTDCXX} ${LIBM} # XXX -Wno-deprecated doesn't work? CXXFLAGS+= -Wno-error .endif + +.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" +COPTS.sampleCompTop.cc+= -O0 +.endif + Index: src/x11/share/fonts/bdf/Makefile.bdf diff -u src/x11/share/fonts/bdf/Makefile.bdf:1.7 src/x11/share/fonts/bdf/Makefile.bdf:1.7.6.1 --- src/x11/share/fonts/bdf/Makefile.bdf:1.7 Tue Mar 31 21:12:51 2009 +++ src/x11/share/fonts/bdf/Makefile.bdf Thu May 22 11:43:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bdf,v 1.7 2009/03/31 21:12:51 perry Exp $ +# $NetBSD: Makefile.bdf,v 1.7.6.1 2014/05/22 11:43:17 yamt Exp $ # Font files built using this makefile are cleaned in two ways: # @@ -17,7 +17,7 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR} .PATH: ${X11SRCDIR.xc}/fonts/bdf/${FONTSUBDIR} FONTSUFFIX= .gz -FONTGZIP= | gzip ${GZIPLEVEL:U-9} -ncf +FONTGZIP= | ${TOOL_GZIP} ${GZIPLEVEL:U-9} -ncf .include "${NETBSDSRCDIR}/x11/tools/bdftopcf/Makefile.bdftopcf" .include "${NETBSDSRCDIR}/x11/tools/ucs2any/Makefile.ucs2any" Index: src/x11/share/fonts/encodings/Makefile.enc diff -u src/x11/share/fonts/encodings/Makefile.enc:1.8 src/x11/share/fonts/encodings/Makefile.enc:1.8.6.1 --- src/x11/share/fonts/encodings/Makefile.enc:1.8 Tue Mar 31 21:12:51 2009 +++ src/x11/share/fonts/encodings/Makefile.enc Thu May 22 11:43:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.enc,v 1.8 2009/03/31 21:12:51 perry Exp $ +# $NetBSD: Makefile.enc,v 1.8.6.1 2014/05/22 11:43:17 yamt Exp $ FILESDIR= ${X11FONTDIR}/${ENCDIR} .PATH: ${X11SRCDIR.xc}/fonts/${ENCDIR} @@ -11,7 +11,8 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/} .SUFFIXES: .enc .enc.gz .enc.enc.gz: ${_MKTARGET_CREATE} - gzip -9nfc ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET} + ${TOOL_GZIP} -9nfc ${.IMPSRC} > ${.TARGET}.tmp \ + && mv ${.TARGET}.tmp ${.TARGET} realall: ${FILES}