From owner-svn-ports-all@FreeBSD.ORG Fri May 15 09:40:38 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E28CB7D; Fri, 15 May 2015 09:40:38 +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 5C4C31175; Fri, 15 May 2015 09:40:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4F9eccn029058; Fri, 15 May 2015 09:40:38 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4F9ecEO029057; Fri, 15 May 2015 09:40:38 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201505150940.t4F9ecEO029057@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 15 May 2015 09:40:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386393 - head/sysutils/rdate X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 09:40:38 -0000 Author: marino Date: Fri May 15 09:40:37 2015 New Revision: 386393 URL: https://svnweb.freebsd.org/changeset/ports/386393 Log: sysutils/rdate: Unbreak DragonFly after previous commit OSVERSION was used without OPSYS. This fix really should be "if dragonfly or (freebsd osversion < X)" but currently OSVERSION is valid as long as OPSYS <> DragonFly so this change will work and is simpler than the "real" fix. Ideally all of this should be replaced with a feature detection mechanism. Modified: head/sysutils/rdate/Makefile Modified: head/sysutils/rdate/Makefile ============================================================================== --- head/sysutils/rdate/Makefile Fri May 15 08:25:42 2015 (r386392) +++ head/sysutils/rdate/Makefile Fri May 15 09:40:37 2015 (r386393) @@ -18,7 +18,7 @@ PLIST_FILES= sbin/rdate man/man8/${PORTN post-patch: ${REINPLACE_CMD} -e 's,/right,,' ${WRKSRC}/rdate.8 -.if ${OSVERSION} < 1100072 +.if ${OPSYS} == DragonFly || ${OSVERSION} < 1100072 ${REINPLACE_CMD} -e '/^SRCS/s/$$/ reallocarray.c/' ${WRKSRC}/Makefile ${ECHO} 'void *reallocarray(void *optr, size_t nmemb, size_t size);' \ >> ${WRKSRC}/ntpleaps.h