From owner-freebsd-apache@FreeBSD.ORG  Fri Oct 21 08:02:53 2005
Return-Path: <owner-freebsd-apache@FreeBSD.ORG>
X-Original-To: apache@FreeBSD.org
Delivered-To: freebsd-apache@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D378816A41F;
	Fri, 21 Oct 2005 08:02:53 +0000 (GMT) (envelope-from vd@datamax.bg)
Received: from jengal.datamax.bg (jengal.datamax.bg [82.103.104.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6F38C43D46;
	Fri, 21 Oct 2005 08:02:53 +0000 (GMT) (envelope-from vd@datamax.bg)
Received: from qlovarnika.bg.datamax (qlovarnika.bg.datamax [192.168.10.2])
	by jengal.datamax.bg (Postfix) with SMTP id 3EF9FB83B;
	Fri, 21 Oct 2005 11:02:52 +0300 (EEST)
Received: (nullmailer pid 46145 invoked by uid 1002);
	Fri, 21 Oct 2005 08:02:52 -0000
Date: Fri, 21 Oct 2005 11:02:51 +0300
From: Vasil Dimov <vd@datamax.bg>
To: FreeBSD-gnats-submit@freebsd.org
Message-ID: <20051021080251.GA46069@qlovarnika.bg.datamax>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-send-pr-version: 3.113
X-OS: FreeBSD 6.0-RC1
User-Agent: Mutt/1.5.11
Cc: apache@FreeBSD.org
Subject: duplicate INDEX entry: www/mod_rpaf*
X-BeenThere: freebsd-apache@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: vd@datamax.bg
List-Id: Support of apache-related ports  <freebsd-apache.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-apache>, 
	<mailto:freebsd-apache-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-apache>
List-Post: <mailto:freebsd-apache@freebsd.org>
List-Help: <mailto:freebsd-apache-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-apache>,
	<mailto:freebsd-apache-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Oct 2005 08:02:54 -0000


>Submitter-Id:	current-users
>Originator:	Vasil Dimov
>Organization:	DataMax
>Confidential:	no 
>Synopsis:	duplicate INDEX entry: www/mod_rpaf*
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		sw-bug
>Release:	FreeBSD 6.0-RC1 amd64
>Environment:

>Description:

If apache2 is installed then www/mod_rpaf and www/mod_rpaf2 get
the same name: mod_rpaf-ap2-0.5, which causes warning to be emitted
during "make index" and incorrect "make search" results.

Btw AP_FAST_BUILD is defined twice with the same value...

>How-To-Repeat:

# cd /usr/ports/www/apache2 && make install clean
# cd /usr/ports/www/mod_rpaf && make describe
# cd /usr/ports/www/mod_rpaf2 && make describe

>Fix:

I invented 2 other fixes, but this one is the simplest.

--- mod_rpaf.diff begins here ---
diff -urN mod_rpaf.orig/Makefile mod_rpaf/Makefile
--- mod_rpaf.orig/Makefile	Mon Nov  8 18:17:20 2004
+++ mod_rpaf/Makefile	Fri Oct 21 10:48:33 2005
@@ -14,10 +14,8 @@
 COMMENT=	Make proxied requests appear with client IP
 
 AP_FAST_BUILD=	YES
-AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP2_SRC_FILE=	mod_rpaf-2.0.c
-AP2_PKGNAMESUFFIX=	-ap2
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
--- mod_rpaf.diff ends here ---

--- mod_rpaf2.diff begins here ---
diff -urN mod_rpaf2.orig/Makefile mod_rpaf2/Makefile
--- mod_rpaf2.orig/Makefile	Mon Apr 26 16:09:45 2004
+++ mod_rpaf2/Makefile	Fri Oct 21 10:48:49 2005
@@ -6,6 +6,7 @@
 #
 
 WANT_APACHE=	2
+AP2_PKGNAMESUFFIX=	-ap2
 LATEST_LINK=	mod_rpaf2
 MASTERDIR=	${.CURDIR}/../mod_rpaf
 
--- mod_rpaf2.diff ends here ---