From owner-svn-ports-head@FreeBSD.ORG Tue May 14 08:54:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0C380858; Tue, 14 May 2013 08:54:25 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F2EE1B07; Tue, 14 May 2013 08:54:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4E8sOsa039576; Tue, 14 May 2013 08:54:24 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4E8sO9W039573; Tue, 14 May 2013 08:54:24 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201305140854.r4E8sO9W039573@svn.freebsd.org> From: Pietro Cerutti Date: Tue, 14 May 2013 08:54:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318148 - in head/mail/zmailer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 May 2013 08:54:25 -0000 Author: gahr Date: Tue May 14 08:54:24 2013 New Revision: 318148 URL: http://svnweb.freebsd.org/changeset/ports/318148 Log: - Fix build Reported by: miwi (Tcl/Tk 86 exp-run) Added: head/mail/zmailer/files/patch-include_listutils.h (contents, props changed) head/mail/zmailer/files/patch-libsh_listmalloc.c (contents, props changed) Modified: head/mail/zmailer/Makefile Modified: head/mail/zmailer/Makefile ============================================================================== --- head/mail/zmailer/Makefile Tue May 14 08:49:23 2013 (r318147) +++ head/mail/zmailer/Makefile Tue May 14 08:54:24 2013 (r318148) @@ -20,7 +20,7 @@ USE_PERL5= yes .include -.if ${PORT_OPTIONS:MSSL} +.if !${PORT_OPTIONS:MSSL} CONFIGURE_ARGS= --without-openssl .else .include "${PORTSDIR}/Mk/bsd.openssl.mk" @@ -61,20 +61,14 @@ SUB_FILES= pkg-install PKGINSTALL= ${WRKDIR}/pkg-install USE_RC_SUBR= zmailer -# local variable (we can't use ${SED} here) -DOMAIN!= /bin/hostname | ${SED} -e "s:^"`/bin/hostname -s`"\.*::g" -.if (${DOMAIN} == "") -DOMAIN= "mydomain.com" -.endif - pre-install: - cd ${WRKSRC}/man && make install + cd ${WRKSRC}/man && make ${INSTALL_TARGET} post-install: @${SETENV} PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # set up the initial mail.conf with reasonable settings. @${ECHO_CMD} "# Where am I?" > ${PREFIX}/etc/zmailer/mail.conf.sample - @${ECHO_CMD} "orgdomain="${DOMAIN} >> ${PREFIX}/etc/zmailer/mail.conf.sample + @${ECHO_CMD} "orgdomain="`/bin/hostname | cut -d '.' -f 2-` >> ${PREFIX}/etc/zmailer/mail.conf.sample @${ECHO_CMD} "# Who am I?" >> ${PREFIX}/etc/zmailer/mail.conf.sample @${ECHO_CMD} "hostname="`/bin/hostname -s`'.$$orgdomain' >> ${PREFIX}/etc/zmailer/mail.conf.sample @${ECHO_CMD} "# Who do I claim to be?" >> ${PREFIX}/etc/zmailer/mail.conf.sample Added: head/mail/zmailer/files/patch-include_listutils.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/zmailer/files/patch-include_listutils.h Tue May 14 08:54:24 2013 (r318148) @@ -0,0 +1,20 @@ +--- include/listutils.h.orig 2007-06-29 01:06:06.000000000 +0200 ++++ include/listutils.h 2013-05-14 10:21:40.000000000 +0200 +@@ -64,7 +64,7 @@ + + /* #undef __GNUC__ */ + +-#if defined(__GNUC__) && !defined(PROFILING) && defined(__OPTIMIZE__) ++#if defined(__GNUC__) && !defined(PROFILING) && defined(__OPTIMIZE__) && 0 + + #ifndef EXTINLINE + #define EXTINLINE extern __inline__ +@@ -166,7 +166,7 @@ + + #else /* ---- not profiling ---- */ + +-#if defined(__GNUC__) && !defined(PROFILING) && defined(__OPTIMIZE__) ++#if defined(__GNUC__) && !defined(PROFILING) && defined(__OPTIMIZE__) && 0 + + EXTINLINE conscell *copycell(conscell *X) { + conscell *tmp = newcell(); Added: head/mail/zmailer/files/patch-libsh_listmalloc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/zmailer/files/patch-libsh_listmalloc.c Tue May 14 08:54:24 2013 (r318148) @@ -0,0 +1,11 @@ +--- libsh/listmalloc.c.orig 2013-05-14 09:22:34.000000000 +0200 ++++ libsh/listmalloc.c 2013-05-14 10:13:43.000000000 +0200 +@@ -273,7 +273,7 @@ + + if (depth > deepest_dsw) + deepest_dsw = depth; +- if (depth > 20) *(long*)0 = 0; /* ZAP! */ ++ if (depth > 20) abort(); /* ZAP! */ + while (current && !(current->flags & DSW_MARKER)) { + current->flags |= DSW_MARKER; + if (!STRING(current))