ports/139472: [PATCH] databases/sqlrelay: fix broken mtree with custom PREFIX

[Sahil Tandon]

>Number:         139472
>Category:       ports
>Synopsis:       [PATCH] databases/sqlrelay: fix broken mtree with custom PREFIX
>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:   Sat Oct 10 06:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sahil Tandon
>Release:        7.2-RELEASE
>Organization:
>Environment:
>Description:
See QATty log:
http://qatty.tecnik93.com//errors/7-STABLE-FPT-CustDir/sqlrelay-0.39.4_1.log
>How-To-Repeat:

>Fix:
Use ${REINPLACE_CMD} instead of files/patch-init-Makefile; dynamically reference ${PREFIX} instead of hard-coding "usr/local".

Patch attached.

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/sqlrelay/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile	22 Aug 2009 00:17:38 -0000	1.61
+++ Makefile	10 Oct 2009 06:31:49 -0000
@@ -134,12 +134,16 @@
 		sqlr-listener.8 sqlr-scaler.8 sqlr-start.8 sqlr-stop.8
 
 post-patch:
-	${REINPLACE_CMD} -E \
+	@${REINPLACE_CMD} -E \
+		-e 's,(freebsd.*)/usr/local(.*rc.d),\1${PREFIX}\2/sqlrelay.sh-sample,' \
+		-e 's,(freebsd/sqlrelay )(.*etc),\1$$(sysconfdir)/sqlrelay-sample,' \
+			${WRKSRC}/init/Makefile
+	@${REINPLACE_CMD} -E \
 		-e 's,/usr/local[[:>:]],${PREFIX},g;' \
 		-e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \
 			${WRKSRC}/acsite.m4
 	@${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile
-	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \
 		-e 's#-release \$$\(SQLR_VERSION\)##g;'
 .ifdef NOPORTDOCS
 	 @${REINPLACE_CMD} '/$$(MAKE) -C doc/d' ${WRKSRC}/Makefile
Index: files/patch-init-Makefile
===================================================================
RCS file: files/patch-init-Makefile
diff -N files/patch-init-Makefile
--- files/patch-init-Makefile	9 May 2005 07:18:06 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- init/Makefile.orig	Mon May  9 01:50:51 2005
-+++ init/Makefile	Mon May  9 01:56:03 2005
-@@ -44,8 +44,8 @@
- endif
- ifeq ($(UNAME),FreeBSD)
- 	$(MKINSTALLDIRS) $(initroot)/usr/local/etc/rc.d
--	$(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d
--	$(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/etc
-+	$(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d/sqlrelay.sh-sample
-+	$(INSTALL) -m 644 freebsd/sqlrelay $(sysconfdir)/sqlrelay-sample
- endif
- ifeq ($(UNAME),SCO_SV)
- 	$(MKINSTALLDIRS) $(initroot)/etc/init.d


>Release-Note:
>Audit-Trail:
>Unformatted: