From owner-svn-ports-all@FreeBSD.ORG  Mon Sep  3 07:59:58 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 78A551065679;
	Mon,  3 Sep 2012 07:59:58 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A8BC8FC0C;
	Mon,  3 Sep 2012 07:59:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q837xwDe047074;
	Mon, 3 Sep 2012 07:59:58 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q837xwBM047071;
	Mon, 3 Sep 2012 07:59:58 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201209030759.q837xwBM047071@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 3 Sep 2012 07:59:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303593 - in head/www/dokuwiki: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Sep 2012 07:59:58 -0000

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.
+    #
+    # Directives to allow use of dokuwiki
+    #
+    Alias /%%PORTNAME%% "%%PREFIX%%/%%DOKUWIKI_DIR%%/"
+
+2) Open the following page in your browser and follow the instructions:
+    http://www.your.host/dokuwiki/install.php
+
+  For FULL configuration instructions see
+  http://wiki.splitbrain.org/wiki:config
+
+=================================================================
\ No newline at end of file