gmane.comp.sysutils.bsdbuild.scm

BSDBuild: r940 - trunk/BSDBuild

BSDBuild-SVN — 2012-04-06T02:15:21

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
===================================================================
--- 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

BSDBuild: r939 - trunk/BSDBuild

BSDBuild-SVN — 2012-02-24T03:18:58

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
===================================================================
--- 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/

BSDBuild: r938 - trunk/BSDBuild

BSDBuild-SVN — 2012-02-22T14:19:53

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
===================================================================
--- 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

BSDBuild: r937 - trunk

BSDBuild-SVN — 2012-02-19T06:28:28

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
===================================================================
--- 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 $

BSDBuild: r936 - trunk

BSDBuild-SVN — 2012-02-17T02:44:28

Author: vedge
Date: 2012-02-16 21:44:28 -0500 (Thu, 16 Feb 2012)
New Revision: 936

Modified:
   trunk/gen-includelinks.pl
   trunk/gen-includes.pl
   trunk/mkconcurrent.pl
Log:
+ gen-includelinks.pl



Modified: trunk/gen-includelinks.pl
===================================================================
--- trunk/gen-includelinks.pl2012-01-20 09:31:32 UTC (rev 935)
+++ trunk/gen-includelinks.pl2012-02-17 02:44:28 UTC (rev 936)
< at >< at > -62,7 +62,7 < at >< at >
 }
 
 if (< at >ARGV < 2) {
-print STDERR "Usage: prep-headers.pl [source-dir] [target-dir]\n";
+print STDERR "Usage: gen-includelinks.pl [source-dir] [target-dir]\n";
 exit(1);
 }
 $srcdir = $ARGV[0];

Modified: trunk/gen-includes.pl
===================================================================
--- trunk/gen-includes.pl2012-01-20 09:31:32 UTC (rev 935)
+++ trunk/gen-includes.pl2012-02-17 02:44:28 UTC (rev 936)
< at >< at > -67,7 +67,7 < at >< at >
 }
 
 if (< at >ARGV < 1) {
-print STDERR "Usage: prep-headers.pl [directory]\n";
+print STDERR "Usage: gen-includes.pl [directory]\n"

BSDBuild: r935 - trunk/BSDBuild

BSDBuild-SVN — 2012-01-20T09:31:33

Author: vedge
Date: 2012-01-20 04:31:32 -0500 (Fri, 20 Jan 2012)
New Revision: 935

Modified:
   trunk/BSDBuild/iconv.pm
Log:
fix -liconv test


Modified: trunk/BSDBuild/iconv.pm
===================================================================
--- trunk/BSDBuild/iconv.pm2012-01-20 08:57:46 UTC (rev 934)
+++ trunk/BSDBuild/iconv.pm2012-01-20 09:31:32 UTC (rev 935)
< at >< at > -106,7 +106,7 < at >< at >
 MkEndif;
 MkCompileC('HAVE_ICONV', '${ICONV_CFLAGS} -Wno-cast-qual',
            '${ICONV_LIBS}', $testCode);
-MkIfTrue('${HAVE_ICONV}');
+MkIfFalse('${HAVE_ICONV}');
 MkPrintN('checking for iconv() in -liconv (const)...');
 MkCompileC('HAVE_ICONV', '${ICONV_CFLAGS} -Wno-cast-qual',
            '${ICONV_LIBS}', $testConstCode);
< at >< at > -131,7 +131,7 < at >< at >
 
 BEGIN
 {
-$DESCR{'iconv'} = 'iconv()';
+$DESCR{'iconv'} = 'iconv() in libc';
 $TESTS{'iconv'} = \&Test;
 $DEPS{'iconv'} = 'cc';
 }

BSDBuild: r934 - trunk/BSDBuild

BSDBuild-SVN — 2012-01-20T08:57:47

Author: vedge
Date: 2012-01-20 03:57:46 -0500 (Fri, 20 Jan 2012)
New Revision: 934

Modified:
   trunk/BSDBuild/cracklib.pm
Log:
look for <packer.h>



Modified: trunk/BSDBuild/cracklib.pm
===================================================================
--- trunk/BSDBuild/cracklib.pm2012-01-20 08:28:03 UTC (rev 933)
+++ trunk/BSDBuild/cracklib.pm2012-01-20 08:57:46 UTC (rev 934)
< at >< at > -41,7 +41,7 < at >< at >
 MkDefine('CRACKLIB_LIBS', "-L$pfx/lib -lcrack");
 MkElse;
 foreach my $dir (< at >autoPrefixDirs) {
-MkIf("-f \"$dir/include/crack.h\"");
+MkIf("-f \"$dir/include/packer.h\"");
 MkDefine('CRACKLIB_CFLAGS', "-I$dir/include");
 MkDefine('CRACKLIB_LIBS', "-L$dir/lib -lcrack");
 MkEndif;
< at >< at > -54,7 +54,7 < at >< at >
 MkCompileC('HAVE_CRACKLIB', '${CRACKLIB_CFLAGS}', '${CRACKLIB_LIBS}',
     << 'EOF');
 #include <stdio.h>
-#include <crack.h>
+#include <packer.h>
 int main(int argc, char *argv[]) {
 const char *msg = (const char *)FascistCheck("foobar", "/path");
 return (msg != NULL);

BSDBuild: r932 - in trunk: . man

BSDBuild-SVN — 2012-01-20T08:23:59

Author: vedge
Date: 2012-01-20 03:23:59 -0500 (Fri, 20 Jan 2012)
New Revision: 932

Modified:
   trunk/man/mkconfigure.1
   trunk/mkconfigure.pl
Log:
implement CHECK_PERL_MODULE() and REQUIRE_PERL_MODULE().



Modified: trunk/man/mkconfigure.1
===================================================================
--- trunk/man/mkconfigure.12012-01-19 07:39:55 UTC (rev 931)
+++ trunk/man/mkconfigure.12012-01-20 08:23:59 UTC (rev 932)
< at >< at > -1,5 +1,5 < at >< at >
 .\"
-.\" Copyright (c) 2007-2010 Hypertriton, Inc. <http://www.hypertriton.com/>
+.\" Copyright (c) 2007-2012 Hypertriton, Inc. <http://www.hypertriton.com/>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
< at >< at > -241,6 +241,16 < at >< at >
 Same as
 .Ev CHECK_FUNCTION() ,
 except that the function is tested using the provided CFLAGS and LIBS.
+.It Ev CHECK_PERL_MODULE(modulename)
+Check that the specified Perl module is installed and functioning.
+For example, if
+.Fa modulename
+is "Time::Zone", the macro will set the var

BSDBuild: r931 - trunk/BSDBuild

BSDBuild-SVN — 2012-01-19T07:39:55

Author: vedge
Date: 2012-01-19 02:39:55 -0500 (Thu, 19 Jan 2012)
New Revision: 931

Modified:
   trunk/BSDBuild/cc.pm
   trunk/BSDBuild/cxx.pm
Log:
quote "$?" test


Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm2012-01-19 07:34:26 UTC (rev 930)
+++ trunk/BSDBuild/cc.pm2012-01-19 07:39:55 UTC (rev 931)
< at >< at > -305,7 +305,7 < at >< at >
 print << "EOF";
 \$LIBTOOL --quiet --mode=compile --tag=CC \$CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o conftest.c 2>>config.log
 EOF
-MkIf('$? == 0');
+MkIf('"$?" = "0"');
 MkPrint('yes');
 MkDefine('LIBTOOLOPTS_CC', '--tag=CC');
 MkElse;

Modified: trunk/BSDBuild/cxx.pm
===================================================================
--- trunk/BSDBuild/cxx.pm2012-01-19 07:34:26 UTC (rev 930)
+++ trunk/BSDBuild/cxx.pm2012-01-19 07:39:55 UTC (rev 931)
< at >< at > -295,7 +295,7 < at >< at >
 print << "EOF";
 \$LIBTOOL --quiet --mode=compile --tag=CXX \$CXX \$CXXFLAGS \$TEST_CXXFLAGS -o \$testdir/conftest.o conf

BSDBuild: r930 - trunk/BSDBuild

BSDBuild-SVN — 2012-01-19T07:34:26

Author: vedge
Date: 2012-01-19 02:34:26 -0500 (Thu, 19 Jan 2012)
New Revision: 930

Modified:
   trunk/BSDBuild/gettext.pm
Log:
fix confusing diagnostic message


Modified: trunk/BSDBuild/gettext.pm
===================================================================
--- trunk/BSDBuild/gettext.pm2011-12-24 03:01:58 UTC (rev 929)
+++ trunk/BSDBuild/gettext.pm2012-01-19 07:34:26 UTC (rev 930)
< at >< at > -52,7 +52,7 < at >< at >
 
 MkCompileC('HAVE_GETTEXT', '${GETTEXT_CFLAGS}', '${GETTEXT_LIBS}', $testCode);
 MkIfFalse('${HAVE_GETTEXT}');
-MkPrintN('checking whether gettext requires -lintl...');
+MkPrintN('checking for a gettext library in -lintl...');
 MkIfNE($pfx, '');
 MkIfExists("$pfx/include/libintl.h");
     MkDefine('GETTEXT_CFLAGS', "-I$pfx/include");
< at >< at > -95,7 +95,7 < at >< at >
 
 BEGIN
 {
-$DESCR{'gettext'} = 'a gettext library';
+$DESCR{'gettext'} = 'a gettext library in libc';
 $TESTS{'gettext'} = \&Test;
 $DEPS{'gettext'} = 'cc';
 }

BSDBuild: r929 - trunk/BSDBuild

BSDBuild-SVN — 2011-12-24T03:01:58

Author: vedge
Date: 2011-12-23 22:01:58 -0500 (Fri, 23 Dec 2011)
New Revision: 929

Modified:
   trunk/BSDBuild/Builtins.pm
Log:
scan for "glibtool"; make sure ${LIBTOOL} is GNU libtool.



Modified: trunk/BSDBuild/Builtins.pm
===================================================================
--- trunk/BSDBuild/Builtins.pm2011-12-19 03:42:59 UTC (rev 928)
+++ trunk/BSDBuild/Builtins.pm2011-12-24 03:01:58 UTC (rev 929)
< at >< at > -148,6 +148,10 < at >< at >
 else
 LIBTOOL=""
 for path in `echo $PATH | sed 's/:/ /g'`; do
+if [ -x "${path}/glibtool" ]; then
+LIBTOOL="${path}/glibtool"
+break
+fi
 if [ -x "${path}/libtool" ]; then
 LIBTOOL="${path}/libtool"
 break
< at >< at > -157,7 +161,12 < at >< at >
 LIBTOOL_BUNDLED="yes"
 LIBTOOL=\${TOP}/mk/libtool/libtool
 else
-LIBTOOL_BUNDLED="no"
+if [ "`libtool --version |grep GNU`" = "" ]; then
+LIBTOOL_BUNDLED="yes"
+LIBTOOL=\${TOP}/mk/libtool/libtool
+else
+LIBTOOL_BUNDLED="no"
+fi
 fi
 fi
 echo "LIBTOOL_BUNDLED=${LIBTOOL_BUNDLED}" >> Makefile.config

BSDBuild: r927 - trunk/BSDBuild

BSDBuild-SVN — 2011-12-19T03:27:41

Author: vedge
Date: 2011-12-18 22:27:41 -0500 (Sun, 18 Dec 2011)
New Revision: 927

Modified:
   trunk/BSDBuild/cc.pm
   trunk/BSDBuild/cxx.pm
Log:
fix test for libtool --tag



Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm2011-12-11 06:02:48 UTC (rev 926)
+++ trunk/BSDBuild/cc.pm2011-12-19 03:27:41 UTC (rev 927)
< at >< at > -303,7 +303,7 < at >< at >
 print 'cat << EOT > conftest.c', "\n",
       'int main(int argc, char *argv[]) { return (0); }', "\nEOT\n";
 print << "EOF";
-\$LIBTOOL --quiet --mode=compile \$CC --tag=CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o conftest.c 2>>config.log
+\$LIBTOOL --quiet --mode=compile --tag=CC \$CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o conftest.c 2>>config.log
 EOF
 MkIf('$? == 0');
 MkPrint('yes');

Modified: trunk/BSDBuild/cxx.pm
===================================================================
--- trunk/BSDBuild/cxx.pm2011-12-11 06:02:48 UTC (rev 926)
+++ trunk/BSDBuild/cxx.pm2011-12-

BSDBuild: r928 - trunk

BSDBuild-SVN — 2011-12-19T03:42:59

Author: vedge
Date: 2011-12-18 22:42:59 -0500 (Sun, 18 Dec 2011)
New Revision: 928

Modified:
   trunk/build.lib.mk
Log:
work around more libtool "--tag=CC" stupidity



Modified: trunk/build.lib.mk
===================================================================
--- trunk/build.lib.mk2011-12-19 03:27:41 UTC (rev 927)
+++ trunk/build.lib.mk2011-12-19 03:42:59 UTC (rev 928)
< at >< at > -244,27 +244,27 < at >< at >
                 done; \
     if [ "${LIB_SHARED}" = "Yes" ]; then \
         if [ "${LIB_MODULE}" = "Yes" ]; then \
-                echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \
+                echo "${LIBTOOL} ${LIBTOOLOPTS} ${LIBTOOLOPTS_CC} --mode=link \
     ${CC} -o lib${LIB}.la \
     -module \
             -rpath ${PREFIX}/lib \
                     -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \
             ${LDFLAGS} $$_shobjs \
             ${LIBS} ${LIB_XOBJS}"; \
-                ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \
+                ${LIBTOOL} ${LIBTOOLOPTS} ${LIBTOOLOPTS_CC} -

BSDBuild: r926 - trunk

BSDBuild-SVN — 2011-12-11T06:02:50

Author: vedge
Date: 2011-12-11 01:02:48 -0500 (Sun, 11 Dec 2011)
New Revision: 926

Modified:
   trunk/uman.pl
Log:
invoke groff directly and pass -P-c



Modified: trunk/uman.pl
===================================================================
--- trunk/uman.pl2011-12-11 04:03:16 UTC (rev 925)
+++ trunk/uman.pl2011-12-11 06:02:48 UTC (rev 926)
< at >< at > -15,7 +15,8 < at >< at >
 < at >SRC_DIRS = split(':', $ENV{'UMANPATH'});
 
 # Formatting engine
-$NROFF = 'nroff -Tascii -mandoc';
+#$NROFF = 'nroff -Tascii -mandoc';
+$NROFF = 'groff -S -P-h -Wall -mtty-char -man -Tascii -P-c -mandoc';
 
 if (< at >ARGV < 1) { die "Usage: aman [manpage]"; }
 my $query = $ARGV[0];

BSDBuild: r925 - trunk

BSDBuild-SVN — 2011-12-11T04:03:17

Author: vedge
Date: 2011-12-10 23:03:16 -0500 (Sat, 10 Dec 2011)
New Revision: 925

Modified:
   trunk/build.man.mk
Log:
in install-man target, use "${SUDO} env ..." instead of "env ... ${SUDO}",
since sudo may clear the environment.



Modified: trunk/build.man.mk
===================================================================
--- trunk/build.man.mk2011-12-11 02:40:02 UTC (rev 924)
+++ trunk/build.man.mk2011-12-11 04:03:16 UTC (rev 925)
< at >< at > -367,99 +367,99 < at >< at >
 
 install-man:
 < at >if [ "${MAN1}" != "" -a "${NOMAN}" != "yes" ]; then \
-    env MAN="${MAN1}" CATMAN="${CATMAN1}" NOCATMAN="${NOCATMAN}" \
+    ${SUDO} env MAN="${MAN1}" CATMAN="${CATMAN1}" NOCATMAN="${NOCATMAN}" \
         INSTALL_DATA="${INSTALL_DATA}" \
 MANDIR="${DESTDIR}${MANDIR}/man1" \
         CATMANDIR="${DESTDIR}${MANDIR}/cat1" \
-        ${SUDO} ${SH} ${TOP}/mk/install-manpages.sh; \
+        ${SH} ${TOP}/mk/install-manpages.sh; \
     if [ $$? != 0 ]; then \
     echo "install-manpages.sh failed"; \
 exit 1; \
     fi;

BSDBuild: r924 - in trunk: . BSDBuild man

BSDBuild-SVN — 2011-12-11T02:40:02

Author: vedge
Date: 2011-12-10 21:40:02 -0500 (Sat, 10 Dec 2011)
New Revision: 924

Modified:
   trunk/BSDBuild/cc.pm
   trunk/BSDBuild/cxx.pm
   trunk/build.lib.mk
   trunk/man/build.lib.mk.5
Log:
test for --tag=CC / --tag=CXX retardation; add LIBTOOLOPTS_{CC,CXX} options.



Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm2011-11-19 04:31:49 UTC (rev 923)
+++ trunk/BSDBuild/cc.pm2011-12-11 02:40:02 UTC (rev 924)
< at >< at > -296,6 +296,23 < at >< at >
 return (0);
 }
 EOF
+
+MkPrintN('checking for libtool --tag=CC retardation...');
+my $code = << 'EOF';
+EOF
+print 'cat << EOT > conftest.c', "\n",
+      'int main(int argc, char *argv[]) { return (0); }', "\nEOT\n";
+print << "EOF";
+\$LIBTOOL --quiet --mode=compile \$CC --tag=CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o conftest.c 2>>config.log
+EOF
+MkIf('$? == 0');
+MkPrint('yes');
+MkDefine('LIBTOOLOPTS_CC', '--tag=CC');
+MkElse;
+MkPrint('no');
+MkEndif;
+MkSaveMK('LIBTOOL

BSDBuild: r923 - trunk/BSDBuild

BSDBuild-SVN — 2011-11-19T04:31:49

Author: vedge
Date: 2011-11-18 23:31:49 -0500 (Fri, 18 Nov 2011)
New Revision: 923

Modified:
   trunk/BSDBuild/glu.pm
Log:
gcc 4.6 retardation


Modified: trunk/BSDBuild/glu.pm
===================================================================
--- trunk/BSDBuild/glu.pm2011-10-18 01:54:43 UTC (rev 922)
+++ trunk/BSDBuild/glu.pm2011-11-19 04:31:49 UTC (rev 923)
< at >< at > -88,6 +88,7 < at >< at >
 int main(int argc, char *argv[]) {
 GLUquadric *qd;
 qd = gluNewQuadric();
+gluDeleteQuadric(qd);
 return (0);
 }
 EOF

BSDBuild: r922 - trunk/BSDBuild

BSDBuild-SVN — 2011-10-18T01:54:43

Author: vedge
Date: 2011-10-17 21:54:43 -0400 (Mon, 17 Oct 2011)
New Revision: 922

Modified:
   trunk/BSDBuild/portaudio.pm
Log:
work around portaudio2's conflicting header install dir.


Modified: trunk/BSDBuild/portaudio.pm
===================================================================
--- trunk/BSDBuild/portaudio.pm2011-09-22 02:26:46 UTC (rev 921)
+++ trunk/BSDBuild/portaudio.pm2011-10-18 01:54:43 UTC (rev 922)
< at >< at > -24,7 +24,7 < at >< at >
 # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE..
 
 my $testCode = << 'EOF';
-#include <portaudio.h>
+#include <portaudio2/portaudio.h>
 
 int
 main(int argc, char *argv[])
< at >< at > -61,20 +61,26 < at >< at >
 MkIfNE('${PORTAUDIO_VERSION}', '');
 MkDefine('PORTAUDIO_VERSION', '${PORTAUDIO_VERSION}.0');
 MkEndif;
+foreach my $dir (< at >autoPrefixes) {
+# XXX 
+MkIfExists("$dir/include/portaudio2/portaudio.h");
+MkDefine('PORTAUDIO_CFLAGS', "-I$dir/include \${PORTAUDIO_CFLAGS}");
+MkEndif;
+}
 MkElse;
 MkDefine('PORTAUDIO_CFLAGS', '');
 M

BSDBuild: r921 - trunk

BSDBuild-SVN — 2011-09-22T02:26:46

Author: vedge
Date: 2011-09-21 22:26:46 -0400 (Wed, 21 Sep 2011)
New Revision: 921

Modified:
   trunk/build.lib.mk
   trunk/build.man.mk
   trunk/build.prog.mk
Log:
Add missing ${DESTDIR} in tests when creating installation dirs;
thanks Stephen Webb!


Modified: trunk/build.lib.mk
===================================================================
--- trunk/build.lib.mk2011-09-21 03:53:18 UTC (rev 920)
+++ trunk/build.lib.mk2011-09-22 02:26:46 UTC (rev 921)
< at >< at > -386,7 +386,7 < at >< at >
 
 install-lib: ${LIBTOOL_COOKIE}
 < at >if [ "${INCL}" != "none" -a "${INCL}" != "none" ]; then \
-    if [ ! -d "${INCLDIR}" ]; then \
+    if [ ! -d "${DESTDIR}${INCLDIR}" ]; then \
                 echo "${INSTALL_DATA_DIR} ${INCLDIR}"; \
                 ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${INCLDIR}; \
     fi; \
< at >< at > -397,7 +397,7 < at >< at >
 fi
 < at >if [ "${LIB}" != "" -a "${USE_LIBTOOL}" = "Yes" -a \
       "${LIB_INSTALL}" = "Yes" ]; then \
-    if [ ! -d "${LIBDIR}" ]; then \
+    if [ ! -d "${DESTDIR}${LIBDIR}" ]; then \

BSDBuild: r920 - trunk

BSDBuild-SVN — 2011-09-21T03:53:19

Author: vedge
Date: 2011-09-20 23:53:18 -0400 (Tue, 20 Sep 2011)
New Revision: 920

Modified:
   trunk/manlinks.pl
Log:
allow manlinks to be explicitely defined by manpages with "MANLINK(foo)"


Modified: trunk/manlinks.pl
===================================================================
--- trunk/manlinks.pl2011-09-19 00:06:51 UTC (rev 919)
+++ trunk/manlinks.pl2011-09-21 03:53:18 UTC (rev 920)
< at >< at > -17,6 +17,10 < at >< at >
 $section = $2;
 
 while (<STDIN>) {
+if (/^\.\\"\s*MANLINK\s*\(([\w\-]+)\)/) {
+print "MANLINKS+=$man.${section}:$1.${section}\n";
+print "CATLINKS+=$man.cat${section}:$1.cat${section}\n";
+}
 if (/^\.nr nS 1/) { $ns = 1; }
 elsif (/^\.nr nS 0/ || /^\.\\" NOMANLINK/) { $ns = 0; }
 next unless $ns;

BSDBuild: r919 - trunk/BSDBuild

BSDBuild-SVN — 2011-09-19T00:06:51

Author: vedge
Date: 2011-09-18 20:06:51 -0400 (Sun, 18 Sep 2011)
New Revision: 919

Modified:
   trunk/BSDBuild/png.pm
Log:
add missing HAVE_LIBPNG14 undef in Emul()


Modified: trunk/BSDBuild/png.pm
===================================================================
--- trunk/BSDBuild/png.pm2011-09-18 23:20:44 UTC (rev 918)
+++ trunk/BSDBuild/png.pm2011-09-19 00:06:51 UTC (rev 919)
< at >< at > -94,7 +94,7 < at >< at >
 
 if ($os eq 'windows') {
 MkDefine('HAVE_PNG', 'no');
-MkSaveUndef('HAVE_PNG', 'PNG_CFLAGS', 'PNG_LIBS');
+MkSaveUndef('HAVE_PNG', 'HAVE_LIBPNG14', 'PNG_CFLAGS', 'PNG_LIBS');
 MkSaveMK('PNG_CFLAGS', 'PNG_LIBS');
 return (1);
 }
< at >< at > -115,6 +115,8 < at >< at >
 }
 MkDefine('HAVE_PNG', 'yes');
 MkSave('HAVE_PNG', 'PNG_CFLAGS', 'PNG_LIBS');
+MkDefine('HAVE_LIBPNG14', 'no');
+MkSave('HAVE_LIBPNG14');
 return (1);
 }