From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 1 02:20:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 838F41065687 for ; Wed, 1 Apr 2009 02:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5BFB78FC13 for ; Wed, 1 Apr 2009 02:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n312K1N0069790 for ; Wed, 1 Apr 2009 02:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n312K1ho069789; Wed, 1 Apr 2009 02:20:01 GMT (envelope-from gnats) Resent-Date: Wed, 1 Apr 2009 02:20:01 GMT Resent-Message-Id: <200904010220.n312K1ho069789@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B8701065676 for ; Wed, 1 Apr 2009 02:12:14 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f167.google.com (mail-fx0-f167.google.com [209.85.220.167]) by mx1.freebsd.org (Postfix) with ESMTP id 06BB98FC14 for ; Wed, 1 Apr 2009 02:12:13 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: by fxm11 with SMTP id 11so2598634fxm.43 for ; Tue, 31 Mar 2009 19:12:13 -0700 (PDT) Received: by 10.103.214.8 with SMTP id r8mr2582864muq.6.1238551933119; Tue, 31 Mar 2009 19:12:13 -0700 (PDT) Received: from localhost (93-80-222-178.broadband.corbina.ru [93.80.222.178]) by mx.google.com with ESMTPS id s10sm12989135muh.22.2009.03.31.19.12.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 31 Mar 2009 19:12:11 -0700 (PDT) Message-Id: <86tz59w2aa.fsf@gmail.com> Date: Wed, 01 Apr 2009 06:11:57 +0400 From: Anonymous To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/133261: [patch] www/free-sa: respect system cflags and expose DEBUG macro X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2009 02:20:01 -0000 >Number: 133261 >Category: ports >Synopsis: [patch] www/free-sa: respect system cflags and expose DEBUG macro >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 01 02:20:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Anonymous >Release: FreeBSD 8.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD luffy 8.0-CURRENT FreeBSD 8.0-CURRENT #0 r190587M: Tue Mar 31 05:09:20 UTC 2009 root@luffy:/usr/obj/usr/src/sys/PHOENIX amd64 Tested only compilation. >Description: - don't override system cflags (-O2 -pipe -fno-strict-aliasing) - allow changing DEBUG macro from make.conf, expose it as DEBUG_LEVEL; for some reason defining DEBUG in make.conf doesn't work here even if global.mk uses `?=' - move all changes to global.mk in *one* place, i.e. replace ${PATCHDIR}/patch-global.mk with one line substitution in post-patch target - reshape REINPLACE_CMD line for easy modification, eg. removing one substitution corresponds one line in diff - mark as MAKE_JOBS_SAFE >How-To-Repeat: >Fix: --- free-sa.diff begins here --- Index: www/free-sa/Makefile =================================================================== RCS file: /home/csup/ports/www/free-sa/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- www/free-sa/Makefile 30 Dec 2008 23:55:22 -0000 1.13 +++ www/free-sa/Makefile 1 Apr 2009 01:59:21 -0000 @@ -13,16 +13,25 @@ MASTER_SITES= SF MAINTAINER= toxa@toxahost.ru COMMENT= Statistic analyzer for daemons log files similar to SARG +MAKE_JOBS_SAFE= yes + PORTDOCS= COPYING INSTALL README README.DEV ChangeLog FAQ THANKS DOCSDIR= share/doc/free-sa-${DISTVERSION} MAN1= free-sa.1 MAN5= free-sa.conf.5 +DEBUG_LEVEL?= 0 + .include post-patch: - @${REINPLACE_CMD} -e 's,PREFIX =,PREFIX ?=,' ${WRKSRC}/global.mk + @${REINPLACE_CMD} \ + -e 's,PREFIX =,PREFIX ?=,' \ + -e 's,$$(PREFIX)/var/www/htdocs,$$(PREFIX)/www/data,' \ + -e 's,^CFLAGS =,CFLAGS +=,' \ + -e 's,DEBUG = .*,DEBUG = ${DEBUG_LEVEL},' \ + ${WRKSRC}/global.mk .if defined(NOPORTDOCS) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile Index: www/free-sa/files/patch-global.mk =================================================================== RCS file: www/free-sa/files/patch-global.mk diff -N www/free-sa/files/patch-global.mk --- www/free-sa/files/patch-global.mk 7 Apr 2007 04:25:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- global.mk.orig Wed Apr 4 15:43:18 2007 -+++ global.mk Wed Apr 4 15:43:35 2007 -@@ -10,7 +10,7 @@ - # etc dir - ETCDIR = $(PREFIX)/etc/$(PROGLNAME) - # where put reports (you can change it later via free-sa.conf configuration file) --WWWDIR = $(PREFIX)/var/www/htdocs/$(PROGLNAME) -+WWWDIR = $(PREFIX)/www/data/$(PROGLNAME) - # dir for temporary data storing (you can change it later via free-sa.conf configuration file) - TMPDIR = /var/cache/$(PROGLNAME) - # where log file lives (you can change it later via free-sa.conf configuration file) --- free-sa.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: