From owner-svn-ports-head@FreeBSD.ORG Mon Feb 24 10:31:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E7DFE35; Mon, 24 Feb 2014 10:31:59 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E4AE1257; Mon, 24 Feb 2014 10:31:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1OAVwnx057511; Mon, 24 Feb 2014 10:31:58 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1OAVwHj057509; Mon, 24 Feb 2014 10:31:58 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201402241031.s1OAVwHj057509@svn.freebsd.org> From: Emanuel Haupt Date: Mon, 24 Feb 2014 10:31:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345797 - in head/ports-mgmt/chucky: . 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.17 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: Mon, 24 Feb 2014 10:31:59 -0000 Author: ehaupt Date: Mon Feb 24 10:31:58 2014 New Revision: 345797 URL: http://svnweb.freebsd.org/changeset/ports/345797 QAT: https://qat.redports.org/buildarchive/r345797/ Log: Fix even more issues with the upstream Makefile: - Respect CFLAGS - Respect CC - Don't hardcode /usr/local Notified by: olli hauer Modified: head/ports-mgmt/chucky/Makefile head/ports-mgmt/chucky/files/patch-Makefile Modified: head/ports-mgmt/chucky/Makefile ============================================================================== --- head/ports-mgmt/chucky/Makefile Mon Feb 24 10:31:40 2014 (r345796) +++ head/ports-mgmt/chucky/Makefile Mon Feb 24 10:31:58 2014 (r345797) @@ -15,7 +15,7 @@ LICENSE_NAME= CHUCKY BSD LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} -LIB_DEPENDS= pkg:${PORTSDIR}/ports-mgmt/pkg \ +LIB_DEPENDS= libpkg.so:${PORTSDIR}/ports-mgmt/pkg \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 USE_GITHUB= yes @@ -24,8 +24,6 @@ GH_PROJECT= chucky GH_TAGNAME= 075defe GH_COMMIT= ${GH_TAGNAME} -WRKSRC= ${WRKDIR}/waitman-chucky-075defe - SUB_FILES= pkg-message SUB_LIST= MAN7PREFIX="${MAN7PREFIX}" PORTDOCS= * Modified: head/ports-mgmt/chucky/files/patch-Makefile ============================================================================== --- head/ports-mgmt/chucky/files/patch-Makefile Mon Feb 24 10:31:40 2014 (r345796) +++ head/ports-mgmt/chucky/files/patch-Makefile Mon Feb 24 10:31:58 2014 (r345797) @@ -1,5 +1,19 @@ --- ./Makefile.orig 2013-03-22 05:11:27.000000000 +0100 -+++ ./Makefile 2014-02-24 09:55:51.627688711 +0100 ++++ ./Makefile 2014-02-24 11:23:24.503330584 +0100 +@@ -1,8 +1,8 @@ +-prefix=/usr/local +-man7dir=/usr/local/man/man7 +-CC=clang +-CFLAGS=-I/usr/local/include +-LDFLAGS=-L/usr/local/lib -lsqlite3 ++prefix=${PREFIX} ++man7dir=${MANPREFIX}/man/man7 ++CC?=clang ++CFLAGS+=-I${LOCALBASE}/include ++LDFLAGS+=-L${LOCALBASE}/lib -lsqlite3 + + all: chucky + @@ -12,8 +12,9 @@ rm chucky