Bug 171274 - [PATCH] www/dokuwiki: fix substitusion of pkg-message
Summary: [PATCH] www/dokuwiki: fix substitusion of pkg-message
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Xin LI
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-09-03 08:50 UTC by Yasuhiro Kimura
Modified: 2012-09-03 09:10 UTC (History)
0 users

See Also:


Attachments
patch-dokuwiki (2.61 KB, text/plain)
2012-09-03 08:50 UTC, Yasuhiro Kimura
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro Kimura freebsd_committer freebsd_triage 2012-09-03 08:50:09 UTC
	Fix substitution of pkg-message.

	pkg-message should be simply moved to files/pkg-message.in
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-03 08:50:26 UTC
Responsible Changed
From-To: freebsd-ports-bugs->delphij

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Xin LI freebsd_committer freebsd_triage 2012-09-03 09:00:41 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2012-09-03 09:00:41 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"