Date: Mon, 3 Sep 2012 16:48:41 +0900 (JST) From: Yasuhiro KIMURA <yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/171274: [PATCH] www/dokuwiki: fix substitusion of pkg-message Message-ID: <20120903074841.7E0582E524@eastasia.home.utahime.org> Resent-Message-ID: <201209030750.q837o9cC061343@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171274
>Category: ports
>Synopsis: [PATCH] www/dokuwiki: fix substitusion of pkg-message
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 03 07:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120903074841.7E0582E524>