Date: Sun, 24 Jan 2010 06:40:23 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143145: [PATCH] net/openmcu: use $SUB_FILES to update openmcu.ini Message-ID: <201001240640.o0O6eNol097006@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001240650.o0O6o3KW086031@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143145
>Category: ports
>Synopsis: [PATCH] net/openmcu: use $SUB_FILES to update openmcu.ini
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 24 06:50:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC
>Description:
no need to invoke sed manually
Added file(s):
- files/openmcu.ini.in
Removed file(s):
- files/openmcu.ini.sample
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- openmcu-2.2.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/openmcu/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile 22 Aug 2009 00:31:35 -0000 1.33
+++ Makefile 24 Jan 2010 06:38:30 -0000
@@ -33,6 +33,8 @@
PLIST_SUB= PORTNAME=${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/openh323
EXAMPLESDIR= ${PREFIX}/share/examples/openh323
+SUB_FILES= openmcu.ini
+SUB_LIST= PORTNAME=${PORTNAME}
.include <bsd.port.pre.mk>
@@ -40,11 +42,6 @@
BROKEN= Does not install
.endif
-pre-install:
- @${SED} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g' \
- -e 's|%%PORTNAME%%|${PORTNAME}|g' \
- ${FILESDIR}/openmcu.ini.sample > ${WRKDIR}/openmcu.ini
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/obj_r/openmcu ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
Index: files/openmcu.ini.in
===================================================================
RCS file: files/openmcu.ini.in
diff -N files/openmcu.ini.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/openmcu.ini.in 24 Jan 2010 06:38:30 -0000
@@ -0,0 +1,13 @@
+[Parameters]
+Password=
+Log Level=2
+HTTP Certificate=%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem
+HTTP Port=1420
+Gatekeeper Mode=Find gatekeeper
+Interface Array Size=0
+Default room=room101
+Connecting WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav
+Entering WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav
+Leaving WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav
+Call log filename=/var/log/%%PORTNAME%%/%%PORTNAME%%_call.log
+
Index: files/openmcu.ini.sample
===================================================================
RCS file: files/openmcu.ini.sample
diff -N files/openmcu.ini.sample
--- files/openmcu.ini.sample 9 Apr 2006 01:09:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-[Parameters]
-Password=
-Log Level=2
-HTTP Certificate=%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem
-HTTP Port=1420
-Gatekeeper Mode=Find gatekeeper
-Interface Array Size=0
-Default room=room101
-Connecting WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav
-Entering WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav
-Leaving WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav
-Call log filename=/var/log/%%PORTNAME%%/%%PORTNAME%%_call.log
-
--- openmcu-2.2.1_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001240640.o0O6eNol097006>