From owner-svn-ports-head@FreeBSD.ORG Sun Jun 22 14:15:12 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7FEDC53; Sun, 22 Jun 2014 14:15:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C57D3293A; Sun, 22 Jun 2014 14:15:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MEFCIL074781; Sun, 22 Jun 2014 14:15:12 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MEFCHp074780; Sun, 22 Jun 2014 14:15:12 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406221415.s5MEFCHp074780@svn.freebsd.org> From: John Marino Date: Sun, 22 Jun 2014 14:15:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358804 - head/irc/psybnc 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.18 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: Sun, 22 Jun 2014 14:15:12 -0000 Author: marino Date: Sun Jun 22 14:15:12 2014 New Revision: 358804 URL: http://svnweb.freebsd.org/changeset/ports/358804 QAT: https://qat.redports.org/buildarchive/r358804/ Log: irc/psybnc: limit hack to FreeBSD to unbreak DragonFly This "fix" for FreeBSD doesn't look right to me; I don't think it should be using OSVERSION to determine which compiler is being used. Until its fixed better, make sure OSVERSION is only compared on FreeBSD. Modified: head/irc/psybnc/Makefile Modified: head/irc/psybnc/Makefile ============================================================================== --- head/irc/psybnc/Makefile Sun Jun 22 14:01:22 2014 (r358803) +++ head/irc/psybnc/Makefile Sun Jun 22 14:15:12 2014 (r358804) @@ -29,7 +29,7 @@ IS_INTERACTIVE= yes post-patch: @${REINPLACE_CMD} -e 's#=help/#=${PSYBASE}/help/#' ${WRKSRC}/lang/* -.if ( ${OSVERSION} >= 1000024 ) +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024 @${REINPLACE_CMD} -e 's,gcc,clang -Wno-return-type,g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,gcc,clang -Wno-return-type,g' ${WRKSRC}/tools/autoconf.c .endif