From dan@xeon.unixathome.org  Mon Apr 17 14:00:27 2006
Return-Path: <dan@xeon.unixathome.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E91CA16A406
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Apr 2006 14:00:26 +0000 (UTC)
	(envelope-from dan@xeon.unixathome.org)
Received: from m21.unixathome.org (m21.unixathome.org [205.150.199.217])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9F5AF43D48
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Apr 2006 14:00:23 +0000 (GMT)
	(envelope-from dan@xeon.unixathome.org)
Received: from localhost (localhost [205.150.199.217])
	by m21.unixathome.org (Postfix) with ESMTP id C69C8C369
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Apr 2006 10:00:21 -0400 (EDT)
Received: from m21.unixathome.org ([205.150.199.217])
	by localhost (m21.unixathome.org [205.150.199.217]) (amavisd-new, port 10024)
	with ESMTP id 02651-04 for <FreeBSD-gnats-submit@freebsd.org>;
	Mon, 17 Apr 2006 10:00:15 -0400 (EDT)
Received: from bast.unixathome.org (bast.unixathome.org [70.26.229.230])
	by m21.unixathome.org (Postfix) with ESMTP id BB85DBF57
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Apr 2006 10:00:13 -0400 (EDT)
Received: from xeon.unixathome.org (xeon.unixathome.org [10.55.0.18])
	by bast.unixathome.org (Postfix) with ESMTP id 34ADFB826
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Apr 2006 10:00:10 -0400 (EDT)
Received: by xeon.unixathome.org (Postfix, from userid 1000)
	id B07CA3E88; Mon, 17 Apr 2006 10:00:10 -0400 (EDT)
Message-Id: <20060417140010.B07CA3E88@xeon.unixathome.org>
Date: Mon, 17 Apr 2006 10:00:10 -0400 (EDT)
From: Dan Langille <dan@langille.org>
Reply-To: Dan Langille <dan@langille.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Dan Langille <dan@langille.org>
Subject: [MAINTAINER UPDATE] - move pkg-message to files directory 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95923
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] - move pkg-message to files directory
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 17 14:10:15 GMT 2006
>Closed-Date:    Mon Apr 17 15:26:00 GMT 2006
>Last-Modified:  Mon Apr 17 15:26:00 GMT 2006
>Originator:     Dan Langille
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
The FreeBDS Diary
>Environment:
System: FreeBSD xeon.unixathome.org 4.9-STABLE FreeBSD 4.9-STABLE #2: Wed Mar 3 08:16:24 EST 2004 dan@polo.unixathome.org:/usr/obj/usr/src/sys/XEON i386

Move pkg-message to files/pkg-message.in so we can get
the correct value for DOCSDIR.

	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- bacula-server.patch begins here ---
diff -ruN bacula-server/Makefile /usr/ports/sysutils/bacula-server/Makefile
--- bacula-server/Makefile	Mon Apr 17 09:26:22 2006
+++ /usr/ports/sysutils/bacula-server/Makefile	Sun Apr 16 05:18:55 2006
@@ -22,8 +22,6 @@
 
 USE_RC_SUBR?=	bacula-dir bacula-sd
 
-SUB_FILES+=	pkg-message
-
 # The user/group IDs below are registered, see
 # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
 #
@@ -342,14 +340,14 @@
 	@${ECHO_MSG} "For USB support read the bacula manual!! It could be necessary"
 	@${ECHO_MSG} "to configure/compile a new kernel!"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Look at ${PREFIX}/share/bacula/update_bacula_tables for"
+	@${ECHO_MSG} "Look at $PREFIX/share/bacula/update_bacula_tables for"
 	@${ECHO_MSG} "database update procedure. Details can be found in the"
 	@${ECHO_MSG} "ReleaseNotes"
 .endif
 	@${ECHO_MSG} "*********************************************************************"
 
 .if !defined(WITH_CLIENT_ONLY)
-	${CAT} ${PKGMESSAGE}
+	${CAT} pkg-message
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN bacula-server/files/pkg-message.in /usr/ports/sysutils/bacula-server/files/pkg-message.in
--- bacula-server/files/pkg-message.in	Mon Apr 17 09:48:10 2006
+++ /usr/ports/sysutils/bacula-server/files/pkg-message.in	Wed Dec 31 19:00:00 1969
@@ -1,20 +0,0 @@
-################################################################################
-  Please read this file:
-
-	%%DOCSDIR%%/ReleaseNotes
-
-  for the upgrade procedure!
-
-  IF YOU IGNORE THIS you may !! LOSE DATA !!
-
-  WARNING: That file also contains important information regarding
-  Windows FD, blackslashes in FileSets, and Scratch Pools.
-
-  For USB support read the manual. It may be necessary 
-  to configure/compile a new kernel.
-
-  Please note that bacula-server no longer installs the client
-  and that the documentation can be optionally installed with the 
-  client port (sysutils/bacula-client).
-
-################################################################################
diff -ruN bacula-server/pkg-message /usr/ports/sysutils/bacula-server/pkg-message
--- bacula-server/pkg-message	Wed Dec 31 19:00:00 1969
+++ /usr/ports/sysutils/bacula-server/pkg-message	Sun Apr 16 05:18:55 2006
@@ -0,0 +1,20 @@
+################################################################################
+  Please read the file"
+
+	${DOCSDIR}/ReleaseNotes"
+
+  for the upgrade procedure!
+
+  IF YOU IGNORE THIS you may !! LOSE DATA !!
+
+  For USB support read the manual. It could be necessary 
+  to configure/compile a new kernel!
+
+  Please note that bacula-server no longer installs the client
+  and that the documentation can be optionally installed with the 
+  client port (sysutils/bacula-client).
+
+  WARNING: please read ReleaseNotes for important information
+  regarding Windows FD, blackslashes in FileSets, and Scratch Pools.
+
+################################################################################
--- bacula-server.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Mon Apr 17 15:08:40 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95923 
State-Changed-From-To: open->feedback 
State-Changed-By: garga 
State-Changed-When: Mon Apr 17 15:09:06 UTC 2006 
State-Changed-Why:  
Ask submitter/maintainer about the patch 

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

From: Renato Botelho <garga@FreeBSD.org>
To: bug-followup@FreeBSD.org,  dan@langille.org
Cc:  
Subject: Re: ports/95923: [MAINTAINER UPDATE] - move pkg-message to files
 directory
Date: Mon, 17 Apr 2006 12:05:46 -0300

 Hello!
 
 Are you sure about this patch? It seems to be reverse patch.
 
 Regards
 -- 
 Renato Botelho <garga @ FreeBSD.org>
                <freebsd @ galle.com.br>
 GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc

From: Dan Langille <dan@langille.org>
To: bug-followup@FreeBSD.org, Renato Botelho <garga@FreeBSD.org>
Cc:  
Subject: Re: ports/95923: [MAINTAINER UPDATE] - move pkg-message to files
 directory
Date: Mon, 17 Apr 2006 11:13:58 -0400 (EDT)

 Yes, sorry, that is a reverse patch.
 
 Try this one instead:
 
 diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile
 --- /usr/ports/sysutils/bacula-server/Makefile	Sun Apr 16 05:18:55 2006
 +++ bacula-server/Makefile	Mon Apr 17 09:26:22 2006
 @@ -22,6 +22,8 @@
 
  USE_RC_SUBR?=	bacula-dir bacula-sd
 
 +SUB_FILES+=	pkg-message
 +
  # The user/group IDs below are registered, see
  # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
  #
 @@ -340,14 +342,14 @@
  	@${ECHO_MSG} "For USB support read the bacula manual!! It could be necessary"
  	@${ECHO_MSG} "to configure/compile a new kernel!"
  	@${ECHO_MSG} ""
 -	@${ECHO_MSG} "Look at $PREFIX/share/bacula/update_bacula_tables for"
 +	@${ECHO_MSG} "Look at ${PREFIX}/share/bacula/update_bacula_tables for"
  	@${ECHO_MSG} "database update procedure. Details can be found in the"
  	@${ECHO_MSG} "ReleaseNotes"
  .endif
  	@${ECHO_MSG} "*********************************************************************"
 
  .if !defined(WITH_CLIENT_ONLY)
 -	${CAT} pkg-message
 +	${CAT} ${PKGMESSAGE}
  .endif
 
  .include <bsd.port.post.mk>
 diff -ruN /usr/ports/sysutils/bacula-server/files/pkg-message.in bacula-server/files/pkg-message.in
 --- /usr/ports/sysutils/bacula-server/files/pkg-message.in	Wed Dec 31 19:00:00 1969
 +++ bacula-server/files/pkg-message.in	Mon Apr 17 09:48:10 2006
 @@ -0,0 +1,20 @@
 +################################################################################
 +  Please read this file:
 +
 +	%%DOCSDIR%%/ReleaseNotes
 +
 +  for the upgrade procedure!
 +
 +  IF YOU IGNORE THIS you may !! LOSE DATA !!
 +
 +  WARNING: That file also contains important information regarding
 +  Windows FD, blackslashes in FileSets, and Scratch Pools.
 +
 +  For USB support read the manual. It may be necessary
 +  to configure/compile a new kernel.
 +
 +  Please note that bacula-server no longer installs the client
 +  and that the documentation can be optionally installed with the
 +  client port (sysutils/bacula-client).
 +
 +################################################################################
 diff -ruN /usr/ports/sysutils/bacula-server/pkg-message bacula-server/pkg-message
 --- /usr/ports/sysutils/bacula-server/pkg-message	Sun Apr 16 05:18:55 2006
 +++ bacula-server/pkg-message	Wed Dec 31 19:00:00 1969
 @@ -1,20 +0,0 @@
 -################################################################################
 -  Please read the file"
 -
 -	${DOCSDIR}/ReleaseNotes"
 -
 -  for the upgrade procedure!
 -
 -  IF YOU IGNORE THIS you may !! LOSE DATA !!
 -
 -  For USB support read the manual. It could be necessary
 -  to configure/compile a new kernel!
 -
 -  Please note that bacula-server no longer installs the client
 -  and that the documentation can be optionally installed with the
 -  client port (sysutils/bacula-client).
 -
 -  WARNING: please read ReleaseNotes for important information
 -  regarding Windows FD, blackslashes in FileSets, and Scratch Pools.
 -
 -################################################################################
 
 
 -- 
 Dan Langille - http://www.langille.org/
 BSDCan - The Technical BSD Conference: http://www.bsdcan.org/
State-Changed-From-To: feedback->closed 
State-Changed-By: garga 
State-Changed-When: Mon Apr 17 15:25:59 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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