From amdmi3@mail.ru  Tue Sep  5 04:04:03 2006
Return-Path: <amdmi3@mail.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 575F616A4DD
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Sep 2006 04:04:03 +0000 (UTC)
	(envelope-from amdmi3@mail.ru)
Received: from mx27.mail.ru (mx27.mail.ru [194.67.23.64])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 92C0643D60
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Sep 2006 04:03:58 +0000 (GMT)
	(envelope-from amdmi3@mail.ru)
Received: from [213.148.29.33] (port=15075 helo=nexii.panopticon)
	by mx27.mail.ru with esmtp 
	id 1GKSAH-000J4U-00
	for FreeBSD-gnats-submit@freebsd.org; Tue, 05 Sep 2006 08:03:57 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.2])
	by nexii.panopticon (Postfix) with ESMTP id 3865917043
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Sep 2006 02:44:02 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 439FB428B; Tue,  5 Sep 2006 02:44:29 +0400 (MSD)
Message-Id: <20060904224429.439FB428B@hades.panopticon>
Date: Tue,  5 Sep 2006 02:44:29 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@mail.ru>
Reply-To: Dmitry Marakasov <amdmi3@mail.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] 5 ports: fix curly-related typos in makefiles
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         102883
>Category:       ports
>Synopsis:       [patch] 5 ports: fix curly-related typos in makefiles
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 05 04:10:20 GMT 2006
>Closed-Date:    Thu Sep 07 10:32:22 GMT 2006
>Last-Modified:  Thu Sep 07 10:32:22 GMT 2006
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Fri Aug 11 00:27:45 MSD 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386

>Description:
Some ports have typos in makefiles - missed or wrongly placed curly brackets. These can lead to errors, as none of `$CAT aaa' `${CAT aaa' `$CAT} aaa' `${CAT{ aaa' will be properly expanded my make.

Catched with following perl regexps (are those useful for portlint?):

# Catches ${FOO{
/\$\{[0-9A-Za-z_]+\{/
# Catches ${FOO/bla-bla (closing curly missing)
/\$\{[0-9A-Za-z_]+[ \/]/
# Catches $FOO} (opening curly missing), but not commonly encountered {print $1}
/\$[0-9A-Za-z_]{2,}\}/

>How-To-Repeat:
>Fix:

--- ports.patch begins here ---
diff -ruN ports.orig/japaneese/ptex-base/Makefile ports/japaneese/ptex-base/Makefile
--- ports.orig/japaneese/ptex-base/Makefile	Tue Sep  5 02:21:15 2006
+++ ports/japaneese/ptex-base/Makefile	Tue Sep  5 02:21:51 2006
@@ -153,7 +153,7 @@
 	@if [ ! -d ${TEXMF_TREE}/dvipdfm ]; then \
 	  ${LN} -fs ${TEXMF_TREE}/dvipdfm-teTeX-dist ${TEXMF_TREE}/dvipdfm; \
 	  fi
-	@if [ ! -e $TEXMF_TREE}/web2c/texmf.cnf ]; then \
+	@if [ ! -e ${TEXMF_TREE}/web2c/texmf.cnf ]; then \
 	  ${LN} -fs ${TEXMF_TREE}/web2c/texmf.cnf-teTeX-dist ${TEXMF_TREE}/web2c/texmf.cnf; \
 	  fi
 	@${RM} ${TEXMF_TREE}/ls-R
diff -ruN ports.orig/math/pari/Makefile ports/math/pari/Makefile
--- ports.orig/math/pari/Makefile	Tue Sep  5 02:21:15 2006
+++ ports/math/pari/Makefile	Tue Sep  5 02:22:48 2006
@@ -42,7 +42,7 @@
 .if ${HAVE_PERL} != "nope"
 PLIST=		${PKGDIR}/pkg-plist.emacs.perl
 .else
-PLIST=		${PKGDIR/pkg-plit.emacs.noperl
+PLIST=		${PKGDIR}/pkg-plit.emacs.noperl
 .endif
 .else
 .if ${HAVE_PERL} != "nope"
diff -ruN ports.orig/misc/posixtestsuite/Makefile ports/misc/posixtestsuite/Makefile
--- ports.orig/misc/posixtestsuite/Makefile	Tue Sep  5 02:21:15 2006
+++ ports/misc/posixtestsuite/Makefile	Tue Sep  5 02:23:08 2006
@@ -96,7 +96,7 @@
 regression:	run
 	@${ECHO} "Show regression log..."
 	@(cd ${WRKSRC} && diff -u ${FILESDIR}/${REGR_LOG} ${RUN_RESULT}) > ${LOCAL_REGR_LOG}
-	@[ -z ${LOCAL_REGR_LOG ] || ( ${ECHO} "No regression detected"; exit 0 )
+	@[ -z ${LOCAL_REGR_LOG} ] || ( ${ECHO} "No regression detected"; exit 0 )
 	@${ECHO} "Regression log stored at ${LOCAL_REGR_LOG}"
 
 .include <bsd.port.post.mk>
diff -ruN ports.orig/net-mgmt/rancid/Makefile ports/net-mgmt/rancid/Makefile
--- ports.orig/net-mgmt/rancid/Makefile	Tue Sep  5 02:23:55 2006
+++ ports/net-mgmt/rancid/Makefile	Tue Sep  5 02:24:14 2006
@@ -63,7 +63,7 @@
 	${ECHO} "       : *** review ${file}.sample for new/deprecated switches or install in place ${file}";  \
 	fi
 .endfor
-	@ if [ -f ${PREFIX}/rancid/$NEWERCONFIG_FILE1} ] ; then \
+	@ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE1} ] ; then \
 	${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \
 	${ECHO} "       : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \
 	fi
diff -ruN ports.orig/www/pubcookie-login-server/Makefile ports/www/pubcookie-login-server/Makefile
--- ports.orig/www/pubcookie-login-server/Makefile	Tue Sep  5 02:21:15 2006
+++ ports/www/pubcookie-login-server/Makefile	Tue Sep  5 02:24:30 2006
@@ -83,6 +83,6 @@
 	${ECHO_CMD} "# Generated with Makefile.templates target" > Makefile.templates
 	${ECHO_CMD} "LOGIN_TEMPLATES+=" `cd ${WRKSRC} && make -V LOGIN_TEMPLATES | ${SED} -e 's| *./src/login_templates.generic/| |g'` >> Makefile.templates
 	${ECHO_CMD} "LOGIN_IMAGES+=" `cd ${WRKSRC} && make -V LOGIN_IMAGES | ${SED} -e 's| *./src/login_templates.generic/images/| |g'` >> Makefile.templates
-	${CAT{ Makefile.templates
+	${CAT} Makefile.templates
 
 .include <bsd.port.post.mk>
--- ports.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Thu Sep 7 10:32:09 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102883 
>Unformatted:
