BSDBuild

Author: vedge Date: 2011-03-06 22:14:11 -0500 (Sun, 06 Mar 2011) New Revision: 894 Added: trunk/BSDBuild/clock_win32.pm Modified: trunk/BSDBuild/Makefile Log: test for timeGetTime() in -lwinmm Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2011-02-23 09:09:43 UTC (rev 893) +++ trunk/BSDBuild/Makefile2011-03-07 03:14:11 UTC (rev 894) < at >< at > -95,7 +95,8 < at >< at > sndfile.pm \ execvp.pm \ libbsd.pm \ -clock_gettime.pm +clock_gettime.pm \ +clock_win32.pm all: Added: trunk/BSDBuild/clock_win32.pm =================================================================== --- trunk/BSDBuild/clock_win32.pm (rev 0) +++ trunk/BSDBuild/clock_win32.pm2011-03-07 03:14:11 UTC (rev 894) < at >< at > -0,0 +1,89 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2010 Hypertriton, Inc. <http://hypertriton.com/> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. + +my $testCode = << 'EOF'; +#ifdef _XBOX +#include <xtl.h> +#else +#include <windows.h> +#include <mmsystem.h> +#endif + +int +main(int argc, char *argv[]) +{ +DWORD t0; +#ifndef _XBOX +timeBeginPeriod(1); +#endif +t0 = timeGetTime(); +Sleep(1); +return (0); +} +EOF + +sub Test +{ +MkDefine('CLOCK_CFLAGS', ''); +MkDefine('CLOCK_LIBS', ''); + +MkCompileC('HAVE_CLOCK_WIN32', '${CLOCK_CFLAGS}', '-lwinmm', $testCode); +MkIfTrue('${HAVE_CLOCK_WIN32}'); +MkDefine('CLOCK_LIBS', '-lwinmm'); +MkSaveDefine('HAVE_CLOCK_WIN32', 'CLOCK_CFLAGS', 'CLOCK_LIBS'); +MkSaveMK('CLOCK_CFLAGS', 'CLOCK_LIBS'); +MkElse; +MkSaveUndef('HAVE_CLOCK_WIN32'); +MkEndif; +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +if ($os eq 'windows') { +MkDefine('HAVE_CLOCK_WIN32', 'yes'); +MkSaveDefine('HAVE_CLOCK_WIN32'); +MkDefine('CLOCK_CFLAGS', ''); +MkDefine('CLOCK_LIBS', '-lwinmm'); +MkSave('CLOCK_CFLAGS', 'CLOCK_LIBS'); +} else { +MkSaveUndef('HAVE_CLOCK_WIN32'); +MkDefine('CLOCK_CFLAGS', ''); +MkDefine('CLOCK_LIBS', ''); +MkSave('CLOCK_CFLAGS', 'CLOCK_LIBS'); +} +return (1); +} + +BEGIN +{ +$DESCR{'clock_win32'} = 'winmm time interface'; +$TESTS{'clock_win32'} = \&Test; +$EMUL{'clock_win32'} = \&Emul; +$DEPS{'clock_win32'} = 'cc'; +} + +;1 [Less]

Author: vedge Date: 2011-02-23 04:09:43 -0500 (Wed, 23 Feb 2011) New Revision: 893 Modified: trunk/BSDBuild/clock_gettime.pm Log: don't bring in -lrt unless the test succeeds. Modified: trunk/BSDBuild/clock_gettime.pm ... [More] =================================================================== --- trunk/BSDBuild/clock_gettime.pm2011-01-25 03:29:36 UTC (rev 892) +++ trunk/BSDBuild/clock_gettime.pm2011-02-23 09:09:43 UTC (rev 893) < at >< at > -46,10 +46,9 < at >< at > MkSaveMK('CLOCK_CFLAGS', 'CLOCK_LIBS'); MkElse; MkPrintN('checking for clock_gettime() interface (with -lrt)...'); -MkDefine('CLOCK_LIBS', '-lrt'); -MkCompileC('HAVE_CLOCK_GETTIME', '${CLOCK_CFLAGS}', '${CLOCK_LIBS}', - $testCode); +MkCompileC('HAVE_CLOCK_GETTIME', '${CLOCK_CFLAGS}', '-lrt', $testCode); MkIfTrue('${HAVE_CLOCK_GETTIME}'); +MkDefine('CLOCK_LIBS', '-lrt'); MkSaveDefine('HAVE_CLOCK_GETTIME', 'CLOCK_CFLAGS', 'CLOCK_LIBS'); MkSaveMK('CLOCK_CFLAGS', 'CLOCK_LIBS'); MkElse; [Less]

Author: vedge Date: 2010-12-10 20:08:41 -0500 (Fri, 10 Dec 2010) New Revision: 890 Modified: trunk/mkconfigure.pl Log: don't eat up ";;", thanks rhaamo! Modified: trunk/mkconfigure.pl ... [More] =================================================================== --- trunk/mkconfigure.pl2010-11-26 11:29:24 UTC (rev 889) +++ trunk/mkconfigure.pl2010-12-11 01:08:41 UTC (rev 890) < at >< at > -1243,8 +1243,10 < at >< at > if (/^\s*#/) { next; } +s/\;\;/\\{caseclose}/g; DIRECTIVE: foreach my $s (split(';')) { if ($s !~ /([A-Z_]+)\((.*)\)/) { +$s =~ s/\\{caseclose\}/;;/g; print $s, "\n"; next DIRECTIVE; } [Less]

Author: vedge Date: 2010-11-26 06:29:24 -0500 (Fri, 26 Nov 2010) New Revision: 889 Added: trunk/BSDBuild/clock_gettime.pm Modified: trunk/BSDBuild/Makefile Log: test for clock_gettime() Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2010-10-18 01:03:04 UTC (rev 888) +++ trunk/BSDBuild/Makefile2010-11-26 11:29:24 UTC (rev 889) < at >< at > -94,7 +94,8 < at >< at > select.pm \ sndfile.pm \ execvp.pm \ -libbsd.pm +libbsd.pm \ +clock_gettime.pm all: Added: trunk/BSDBuild/clock_gettime.pm =================================================================== --- trunk/BSDBuild/clock_gettime.pm (rev 0) +++ trunk/BSDBuild/clock_gettime.pm2010-11-26 11:29:24 UTC (rev 889) < at >< at > -0,0 +1,81 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2010 Hypertriton, Inc. <http://hypertriton.com/> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. + +my $testCode = << 'EOF'; +#include <time.h> +int +main(int argc, char *argv[]) +{ +struct timespec ts; +clock_gettime(CLOCK_REALTIME, &ts); +return (0); +} +EOF + +sub Test +{ +MkDefine('CLOCK_CFLAGS', ''); +MkDefine('CLOCK_LIBS', ''); + +MkCompileC('HAVE_CLOCK_GETTIME', '${CLOCK_CFLAGS}', + '${CLOCK_LIBS}', $testCode); +MkIfTrue('${HAVE_CLOCK_GETTIME}'); +MkSaveDefine('HAVE_CLOCK_GETTIME', 'CLOCK_CFLAGS', 'CLOCK_LIBS'); +MkSaveMK('CLOCK_CFLAGS', 'CLOCK_LIBS'); +MkElse; +MkPrintN('checking for clock_gettime() interface (with -lrt)...'); +MkDefine('CLOCK_LIBS', '-lrt'); +MkCompileC('HAVE_CLOCK_GETTIME', '${CLOCK_CFLAGS}', '${CLOCK_LIBS}', + $testCode); +MkIfTrue('${HAVE_CLOCK_GETTIME}'); +MkSaveDefine('HAVE_CLOCK_GETTIME', 'CLOCK_CFLAGS', 'CLOCK_LIBS'); +MkSaveMK('CLOCK_CFLAGS', 'CLOCK_LIBS'); +MkElse; +MkSaveUndef('HAVE_CLOCK_GETTIME'); +MkEndif; +MkEndif; +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +MkSaveUndef('HAVE_CLOCK_GETTIME'); + +MkDefine('CLOCK_CFLAGS', ''); +MkDefine('CLOCK_LIBS', ''); +MkSave('CLOCK_CFLAGS', 'CLOCK_LIBS'); +return (1); +} + +BEGIN +{ +$DESCR{'clock_gettime'} = 'clock_gettime() interface (w/o -lrt)'; +$TESTS{'clock_gettime'} = \&Test; +$EMUL{'clock_gettime'} = \&Emul; +$DEPS{'clock_gettime'} = 'cc'; +} + +;1 [Less]

Author: vedge Date: 2010-10-17 21:03:04 -0400 (Sun, 17 Oct 2010) New Revision: 888 Modified: trunk/BSDBuild/libbsd.pm trunk/BSDBuild/libidn.pm trunk/BSDBuild/sndfile.pm Log: use pkgconfig --modversion; thanks rhaamo! Modified: ... [More] trunk/BSDBuild/libbsd.pm =================================================================== --- trunk/BSDBuild/libbsd.pm2010-10-18 01:02:43 UTC (rev 887) +++ trunk/BSDBuild/libbsd.pm2010-10-18 01:03:04 UTC (rev 888) < at >< at > -17,7 +17,7 < at >< at > { my ($ver, $pfx) = < at >_; -MkExecPkgConfig($pfx, 'libbsd', '--version', 'LIBBSD_VERSION'); +MkExecPkgConfig($pfx, 'libbsd', '--modversion', 'LIBBSD_VERSION'); MkExecPkgConfig($pfx, 'libbsd', '--cflags', 'LIBBSD_CFLAGS'); MkExecPkgConfig($pfx, 'libbsd', '--libs', 'LIBBSD_LIBS'); MkIfNE('${LIBBSD_VERSION}', ''); Modified: trunk/BSDBuild/libidn.pm =================================================================== --- trunk/BSDBuild/libidn.pm2010-10-18 01:02:43 UTC (rev 887) +++ trunk/BSDBuild/libidn.pm2010-10-18 01:03:04 UTC (rev 888) < at >< at > -42,7 +42,7 < at >< at > { my ($ver, $pfx) = < at >_; -MkExecPkgConfig($pfx, 'libidn', '--version', 'LIBIDN_VERSION'); +MkExecPkgConfig($pfx, 'libidn', '--modversion', 'LIBIDN_VERSION'); MkExecPkgConfig($pfx, 'libidn', '--cflags', 'LIBIDN_CFLAGS'); MkExecPkgConfig($pfx, 'libidn', '--libs', 'LIBIDN_LIBS'); MkIfNE('${LIBIDN_VERSION}', ''); Modified: trunk/BSDBuild/sndfile.pm =================================================================== --- trunk/BSDBuild/sndfile.pm2010-10-18 01:02:43 UTC (rev 887) +++ trunk/BSDBuild/sndfile.pm2010-10-18 01:03:04 UTC (rev 888) < at >< at > -42,7 +42,7 < at >< at > { my ($ver, $pfx) = < at >_; -MkExecPkgConfig($pfx, 'sndfile', '--version', 'SNDFILE_VERSION'); +MkExecPkgConfig($pfx, 'sndfile', '--modversion', 'SNDFILE_VERSION'); MkExecPkgConfig($pfx, 'sndfile', '--cflags', 'SNDFILE_CFLAGS'); MkExecPkgConfig($pfx, 'sndfile', '--libs', 'SNDFILE_LIBS'); MkIfNE('${SNDFILE_VERSION}', ''); [Less]

Author: vedge Date: 2010-10-17 21:02:43 -0400 (Sun, 17 Oct 2010) New Revision: 887 Added: trunk/BSDBuild/glib2.pm Modified: trunk/BSDBuild/Makefile Log: test for glib2; thanks rhaamo! Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2010-09-05 12:12:53 UTC (rev 886) +++ trunk/BSDBuild/Makefile2010-10-18 01:02:43 UTC (rev 887) < at >< at > -5,6 +5,7 < at >< at > cc.pm \ cxx.pm \ glib.pm \ +glib2.pm \ sdl.pm \ sdl_image.pm \ smpeg.pm \ Added: trunk/BSDBuild/glib2.pm =================================================================== --- trunk/BSDBuild/glib2.pm (rev 0) +++ trunk/BSDBuild/glib2.pm2010-10-18 01:02:43 UTC (rev 887) < at >< at > -0,0 +1,61 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2002-2007 Hypertriton, Inc. <http://hypertriton.com/> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. +my $testCode = << 'EOF'; +#include <glib-2.0/glib.h> +int main(int argc, char *argv[]) { + void *slist = g_slist_alloc(); + g_slist_free(slist); + return (0); +} +EOF + +sub Test +{ +my ($ver, $pfx) = < at >_; + +MkExecPkgConfig($pfx, 'glib-2.0', '--modversion', 'GLIB2_VERSION'); +MkExecPkgConfig($pfx, 'glib-2.0', '--cflags', 'GLIB2_CFLAGS'); +MkExecPkgConfig($pfx, 'glib-2.0', '--libs', 'GLIB2_LIBS'); +MkIfNE('${GLIB2_VERSION}', ''); +MkFoundVer($pfx, $ver, 'GLIB2_VERSION'); +MkPrintN('checking whether glib 2.x works...'); +MkCompileC('HAVE_GLIB2', + '${GLIB2_CFLAGS}', '${GLIB2_LIBS}', + $testCode); +MkSaveIfTrue('${HAVE_GLIB2}', 'GLIB2_CFLAGS', 'GLIB2_LIBS'); +MkElse; +MkNotFound($pfx); +MkSaveUndef('HAVE_GLIB2'); +MkEndif; +return (0); +} + +BEGIN +{ +$DESCR{'glib2'} = 'Glib 2.x (http://www.gtk.org/)'; +$TESTS{'glib2'} = \&Test; +$DEPS{'glib2'} = 'cc'; +} +;1 [Less]

Author: vedge Date: 2010-09-05 08:12:53 -0400 (Sun, 05 Sep 2010) New Revision: 886 Added: trunk/BSDBuild/libbsd.pm Modified: trunk/BSDBuild/Makefile Log: test for libbsd; thanks rhaamo! Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2010-09-01 08:24:48 UTC (rev 885) +++ trunk/BSDBuild/Makefile2010-09-05 12:12:53 UTC (rev 886) < at >< at > -92,7 +92,8 < at >< at > mgid.pm \ select.pm \ sndfile.pm \ -execvp.pm +execvp.pm \ +libbsd.pm all: Added: trunk/BSDBuild/libbsd.pm =================================================================== --- trunk/BSDBuild/libbsd.pm (rev 0) +++ trunk/BSDBuild/libbsd.pm2010-09-05 12:12:53 UTC (rev 886) < at >< at > -0,0 +1,44 < at >< at > +my $testCode = << 'EOF'; +#include <bsd/bsd.h> + +int main(int argc, char *argv[]) { + int size; + char dst[4]; + char src[3] = "foo"; + size = strlcpy(dst, src, 4); + if (size < sizeof(src)) + return (1); + else + return (0); +} +EOF + +sub Test +{ +my ($ver, $pfx) = < at >_; + +MkExecPkgConfig($pfx, 'libbsd', '--version', 'LIBBSD_VERSION'); +MkExecPkgConfig($pfx, 'libbsd', '--cflags', 'LIBBSD_CFLAGS'); +MkExecPkgConfig($pfx, 'libbsd', '--libs', 'LIBBSD_LIBS'); +MkIfNE('${LIBBSD_VERSION}', ''); +MkFoundVer($pfx, $ver, 'LIBBSD_VERSION'); +MkPrintN('checking whether libbsd works...'); +MkCompileC('HAVE_LIBBSD', + '${LIBBSD_CFLAGS}', '${LIBBSD_LIBS}', + $testCode); +MkSaveIfTrue('${HAVE_LIBBSD}', 'LIBBSD_CFLAGS', 'LIBBSD_LIBS'); +MkElse; +MkNotFound($pfx); +MkSaveUndef('HAVE_LIBBSD', 'LIBBSD_CFLAGS', 'LIBBSD_LIBS'); +MkEndif; +return (0); +} + +BEGIN +{ +$TESTS{'libbsd'} = \&Test; +$DESCR{'libbsd'} = 'Libbsd (http://libbsd.freedesktop.org/)'; +$DEPS{'libbsd'} = 'cc'; +} + +;1 \ No newline at end of file [Less]

Author: vedge Date: 2010-09-01 04:24:48 -0400 (Wed, 01 Sep 2010) New Revision: 885 Modified: trunk/build.www.mk trunk/man/build.www.mk.5 Log: add ${CSS} and ${DTD} options. Modified: trunk/build.www.mk ... [More] =================================================================== --- trunk/build.www.mk2010-08-29 09:17:58 UTC (rev 884) +++ trunk/build.www.mk2010-09-01 08:24:48 UTC (rev 885) < at >< at > -41,10 +41,14 < at >< at > CLEANFILES?= HTMLDIR?=none HTML?= - +CSS?= +CSS_TEMPLATE?=style HTML_OVERWRITE?=No HTML_INSTSOURCE?=Yes +DTD?=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" \ +"http://www.w3.org/TR/html4/loose.dtd"> + all: ${HTML} all-subdir clean: clean-www clean-subdir cleandir: clean-www clean-subdir cleandir-subdir < at >< at > -53,8 +57,17 < at >< at > regress: regress-subdir depend: depend-subdir -.SUFFIXES: .html .htm .jpg .jpeg .png .gif .m4 +.SUFFIXES: .html .htm .jpg .jpeg .png .gif .m4 .css .css-in +.css-in.css: +< at >cp -f $< ${BASEDIR}/base.css +< at >echo -n "$< at >:" +${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > \ + -D__LANG=$$LANG \ + ${BASEDIR}/${CSS_TEMPLATE}.m4 \ + | ${PERL} ${TOP}/mk/hstrip.pl > $< at > +< at >rm -f ${BASEDIR}/base.css + .htm.html: < at >cp -f $< ${BASEDIR}/base.htm < at >echo -n "$< at >:" < at >< at > -65,8 +78,9 < at >< at > -D__LANG=$$LANG \ ${BASEDIR}/${TEMPLATE}.m4 \ | ${PERL} ${TOP}/mk/hstrip.pl > $< at >.$$LANG.prep; \ + echo '${DTD}' > $< at >.$$LANG.utf-8; \ ${XSLTPROC} --html --nonet --stringparam lang $$LANG ${XSL} \ - $< at >.$$LANG.prep > $< at >.$$LANG.utf-8 2>/dev/null; \ + $< at >.$$LANG.prep >> $< at >.$$LANG.utf-8 2>/dev/null; \ rm -f $< at >.$$LANG.prep; \ case "$$LANG" in \ en) \ Modified: trunk/man/build.www.mk.5 =================================================================== --- trunk/man/build.www.mk.52010-08-29 09:17:58 UTC (rev 884) +++ trunk/man/build.www.mk.52010-09-01 08:24:48 UTC (rev 885) < at >< at > -45,24 +45,32 < at >< at > The following file types are recognized: .Bl -bullet -compact .It -HTML source (*.htm) +Cascading style sheets (*.css-in) .It -M4 macro package (*.m4) +HTML sources (*.htm) +.It +M4 macro packages (*.m4) .El .Pp The following files types are generated by .Nm : .Bl -bullet -compact .It -HTML document (*.html.<lang>.<charset>) +Cascading style sheets (*.css) .It +HTML documents (*.html.<lang>.<charset>) +.It Variant information (*.html.var) .El .Pp .Sh TARGETS .Bl -tag -width "deinstall-www " .It Ar ${HTML} -Generate the preprocessed HTML document variants from the source. +Source from which to generate HTML documents (may include M4 macro calls and +use optional XSL transforms). +.It Ar ${CSS} +Source from which to generate cascading style sheets (may include M4 macro +calls). .It Ar clean-www Clean up the generated files. .It Ar cleandir-www < at >< at > -114,11 +122,18 < at >< at > Note that .Pa ml.xsl is required for multi-lingual support. +.It Ev DTD +DTD to specify at the beginning of the generated document +(default to HTML 4.01 Transitional). .It Ev TEMPLATE Template to use for preprocessing the HTML source. It must reside in .Ev BASEDIR and use the .m4 extension. +.It Ev CSS_TEMPLATE +Similarly to +.Ev TEMPLATE , +but used to preprocess CSS source. .It Ev LANGUAGES Space-separated list of translations available for the documents specified in ${HTML}. < at >< at > -127,7 +142,7 < at >< at > for more details. .It Ev DEF_LANGUAGE The default language. -.IT Ev XSL +.It Ev XSL Space-separated list of XSLT stylesheets to apply to the documents (Default = "ml.xsl"). .It Ev CLEANFILES [Less]

Author: vedge Date: 2010-08-27 03:58:35 -0400 (Fri, 27 Aug 2010) New Revision: 883 Modified: trunk/BSDBuild/png.pm Log: set HAVE_LIBPNG14 if libpng >=1.4 is found. Modified: trunk/BSDBuild/png.pm ... [More] =================================================================== --- trunk/BSDBuild/png.pm2010-08-27 07:58:14 UTC (rev 882) +++ trunk/BSDBuild/png.pm2010-08-27 07:58:35 UTC (rev 883) < at >< at > -56,9 +56,17 < at >< at > '${PNG_CFLAGS}', '${PNG_LIBS}', $testCode); MkSaveIfTrue('${HAVE_PNG}', 'PNG_CFLAGS', 'PNG_LIBS'); + +MkTestVersion('PNG_VERSION', '1.4.0'); +MkIfEQ('${MK_VERSION_OK}', 'yes'); +MkDefine('HAVE_LIBPNG14', 'yes'); +MkSave('HAVE_LIBPNG14'); +MkElse; +MkSaveUndef('HAVE_LIBPNG14'); +MkEndif; MkElse; MkNotFound($pfx); -MkSaveUndef('HAVE_PNG', 'PNG_CFLAGS', 'PNG_LIBS'); +MkSaveUndef('HAVE_PNG', 'PNG_CFLAGS', 'PNG_LIBS', 'HAVE_LIBPNG14'); MkEndif; return (0); } [Less]

Author: vedge Date: 2010-08-27 03:58:14 -0400 (Fri, 27 Aug 2010) New Revision: 882 Modified: trunk/BSDBuild/Core.pm Log: enforce version test by default when $ver is passed Modified: trunk/BSDBuild/Core.pm ... [More] =================================================================== --- trunk/BSDBuild/Core.pm2010-08-22 01:54:45 UTC (rev 881) +++ trunk/BSDBuild/Core.pm2010-08-27 07:58:14 UTC (rev 882) < at >< at > -361,7 +361,13 < at >< at > MkElse; MkPrint("yes (\$$verDefn)"); MkEndif; -MkTestVersion($verDefn, $ver); + +MkIfNE($ver, ''); +MkTestVersion($verDefn, $ver); +MkIfNE('${MK_VERSION_OK}', 'yes'); +MkFail("Version $ver or greater is required (found \$$verDefn)"); +MkEndif; +MkEndif; } sub MkNotFound [Less]