From nobody@FreeBSD.org  Wed Jun 15 16:22:08 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 948EE1065672
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 15 Jun 2011 16:22:08 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B2D28FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 15 Jun 2011 16:22:08 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5FGM8tx080557
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 15 Jun 2011 16:22:08 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p5FGM7pD080556;
	Wed, 15 Jun 2011 16:22:07 GMT
	(envelope-from nobody)
Message-Id: <201106151622.p5FGM7pD080556@red.freebsd.org>
Date: Wed, 15 Jun 2011 16:22:07 GMT
From: Derek Brost <derek.brost@eprotex.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net-mgmt/argus3-clients port installation fails with option mysql=off
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: support@spectrum.ru

>Number:         157905
>Category:       ports
>Synopsis:       net-mgmt/argus3-clients port installation fails with option mysql=off
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jlaffaye
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 15 16:30:08 UTC 2011
>Closed-Date:    Thu Jun 16 18:53:51 CEST 2011
>Last-Modified:  Thu Jun 16 17:00:25 UTC 2011
>Originator:     Derek Brost
>Release:        8.2-RELEASE
>Organization:
>Environment:
>Description:
Two binaries in argus-clients are not compiled when the make config option MYSQL is changed from the default ON to OFF. The flag USE_MYSQL is not passed, so the binaries bin/rasql and bin/rasqlinsert are not created. This causes the ports installation script to fail later when attempting to install the non-existent binaries.
>How-To-Repeat:
Procedure:
# cd /usr/ports/net-mgmt/argus3-clients
# make config
- uncheck MYSQL default from ON to OFF
# make install

Result:
===>  Installing for argus-clients-3.0.4.1
===>   Generating temporary packing list
===>  Checking if net-mgmt/argus3-clients already installed
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/ra /usr/local/bin/ra
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rabins /usr/local/bin/rabins
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/racluster /usr/local/bin/racluster
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/racount /usr/local/bin/racount
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/radump /usr/local/bin/radump
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rafilteraddr /usr/local/bin/rafilteraddr
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rahisto /usr/local/bin/rahisto
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/ralabel /usr/local/bin/ralabel
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/ranonymize /usr/local/bin/ranonymize
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rapath /usr/local/bin/rapath
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rapolicy /usr/local/bin/rapolicy
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/raservices /usr/local/bin/raservices
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rasort /usr/local/bin/rasort
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rasplit /usr/local/bin/rasplit
install  -s -o root -g wheel -m 555 /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rasql /usr/local/bin/rasql
install: /usr/ports/net-mgmt/argus3-clients/work/argus-clients-3.0.4.1/bin/rasql: No such file or directory
*** Error code 71

Stop in /usr/ports/net-mgmt/argus3-clients.
*** Error code 1

Stop in /usr/ports/net-mgmt/argus3-clients.
>Fix:
Patch:
# diff -ruN Makefile.old Makefile
--- Makefile.old        2011-06-15 15:27:33.000000000 +0000
+++ Makefile    2011-06-15 15:29:41.000000000 +0000
@@ -51,10 +51,15 @@
 do-install:
 .for i in ra rabins racluster racount radump rafilteraddr \
                rahisto ralabel ranonymize rapath rapolicy \
-               raservices rasort rasplit rasql rasqlinsert rastream \
-               rastrip ratemplate ratimerange ratop ratree rauserdata
+               raservices rasort rasplit rastream rastrip \
+               ratemplate ratimerange ratop ratree rauserdata
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
 .endfor
+.if defined(WITH_MYSQL)
+.for i in rasql rasqlinsert
+       ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
+.endfor
+.endif
 .for i in radark ragraph rahosts raports
        ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
 .endfor

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Jun 15 16:30:19 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157905 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: support@spectrum.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/157905: net-mgmt/argus3-clients port installation fails with option mysql=off
Date: Wed, 15 Jun 2011 16:30:15 UT

 Maintainer of net-mgmt/argus3-clients,
 
 Please note that PR ports/157905 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/157905
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->jlaffaye 
Responsible-Changed-By: jlaffaye 
Responsible-Changed-When: Thu Jun 16 00:21:36 CEST 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157905 

From: Alexander Demin <support@spectrum.ru>
To: bug-followup@FreeBSD.org, derek.brost@eprotex.com
Cc:  
Subject: Re: ports/157905: net-mgmt/argus3-clients port installation fails
 with option mysql=off
Date: Thu, 16 Jun 2011 13:07:12 +0400

 Hello.
 
 I approve this patch.
 
 --=20
 Demin Alexander / Network Administrator
 Group of companies Spectrum / tel. (+7 495) 995-8999
 Russia, Moscow, 125009, Strastnoy blvr. 8
 Web: http://www.spectrum.ru/

From: Derek Brost <derek.brost@eprotex.com>
To: bug-followup@FreeBSD.org
Cc: support@spectrum.ru
Subject: Re: ports/157905: net-mgmt/argus3-clients port installation fails with option mysql=off
Date: Thu, 16 Jun 2011 08:06:05 -0400

 This is a more complete patch including a fix for pkg-plist which will =
 also allow the package to build correctly:
 
 # diff -uN Makefile.old Makefile
 --- Makefile.old        2011-06-15 15:27:33.000000000 +0000
 +++ Makefile    2011-06-15 17:58:08.000000000 +0000
 @@ -34,6 +34,9 @@
 =20
  .if defined(WITH_MYSQL)
  USE_MYSQL=3D     yes
 +PLIST_SUB+=3D MYSQL=3D""
 +.else
 +PLIST_SUB+=3D MYSQL=3D"@comment "
  .endif
 =20
  .if defined(WITH_GEOIP)
 @@ -51,10 +54,15 @@
  do-install:
  .for i in ra rabins racluster racount radump rafilteraddr \
                 rahisto ralabel ranonymize rapath rapolicy \
 -               raservices rasort rasplit rasql rasqlinsert rastream \
 -               rastrip ratemplate ratimerange ratop ratree rauserdata
 +               raservices rasort rasplit rastream rastrip \
 +               ratemplate ratimerange ratop ratree rauserdata
         ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
  .endfor
 +.if defined(WITH_MYSQL)
 +.for i in rasql rasqlinsert
 +       ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
 +.endfor
 +.endif
  .for i in radark ragraph rahosts raports
         ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
  .endfor
 
 # diff -uN pkg-plist.old pkg-plist
 --- pkg-plist.old       2011-06-15 17:58:15.000000000 +0000
 +++ pkg-plist   2011-06-15 17:58:41.000000000 +0000
 @@ -16,8 +16,8 @@
  bin/raservices
  bin/rasort
  bin/rasplit
 -bin/rasql
 -bin/rasqlinsert
 +%%MYSQL%%bin/rasql
 +%%MYSQL%%bin/rasqlinsert
  bin/rastream
  bin/rastrip
  bin/ratemplate=
State-Changed-From-To: feedback->closed 
State-Changed-By: jlaffaye 
State-Changed-When: Thu Jun 16 18:53:49 CEST 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157905 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157905: commit references a PR
Date: Thu, 16 Jun 2011 16:53:49 +0000 (UTC)

 jlaffaye    2011-06-16 16:53:21 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/argus3-clients Makefile pkg-plist 
   Log:
   Fix installation and plist when the MYSQL option is off
   
   PR:             ports/157905
   Submitted by:   Derek Brost <derek.brost@eprotex.com>
   Approved by:    Alexander Demin <support@spectrum.ru> (maintainer), bapt (mentor)
   
   Revision  Changes    Path
   1.7       +9 -1      ports/net-mgmt/argus3-clients/Makefile
   1.3       +2 -2      ports/net-mgmt/argus3-clients/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
