From ah@crypta.net  Tue Nov 28 10:14:35 2006
Return-Path: <ah@crypta.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DF8A316A412
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Nov 2006 10:14:35 +0000 (UTC)
	(envelope-from ah@crypta.net)
Received: from mail.crypta.net (mail.crypta.net [83.136.131.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 28DCD43ED4
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Nov 2006 10:11:35 +0000 (GMT)
	(envelope-from ah@crypta.net)
Received: by mail.crypta.net (cryptobank/eProtect-smtpd, from userid 1001)
	id 38C41ECD4B5; Tue, 28 Nov 2006 11:11:25 +0100 (CET)
Message-Id: <20061128101125.GA40651@mail.crypta.net>
Date: Tue, 28 Nov 2006 11:11:25 +0100
From: Andy Hilker <ah@crypta.net>
Reply-To: Andy Hilker <ah@crypta.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: amanda-server/client Makefile if-defines / variables of GNUTAR/DUMP_SNAPSHOT wrong
X-Send-Pr-Version: 3.113

>Number:         105942
>Category:       ports
>Synopsis:       amanda-server/client Makefile if-defines / variables of GNUTAR/DUMP_SNAPSHOT wrong
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    kuriyama
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 28 10:20:08 GMT 2006
>Closed-Date:    Wed Nov 29 01:06:05 GMT 2006
>Last-Modified:  Sun Mar 17 04:28:07 UTC 2013
>Originator:     Andy Hilker
>Release:        FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD HOST 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #4: Sun Oct 15 14:49:47 CEST 2006 user@HOST:/usr/obj/usr/src/sys/HOST i386


>Description:
1. WITH_GNUTAR:
make config defaults to on, but the if defined test is wrong, according to:
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-options.html (5.11.2.2 Syntax).

2. WITH_DUMP_SNAPSHOT:
The make config variable names WITH_DUMP_SNAPSHOT but the if defined tests WITH_AMANDA_DUMP_SNAPSHOT.

>How-To-Repeat:
Look at the Makefile and compare the attached patch.


>Fix:
        see attached patch for ports/misc/amanda-server/Makefile

--- Makefile.patch begins here ---
--- Makefile    Fri Nov 24 19:08:15 2006
+++ Makefile    Fri Nov 24 19:45:42 2006
@@ -60,7 +60,7 @@
 CONFIGURE_ARGS+=       --with-portrange=${AMANDA_PORTRANGE}
 .endif

-.if defined(WITH_GNUTAR)
+.if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
                --with-gnutar=${LOCALBASE}/bin/gtar
 BUILD_DEPENDS= gtar:${PORTSDIR}/archivers/gtar
@@ -199,7 +199,7 @@
        ${TOUCH} /etc/amandates
        ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates

-.if defined (WITH_AMANDA_DUMP_SNAPSHOT)
+.if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c
 .endif

--- Makefile.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kuriyama 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Nov 28 10:38:50 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105942 
State-Changed-From-To: open->closed 
State-Changed-By: kuriyama 
State-Changed-When: Wed Nov 29 01:05:55 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/105942: commit references a PR
Date: Wed, 29 Nov 2006 01:05:30 +0000 (UTC)

 kuriyama    2006-11-29 01:05:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     misc/amanda-server   Makefile distinfo 
     misc/amanda-server/files patch-amanda.conf.5 
   Added files:
     misc/amanda-server/files patch-restore.c 
   Log:
   - Upgrade to 2.5.1p2.
   - Add a patch to fix amfetchdump to dump core [1].
   - Fix GNUTAR, DUMP_SNAPSHOT options handling [2].
   
   Submitted by:   Andy Hilker <ah@cryptobank.de> [1][2]
   PR:             ports/105635 [1], ports/105942 [2]
   
   Revision  Changes    Path
   1.94      +3 -3      ports/misc/amanda-server/Makefile
   1.28      +3 -3      ports/misc/amanda-server/distinfo
   1.2       +8 -8      ports/misc/amanda-server/files/patch-amanda.conf.5
   1.1       +18 -0     ports/misc/amanda-server/files/patch-restore.c (new)
 _______________________________________________
 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:
    
