From yasu@home.utahime.org  Mon Sep  3 07:48:49 2012
Return-Path: <yasu@home.utahime.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E28761065670
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Sep 2012 07:48:49 +0000 (UTC)
	(envelope-from yasu@home.utahime.org)
Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210])
	by mx1.freebsd.org (Postfix) with ESMTP id 91B178FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Sep 2012 07:48:48 +0000 (UTC)
Received: from eastasia.home.utahime.org (mail.home.utahime.org [192.168.174.1])
	by gate.utahime.jp (Postfix) with ESMTP id DFE642E421;
	Mon,  3 Sep 2012 16:48:41 +0900 (JST)
Received: from eastasia.home.utahime.org (localhost [127.0.0.1])
	by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id AD7222EBC8;
	Mon,  3 Sep 2012 16:48:41 +0900 (JST)
Received: by eastasia.home.utahime.org (Postfix, from userid 1000)
	id 7E0582E524; Mon,  3 Sep 2012 16:48:41 +0900 (JST)
Message-Id: <20120903074841.7E0582E524@eastasia.home.utahime.org>
Date: Mon,  3 Sep 2012 16:48:41 +0900 (JST)
From: Yasuhiro KIMURA <yasu@utahime.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] www/dokuwiki: fix substitusion of pkg-message
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171274
>Category:       ports
>Synopsis:       [PATCH] www/dokuwiki: fix substitusion of pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 03 07:50:09 UTC 2012
>Closed-Date:    Mon Sep 03 08:02:20 UTC 2012
>Last-Modified:  Mon Sep  3 08:10:03 UTC 2012
>Originator:     Yasuhiro KIMURA
>Release:        FreeBSD 9.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD xxxx 9.0-RELEASE-p4 FreeBSD 9.0-RELEASE-p4 #0: Sun Aug 12 22:27:34 JST 2012 xxxx i386


	
>Description:
	Fix substitution of pkg-message.

	pkg-message should be simply moved to files/pkg-message.in

	
>How-To-Repeat:
	
>Fix:

	

--- patch-dokuwiki begins here ---
Index: Makefile
===================================================================
RCS file: /usr0/freebsd/cvsroot/ports/www/dokuwiki/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile	18 Jul 2012 20:15:16 -0000	1.55
+++ Makefile	3 Sep 2012 07:34:59 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	dokuwiki
 PORTVERSION=	${DIST_VER:S/${PORTNAME}//:S/-//g}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.splitbrain.org/_media/projects/dokuwiki/ \
 		LOCAL/chinsan/${PORTNAME}
@@ -26,6 +26,8 @@
 WRKSRC=		${WRKDIR}/${DIST_VER}
 PLIST_SUB=	DOKUWIKI_DIR=${DOKUWIKI_DIR}
 TEMP_PLIST=	${WRKDIR}/temp-pkg-plist
+SUB_FILES=	pkg-message
+SUB_LIST+=	PORTNAME=${PORTNAME} DOKUWIKI_DIR=${DOKUWIKI_DIR}
 
 REINPLACE_ARGS=	-i ''
 
@@ -51,7 +53,6 @@
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR}
 
 post-install:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%PORTNAME%%|${PORTNAME}|' \
-		-e 's|%%DOKUWIKI_DIR%%|${DOKUWIKI_DIR}|' ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	9 Oct 2011 09:32:56 -0000	1.10
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-=================================================================
-          	**** NOTE ****
-1) Please add the following to your apache config, and restart.
-    [1;32m#
-    # Directives to allow use of dokuwiki
-    #
-    Alias /%%PORTNAME%% "%%PREFIX%%/%%DOKUWIKI_DIR%%/"[m
-
-2) Open the following page in your browser and follow the instructions:
-    [1;36mhttp://www.your.host/dokuwiki/install.php[m
-
-  For FULL configuration instructions see
-  http://wiki.splitbrain.org/wiki:config
-
-=================================================================
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	3 Sep 2012 07:24:45 -0000
@@ -0,0 +1,15 @@
+=================================================================
+          	**** NOTE ****
+1) Please add the following to your apache config, and restart.
+    [1;32m#
+    # Directives to allow use of dokuwiki
+    #
+    Alias /%%PORTNAME%% "%%PREFIX%%/%%DOKUWIKI_DIR%%/"[m
+
+2) Open the following page in your browser and follow the instructions:
+    [1;36mhttp://www.your.host/dokuwiki/install.php[m
+
+  For FULL configuration instructions see
+  http://wiki.splitbrain.org/wiki:config
+
+=================================================================
--- patch-dokuwiki ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->delphij 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Sep 3 07:50:26 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171274 
State-Changed-From-To: open->closed 
State-Changed-By: delphij 
State-Changed-When: Mon Sep 3 08:00:41 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171274: commit references a PR
Date: Mon,  3 Sep 2012 08:00:41 +0000 (UTC)

 Author: delphij
 Date: Mon Sep  3 07:59:57 2012
 New Revision: 303593
 URL: http://svn.freebsd.org/changeset/ports/303593
 
 Log:
    - Fix substitusion of pkg-message
   
   PR:		ports/171274
   Submitted by:	Yasuhiro KIMURA <yasu utahime.org>
 
 Added:
   head/www/dokuwiki/files/pkg-message.in   (contents, props changed)
 Deleted:
   head/www/dokuwiki/pkg-message
 Modified:
   head/www/dokuwiki/Makefile
 
 Modified: head/www/dokuwiki/Makefile
 ==============================================================================
 --- head/www/dokuwiki/Makefile	Mon Sep  3 07:08:46 2012	(r303592)
 +++ head/www/dokuwiki/Makefile	Mon Sep  3 07:59:57 2012	(r303593)
 @@ -7,7 +7,7 @@
  
  PORTNAME=	dokuwiki
  PORTVERSION=	${DIST_VER:S/${PORTNAME}//:S/-//g}
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	www
  MASTER_SITES=	http://www.splitbrain.org/_media/projects/dokuwiki/ \
  		LOCAL/chinsan/${PORTNAME}
 @@ -26,6 +26,8 @@ DOKUWIKI_DIR?=	www/${PORTNAME}
  WRKSRC=		${WRKDIR}/${DIST_VER}
  PLIST_SUB=	DOKUWIKI_DIR=${DOKUWIKI_DIR}
  TEMP_PLIST=	${WRKDIR}/temp-pkg-plist
 +SUB_FILES=	pkg-message
 +SUB_LIST+=	PORTNAME=${PORTNAME} DOKUWIKI_DIR=${DOKUWIKI_DIR}
  
  REINPLACE_ARGS=	-i ''
  
 @@ -51,7 +53,6 @@ do-install:
  	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR}
  
  post-install:
 -	@${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%PORTNAME%%|${PORTNAME}|' \
 -		-e 's|%%DOKUWIKI_DIR%%|${DOKUWIKI_DIR}|' ${PKGMESSAGE}
 +	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 
 Added: head/www/dokuwiki/files/pkg-message.in
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/www/dokuwiki/files/pkg-message.in	Mon Sep  3 07:59:57 2012	(r303593)
 @@ -0,0 +1,15 @@
 +=================================================================
 +          	**** NOTE ****
 +1) Please add the following to your apache config, and restart.
 +    [1;32m#
 +    # Directives to allow use of dokuwiki
 +    #
 +    Alias /%%PORTNAME%% "%%PREFIX%%/%%DOKUWIKI_DIR%%/"[m
 +
 +2) Open the following page in your browser and follow the instructions:
 +    [1;36mhttp://www.your.host/dokuwiki/install.php[m
 +
 +  For FULL configuration instructions see
 +  http://wiki.splitbrain.org/wiki:config
 +
 +=================================================================
 \ No newline at end of file
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
