BSDBuild

Author: vedge Date: 2012-07-03 00:19:04 -0400 (Tue, 03 Jul 2012) New Revision: 946 Modified: trunk/BSDBuild/sys_types.pm Log: remove unused test Modified: trunk/BSDBuild/sys_types.pm ... [More] =================================================================== --- trunk/BSDBuild/sys_types.pm2012-07-03 04:18:55 UTC (rev 945) +++ trunk/BSDBuild/sys_types.pm2012-07-03 04:19:04 UTC (rev 946) < at >< at > -44,34 +44,8 < at >< at > return (i64 != 0 || u64 != 0); } EOF -MkPrintN('checking for conflicting typedefs...'); -# -# XXX should check each type separatedly! -# -MkCompileC('_MK_HAVE_UNSIGNED_TYPEDEFS', '', '', << 'EOF'); -#include <sys/types.h> -int main(int argc, char *argv[]) { -Uchar foo = 1; -Uint bar = 1; -Ulong baz = 1; -return (foo != 1 || bar != 1 || baz != 1); -} -EOF MkElse; MkSaveUndef('HAVE_64BIT'); - -MkPrintN('checking for conflicting typedefs...'); -# -# XXX should check each type separatedly! -# -MkCompileC('_MK_HAVE_UNSIGNED_TYPEDEFS', '', '', << 'EOF'); -int main(int argc, char *argv[]) { -Uchar foo = 1; -Uint bar = 1; -Ulong baz = 1; -return (foo != 1 || bar != 1 || baz != 1); -} -EOF MkEndif; return (0); } [Less]

Author: vedge Date: 2012-07-03 00:18:55 -0400 (Tue, 03 Jul 2012) New Revision: 945 Modified: trunk/BSDBuild/gettext.pm Log: avoid gcc 4.6 warnings Modified: trunk/BSDBuild/gettext.pm ... [More] =================================================================== --- trunk/BSDBuild/gettext.pm2012-07-02 00:49:17 UTC (rev 944) +++ trunk/BSDBuild/gettext.pm2012-07-03 04:18:55 UTC (rev 945) < at >< at > -39,7 +39,7 < at >< at > textdomain("foo"); s = gettext("string"); s = dgettext("foo","string"); -return (0); +return (s != NULL); } EOF [Less]

Author: vedge Date: 2012-07-01 20:49:17 -0400 (Sun, 01 Jul 2012) New Revision: 944 Modified: trunk/BSDBuild/strsep.pm Log: avoid nonnull warnings Modified: trunk/BSDBuild/strsep.pm ... [More] =================================================================== --- trunk/BSDBuild/strsep.pm2012-06-29 08:12:29 UTC (rev 943) +++ trunk/BSDBuild/strsep.pm2012-07-02 00:49:17 UTC (rev 944) < at >< at > -30,8 +30,12 < at >< at > int main(int argc, char *argv[]) { -(void)strsep(NULL, NULL); -return (0); +char foo[32], *pFoo = &foo[0]; +char *s; + +foo[0] = '\0'; +s = strsep(&pFoo, " "); +return (s != NULL); } EOF } [Less]

Author: vedge Date: 2012-06-29 04:12:29 -0400 (Fri, 29 Jun 2012) New Revision: 943 Modified: trunk/BSDBuild/cxx.pm Log: add missing "EOT" Modified: trunk/BSDBuild/cxx.pm =================================================================== --- ... [More] trunk/BSDBuild/cxx.pm2012-06-28 06:49:53 UTC (rev 942) +++ trunk/BSDBuild/cxx.pm2012-06-29 08:12:29 UTC (rev 943) < at >< at > -291,6 +291,7 < at >< at > print << 'EOF'; #include <iostream> int main(void) { std::cout << "Hello world!" << std::endl; return 0; } +EOT EOF print << "EOF"; \$LIBTOOL --quiet --mode=compile --tag=CXX \$CXX \$CXXFLAGS \$TEST_CXXFLAGS -o \$testdir/conftest.o conftest.cc 2>>config.log [Less]

Author: vedge Date: 2012-06-28 02:49:53 -0400 (Thu, 28 Jun 2012) New Revision: 942 Modified: trunk/BSDBuild/agar-dev.pm Log: avoid gcc warning Modified: trunk/BSDBuild/agar-dev.pm ... [More] =================================================================== --- trunk/BSDBuild/agar-dev.pm2012-06-15 07:43:16 UTC (rev 941) +++ trunk/BSDBuild/agar-dev.pm2012-06-28 06:49:53 UTC (rev 942) < at >< at > -30,11 +30,10 < at >< at > int main(int argc, char *argv[]) { AG_Object obj; -AG_Window *win; AG_ObjectInitStatic(&obj, &agObjectClass); DEV_InitSubsystem(0); -win = DEV_Browser(&obj); +DEV_Browser(&obj); AG_ObjectDestroy(&obj); return (0); } [Less]

Author: vedge Date: 2012-06-15 03:43:16 -0400 (Fri, 15 Jun 2012) New Revision: 941 Modified: trunk/mkconfigure.pl Log: don't prepend /usr/lib64 to --libs Modified: trunk/mkconfigure.pl ... [More] =================================================================== --- trunk/mkconfigure.pl2012-04-06 02:15:21 UTC (rev 940) +++ trunk/mkconfigure.pl2012-06-15 07:43:16 UTC (rev 941) < at >< at > -616,12 +616,7 < at >< at > echo "$config_script_cflags" ;; --libs | --static-libs) -if test x"\${prefix}" != x"/usr" ; then -libdirs="-L/usr/lib64" -else -libdirs="" -fi -echo "\$libdirs $config_script_libs" +echo "$config_script_libs" ;; *) echo "\${usage}" 1>&2 [Less]

Author: vedge Date: 2012-04-05 22:15:21 -0400 (Thu, 05 Apr 2012) New Revision: 940 Added: trunk/BSDBuild/mysql.pm Modified: trunk/BSDBuild/Makefile Log: test for libmysqlclient Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2012-02-24 03:18:58 UTC (rev 939) +++ trunk/BSDBuild/Makefile2012-04-06 02:15:21 UTC (rev 940) < at >< at > -100,7 +100,8 < at >< at > clock_win32.pm \ sdl_ttf.pm \ xinerama.pm \ -portaudio.pm +portaudio.pm \ +mysql.pm all: Added: trunk/BSDBuild/mysql.pm =================================================================== --- trunk/BSDBuild/mysql.pm (rev 0) +++ trunk/BSDBuild/mysql.pm2012-04-06 02:15:21 UTC (rev 940) < at >< at > -0,0 +1,98 < at >< at > +# vim:ts=4 +# +# Copyright (c) 2012 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 <mysql.h> +#include <string.h> + +int +main(int argc, char *argv[]) +{ +MYSQL *my = mysql_init(NULL); +if (my != NULL) { mysql_close(my); } +return (0); +} +EOF + +sub Test +{ +my ($ver) = < at >_; + +MkExecOutputUnique('mysql_config', '--version', 'MYSQL_VERSION'); +MkIfNE('${MYSQL_VERSION}', ''); +MkFoundVer($pfx, $ver, 'MYSQL_VERSION'); +MkPrintN('checking whether MySQL works...'); +MkExecOutput('mysql_config', '--cflags', 'MYSQL_CFLAGS'); +MkExecOutput('mysql_config', '--libs', 'MYSQL_LIBS'); +MkCompileC('HAVE_MYSQL', + '${MYSQL_CFLAGS}', '${MYSQL_LIBS}', + $testCode); +MkSaveIfTrue('${HAVE_MYSQL}', 'MYSQL_CFLAGS', 'MYSQL_LIBS'); +MkElse; + MkNotFound($pfx); +MkSaveUndef('MYSQL_CFLAGS', 'MYSQL_LIBS'); +MkEndif; +return (0); +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +if ($os eq 'windows') { +MkDefine('MYSQL_CFLAGS', ''); +MkDefine('MYSQL_LIBS', 'mysqlclient'); +} +MkDefine('HAVE_MYSQL', 'yes'); +MkSave('HAVE_MYSQL', 'MYSQL_CFLAGS', 'MYSQL_LIBS'); +return (1); +} + +sub Link +{ +my $var = shift; + +if ($var eq 'mysqlclient') { +PmLink('mysqlclient'); + +if ($EmulEnv =~ /^cb-/) { +PmIncludePath('$(#libmysql.include)'); +PmLibPath('$(#libmysql.lib)'); +} +return (1); +} +return (0); +} + +BEGIN +{ +$TESTS{'mysql'} = \&Test; +$DEPS{'mysql'} = 'cc'; +$LINK{'mysql'} = \&Link; +$EMUL{'mysql'} = \&Emul; +$DESCR{'mysql'} = 'MySQL (http://dev.mysql.com/)'; +} + +;1 [Less]

Author: vedge Date: 2012-02-23 22:18:58 -0500 (Thu, 23 Feb 2012) New Revision: 939 Modified: trunk/BSDBuild/db4.pm Log: test for db4.8 Modified: trunk/BSDBuild/db4.pm =================================================================== --- ... [More] trunk/BSDBuild/db4.pm2012-02-22 14:19:53 UTC (rev 938) +++ trunk/BSDBuild/db4.pm2012-02-24 03:18:58 UTC (rev 939) < at >< at > -1,6 +1,6 < at >< at > # vim:ts=4 # -# Copyright (c) 2002-2010 Hypertriton, Inc. <http://hypertriton.com/> +# Copyright (c) 2002-2012 Hypertriton, Inc. <http://hypertriton.com/> # All rights reserved. # # Redistribution and use in source and binary forms, with or without < at >< at > -25,7 +25,9 < at >< at > my $testCode = << 'EOF'; #include <db.h> - +#if DB_VERSION_MAJOR != 4 +#error version +#endif int main(int argc, char *argv[]) { DB *db; db_create(&db, NULL, 0); < at >< at > -45,7 +47,10 < at >< at > for path in $pfx /usr /usr/local /opt; do EOF print << 'EOF'; -if [ -e "${path}/include/db4.7" ]; then +if [ -e "${path}/include/db4.8" ]; then +DB4_CFLAGS="-I${path}/include/db4.8 -I${path}/include" +DB4_VERSION="4.8" +elif [ -e "${path}/include/db4.7" ]; then DB4_CFLAGS="-I${path}/include/db4.7 -I${path}/include" DB4_VERSION="4.7" elif [ -e "${path}/include/db4.6" ]; then < at >< at > -133,6 +138,13 < at >< at > DB4_LIBS="-L${path}/lib -ldb-4.7" fi ;; +4.8) +if [ -e "${path}/lib/db48" ]; then +DB4_LIBS="-L${path}/lib/db48 -ldb" +elif [ -e "${path}/lib/libdb-4.8.so" ]; then +DB4_LIBS="-L${path}/lib -ldb-4.8" +fi +;; *) ;; esac [Less]

Author: vedge Date: 2012-02-22 09:19:53 -0500 (Wed, 22 Feb 2012) New Revision: 938 Modified: trunk/BSDBuild/cracklib.pm Log: set CRACKLIB_DICT_PATH Modified: trunk/BSDBuild/cracklib.pm ... [More] =================================================================== --- trunk/BSDBuild/cracklib.pm2012-02-19 06:28:27 UTC (rev 937) +++ trunk/BSDBuild/cracklib.pm2012-02-22 14:19:53 UTC (rev 938) < at >< at > -28,6 +28,10 < at >< at > '/usr/local', '/usr' ); +my < at >dictPaths = ( +'/usr/local/libdata/cracklib/pw_dict', +'/usr/local/share/cracklib/cracklib-small', +); sub Test { < at >< at > -47,7 +51,7 < at >< at > MkEndif; } MkEndif; - + MkIfNE('${CRACKLIB_LIBS}', ''); MkPrint('ok'); MkPrintN('checking whether cracklib works...'); < at >< at > -61,6 +65,14 < at >< at > } EOF MkSaveIfTrue('${HAVE_CRACKLIB}', 'CRACKLIB_CFLAGS', 'CRACKLIB_LIBS'); +MkIfTrue('${HAVE_CRACKLIB}', ''); +foreach my $path (< at >dictPaths) { +MkIf("-f \"$path.pwd\""); +MkDefine('CRACKLIB_DICT_PATH', "$path"); +MkSaveDefine('CRACKLIB_DICT_PATH'); +MkEndif; +} +MkEndif; MkElse; MkSaveUndef('HAVE_CRACKLIB'); MkPrint('no'); [Less]

Author: vedge Date: 2012-02-19 01:28:27 -0500 (Sun, 19 Feb 2012) New Revision: 937 Modified: trunk/build.www.mk Log: HTML_DEPS, TEMPLATE Modified: trunk/build.www.mk =================================================================== --- ... [More] trunk/build.www.mk2012-02-17 02:44:28 UTC (rev 936) +++ trunk/build.www.mk2012-02-19 06:28:27 UTC (rev 937) < at >< at > -33,7 +33,7 < at >< at > ICONV?=iconv BASEDIR?=${TOP}/m4 XSLDIR?=${TOP}/xsl -TEMPLATE?=csoft +TEMPLATE?=simple LANGUAGES?=en fr DEF_LANGUAGE?=en XSL?=${XSLDIR}/ml.xsl < at >< at > -41,6 +41,7 < at >< at > CLEANFILES?= HTMLDIR?=none HTML?= +HTML_DEPS?= CSS?= CSS_TEMPLATE?=style HTML_OVERWRITE?=No < at >< at > -49,7 +50,7 < at >< at > DTD?=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" \ "http://www.w3.org/TR/html4/loose.dtd"> -all: ${HTML} all-subdir +all: ${HTML} ${CSS} all-subdir clean: clean-www clean-subdir cleandir: clean-www clean-subdir cleandir-subdir install: install-www install-subdir < at >< at > -181,6 +182,10 < at >< at > fi; \ done); \ fi +< at >for F in ${HTML_DEPS}; do \ + echo "${INSTALL_DATA} $$F ${HTMLDIR}"; \ + ${SUDO} ${INSTALL_DATA} $$F ${DESTDIR}${HTMLDIR}; \ +done < at >for F in ${HTML}; do \ rm -f $$F; \ if [ "${HTML_INSTSOURCE}" = "Yes" -a \ [Less]