From clsung@dragon2.net  Thu Nov 13 19:27:52 2003
Return-Path: <clsung@dragon2.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8B95D16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Nov 2003 19:27:52 -0800 (PST)
Received: from mail.dragon2.net (sungsung.csie.nctu.edu.tw [140.113.215.201])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3032A43F75
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Nov 2003 19:27:51 -0800 (PST)
	(envelope-from clsung@dragon2.net)
Received: from localhost (unknown [127.0.0.1])
	by mail.dragon2.net (Postfix) with ESMTP
	id 3169B1539D; Fri, 14 Nov 2003 03:29:10 +0000 (GMT)
Received: from mail.dragon2.net ([127.0.0.1])
 by localhost (sungsung.csie.nctu.edu.tw [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 98056-06; Fri, 14 Nov 2003 11:29:09 +0800 (CST)
Received: by mail.dragon2.net (Postfix, from userid 1022)
	id C0D0315366; Fri, 14 Nov 2003 11:29:09 +0800 (CST)
Message-Id: <20031114032909.C0D0315366@mail.dragon2.net>
Date: Fri, 14 Nov 2003 11:29:09 +0800 (CST)
From: Cheng-Lung Sung <clsung@dragon2.net>
Reply-To: Cheng-Lung Sung <clsung@dragon2.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: clsung@tiger2.net
Subject: Fix build error
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59275
>Category:       ports
>Synopsis:       [PATCH] www/mod_musicindex: Fix build error
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 13 19:30:23 PST 2003
>Closed-Date:    Thu Nov 20 17:28:59 PST 2003
>Last-Modified:  Thu Nov 20 17:28:59 PST 2003
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD sungsung.csie.nctu.edu.tw 4.9-RELEASE FreeBSD 4.9-RELEASE #5: Wed Oct 29 20:13:25 CST 2003 root@sungsung.csie.nctu.edu.tw:/usr/obj/usr/src/sys/SUNGSUNG i386

>Description:
- Fix build error , noted by Kris.
>How-To-Repeat:
>Fix:

diff -ruN /usr/ports/www/mod_musicindex/Makefile ./mod_musicindex/Makefile
--- /usr/ports/www/mod_musicindex/Makefile	Tue Nov  4 00:17:10 2003
+++ ./mod_musicindex/Makefile	Fri Nov 14 11:22:52 2003
@@ -24,11 +24,15 @@
 APXS?=		${LOCALBASE}/sbin/apxs
 APACHE_PORT?=	${PORTSDIR}/www/apache13
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
 
 DOCS_HTMLIMAGES=	directory.png musicindex.css fetch.png \
 			right_arrow.gif general.png sound.png
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%APACHEPATH%%|${LOCALBASE}/sbin/|g' ${WRKSRC}/Makefile
+
 do-install:
 	${APXS} -i -A -n musicindex ${WRKSRC}/mod_musicindex.so
 .if !defined(NOPORTDOCS)
@@ -38,5 +42,4 @@
 .endfor
 .endif
 	${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff -ruN /usr/ports/www/mod_musicindex/files/patch-Makefile ./mod_musicindex/files/patch-Makefile
--- /usr/ports/www/mod_musicindex/files/patch-Makefile	Tue Nov  4 00:17:10 2003
+++ ./mod_musicindex/files/patch-Makefile	Fri Nov 14 11:19:18 2003
@@ -1,13 +1,24 @@
 --- Makefile.orig	Thu Oct 30 20:41:45 2003
-+++ Makefile	Tue Nov  4 00:03:52 2003
-@@ -15,8 +15,8 @@
++++ Makefile	Fri Nov 14 11:18:57 2003
+@@ -8,16 +8,16 @@
+ ##  @todo auto-dep
+ 
+ #   the tools
+-APXS = apxs
+-APACHECTL = apachectl
++APXS = %%APACHEPATH%%apxs
++APACHECTL = %%APACHEPATH%%apachectl
+ CC = gcc
+ INSTALL = install
  
  #   additional user defines, includes and libraries
  #DEF = 
 -#INC =
 -#LIB = 
+-CFLAGS = -O2 -Wall
 +INC = -I/usr/local/include
 +LIB = -L/usr/local/lib
- CFLAGS = -O2 -Wall
++#CFLAGS = -O2 -Wall
  DOCROOT = /var/www
  
+ #   our own defines

>Release-Note:
>Audit-Trail:

From: "James E. Housley" <jeh@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, clsung@dragon2.net
Cc:  
Subject: Re: ports/59275: [PATCH] www/mod_musicindex: Fix build error
Date: Thu, 20 Nov 2003 20:06:45 -0500

 This patch nolonger applies cleanly with wath looks like "Apache2" 
 patches that were applied.
 -- 
 /"\   ASCII Ribbon Campaign  .
 \ / - NO HTML/RTF in e-mail  .
   X  - NO Word docs in e-mail .
 / \ -----------------------------------------------------------------
 jeh@FreeBSD.org      http://www.FreeBSD.org     The Power to Serve
 jim@TheHousleys.Net  http://www.TheHousleys.net
 ---------------------------------------------------------------------
 Artificial intelligence is no match for natural stupidity.
 

From: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: "James E. Housley" <jeh@FreeBSD.org>
Cc: freebsd-ports-bugs@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org,
	clsung@dragon2.net
Subject: Re: ports/59275: [PATCH] www/mod_musicindex: Fix build error
Date: Fri, 21 Nov 2003 02:16:18 +0100

 On Thu, 20 Nov 2003 17:10:20 -0800 (PST)
 "James E. Housley" <jeh@FreeBSD.org> wrote:
 
 > The following reply was made to PR ports/59275; it has been noted by GNATS.
 > 
 > From: "James E. Housley" <jeh@FreeBSD.org>
 > To: freebsd-gnats-submit@FreeBSD.org, clsung@dragon2.net
 > Cc:  
 > Subject: Re: ports/59275: [PATCH] www/mod_musicindex: Fix build error
 > Date: Thu, 20 Nov 2003 20:06:45 -0500
 > 
 >  This patch nolonger applies cleanly with wath looks like "Apache2" 
 >  patches that were applied.
 
 This patch is no longer need, it was fixed few hours ago with PR 59507.
 
 clem
State-Changed-From-To: open->closed 
State-Changed-By: jeh 
State-Changed-When: Thu Nov 20 17:28:44 PST 2003 
State-Changed-Why:  
No longer needed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59275 
>Unformatted:
