* Remove a hidden build dependency and unsatisfied run dependency on libgcrypt. GnuTLS >= 2.12 does not depend on libgcrypt any longer.
* Don't add filename defines to CPPFLAGS; there are quoting problems and gcc4 ends up warning, gcc3 aborts. Move the setting to Makefile.in. * The database subpackages shouldn't depend on the exact REVISION of the main package. ok? This still doesn't build on alpha due to undefined atomic ops. Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile 5 Sep 2011 18:24:08 -0000 1.8 +++ Makefile 14 Sep 2011 18:05:45 -0000 @@ -15,7 +15,9 @@ PKGNAME-mysql = rsyslog-mysql-$V PKGNAME-pgsql = rsyslog-pgsql-$V CATEGORIES = sysutils -REVISION-main = 2 +REVISION-main = 3 +REVISION-mysql = 0 +REVISION-pgsql = 0 HOMEPAGE = http://www.rsyslog.com/ @@ -35,9 +37,9 @@ WANTLIB-pgsql += crypto com_err pq ssl LIB_DEPENDS-main = security/gnutls \ sysutils/librelp LIB_DEPENDS-mysql = databases/mysql -RUN_DEPENDS-mysql = ${FULLPKGNAME-main}:${BASE_PKGPATH},-main +RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main LIB_DEPENDS-pgsql = databases/postgresql -RUN_DEPENDS-pgsql = ${FULLPKGNAME-main}:${BASE_PKGPATH},-main +RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PKGPATH},-main MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \ http://download.rsyslog.com/rsyslog/ @@ -53,9 +55,7 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --enable-mail \ --enable-gnutls \ --enable-relp -CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include \ - -DSYSLOGD_PIDNAME=\\\"rsyslogd.pid\\\" \ - -DCONFIGFILE=\\\"${SYSCONFDIR}/rsyslog.conf\\\"" +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rsyslog Index: patches/patch-runtime_nsd_gtls_c =================================================================== RCS file: patches/patch-runtime_nsd_gtls_c diff -N patches/patch-runtime_nsd_gtls_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-runtime_nsd_gtls_c 14 Sep 2011 18:05:45 -0000 @@ -0,0 +1,38 @@ +$OpenBSD$ + +GnuTLS >= 2.12 does not depend on libgcrypt initialization any longer +and may in fact not use libgcrypt at all. + +--- runtime/nsd_gtls.c.orig Wed Sep 14 03:05:03 2011 ++++ runtime/nsd_gtls.c Wed Sep 14 03:06:21 2011 +@@ -29,7 +29,9 @@ + #include <string.h> + #include <gnutls/gnutls.h> + #include <gnutls/x509.h> ++#if GNUTLS_VERSION_NUMBER <= 0x020b00 + #include <gcrypt.h> ++#endif + #include <errno.h> + #include <sys/stat.h> + #include <unistd.h> +@@ -53,7 +55,9 @@ + #define CRLFILE "crl.pem" + + ++#if GNUTLS_VERSION_NUMBER <= 0x020b00 + GCRY_THREAD_OPTION_PTHREAD_IMPL; ++#endif + MODULE_TYPE_LIB + + /* static data */ +@@ -559,8 +563,10 @@ gtlsGlblInit(void) + uchar *cafile; + DEFiRet; + ++#if GNUTLS_VERSION_NUMBER <= 0x020b00 + /* gcry_control must be called first, so that the thread system is correctly set up */ + gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); ++#endif + CHKgnutls(gnutls_global_init()); + + /* X509 stuff */ Index: patches/patch-tools_Makefile_in =================================================================== RCS file: patches/patch-tools_Makefile_in diff -N patches/patch-tools_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tools_Makefile_in 14 Sep 2011 18:05:45 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- tools/Makefile.in.orig Tue Sep 13 23:09:17 2011 ++++ tools/Makefile.in Tue Sep 13 23:11:24 2011 +@@ -141,7 +141,8 @@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@ + CYGPATH_W = @CYGPATH_W@ +-DEFS = @DEFS@ ++DEFS = @DEFS@ -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" \ ++ -DCONFIGFILE=\"$(sysconfdir)/rsyslog.conf\" + DEPDIR = @DEPDIR@ + DL_LIBS = @DL_LIBS@ + DSYMUTIL = @DSYMUTIL@ -- Christian "naddy" Weisgerber na...@mips.inka.de
