From nobody@FreeBSD.org  Tue Aug 24 19:39:12 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9C59816A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 24 Aug 2004 19:39:12 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7CDD043D2F
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 24 Aug 2004 19:39:12 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.11/8.12.11) with ESMTP id i7OJdClv035563
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 24 Aug 2004 19:39:12 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.11/8.12.11/Submit) id i7OJdCHe035562;
	Tue, 24 Aug 2004 19:39:12 GMT
	(envelope-from nobody)
Message-Id: <200408241939.i7OJdCHe035562@www.freebsd.org>
Date: Tue, 24 Aug 2004 19:39:12 GMT
From: Antnio Carlos Venncio Jnior <antonio@php.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: devel/pear-PEAR add support for sql dir
X-Send-Pr-Version: www-2.3

>Number:         70915
>Category:       ports
>Synopsis:       Update port: devel/pear-PEAR add support for sql dir
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 24 19:40:28 GMT 2004
>Closed-Date:    Thu Aug 26 22:31:42 GMT 2004
>Last-Modified:  Thu Aug 26 22:31:42 GMT 2004
>Originator:     Antnio Carlos Venncio Jnior
>Release:        FreeBSD 5.3-BETA1
>Organization:
>Environment:
FreeBSD antonio.grupos.com.br 5.3-BETA1 FreeBSD 5.3-BETA1 #3: Tue Aug 24 12:23:47 BRT 2004     root@antonio.grupos.com.br:/usr/src/sys/i386/compile/ANTONIO  i386
>Description:
There are several pear-* ports that have a sql subdir. Adding this variables give fix that (SQLS and SQLSDIR).
>How-To-Repeat:
      
>Fix:
--- Makefile.common.old Tue Aug 24 16:00:30 2004
+++ Makefile.common Tue Aug 24 16:11:06 2004
@@ -21,11 +21,13 @@
 LDOCSDIR= share/doc/pear/${PORTNAME}
 LEXAMPLESDIR= share/examples/pear/${PORTNAME}
 LTESTSDIR= ${LPEARDIR}/tests/${PORTNAME}
+LSQLSDIR= ${LPEARDIR}/sql/${PORTNAME}
 PEARDIR= ${PHP_BASE}/${LPEARDIR}
 PKGREGDIR= ${PHP_BASE}/${LPKGREGDIR}
 DOCSDIR= ${PHP_BASE}/${LDOCSDIR}
 EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR}
 TESTSDIR= ${PHP_BASE}/${LTESTSDIR}
+SQLSDIR= ${PHP_BASE}/${LSQLSDIR}
 .if defined(CATEGORY) && !empty(CATEGORY)
 LINSTDIR= ${LPEARDIR}/${CATEGORY}
 .else
@@ -38,7 +40,7 @@
 .endif
 PLIST_SUB= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
   TESTSDIR=${LTESTSDIR} EXAMPLESDIR=${LEXAMPLESDIR} \
-  INSTDIR=${LINSTDIR}
+  INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR}
 
 PKGINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-install
 PKGDEINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-deinstall
@@ -46,15 +48,17 @@
 FILES?=
 DOCS?=
 TESTS?=
+SQLS?=
 EXAMPLES?=
 _TESTSDIR?= tests
+_SQLSDIR?= sql
 _DOCSDIR?= docs
 _EXAMPLESDIR?= examples
 
 # this is an easy way to eliminate duplicate entries in a variable :)
 # if someone knows how to achieve the result without this terrible
 # hack, please tell me!
-.for v in FILES DOCS TESTS EXAMPLES
+.for v in FILES DOCS TESTS EXAMPLES SQLS
 X${v}DIRS= ${${v}:M*/*:C;/[^/]+$;;}
 . for XD in ${X${v}DIRS}
 ALREADYTHERE= 0
@@ -90,6 +94,7 @@
  @${ECHO_MSG} "===>   Generating packing list"; \
  (for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \
  for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \
+ for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \
  for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \
  for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \
  echo "${LPKGREGDIR}/package.xml"; \
@@ -97,11 +102,14 @@
      while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \
  for d in ${TESTS}; do echo $${d}; done | ${DIRFILTER} | \
      while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \
+ for d in ${SQLS}; do echo $${d}; done | ${DIRFILTER} | \
+     while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \
  for d in ${DOCS}; do echo $${d}; done | ${DIRFILTER} | \
      while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \
  for d in ${EXAMPLES}; do echo $${d}; done | ${DIRFILTER} | \
      while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \
  if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \
+ if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \
  if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
  if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
  echo "@dirrm ${LPKGREGDIR}"; \
@@ -112,16 +120,17 @@
  echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \
  echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \
  echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true") > ${PLIST}
+ echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST}
 . endif
 
-. for t in files docs tests examples
+. for t in files docs tests sqls examples
 .  if !target(do-install-${t}-msg)
 do-install-${t}-msg: .USE
 .  endif
 . endfor
 
 pre-install: do-generate-plist
-do-install: do-install-files do-install-docs do-install-tests do-install-examples
+do-install: do-install-files do-install-docs do-install-tests do-install-sqls do-install-examples
 
 do-install-files: do-install-files-msg
  @${MKDIR} ${INSTDIR}
@@ -153,6 +162,18 @@
 .  endfor
 .  for file in ${TESTS}
  @${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}
+.  endfor
+. endif
+
+do-install-sqls: do-install-sqls-msg
+. if !empty(SQLS)
+ @${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}."
+ @${MKDIR} ${SQLSDIR}
+.  for dir in ${SQLSDIRS}
+ @${MKDIR} ${SQLSDIR}/${dir}
+.  endfor
+.  for file in ${SQLS}
+ @${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file}
 .  endfor
 . endif
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Wed Aug 25 05:53:49 GMT 2004 
Responsible-Changed-Why:  

Take it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=70915 

From: Thierry Thomas <thierry@FreeBSD.org>
To: =?iso-8859-1?Q?Ant=F4nio_Carlos_Ven=E2ncio_J=FAnior?= <antonio@php.net>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70915: Update port: devel/pear-PEAR add support for sql dir
Date: Wed, 25 Aug 2004 22:52:55 +0200

 Le Mar 24 ao 04  21:39:12 +0200, Antnio Carlos Venncio Jnior <antonio@php.net>
  crivait:
 > 
 > >Number:         70915
 > >Category:       ports
 > >Synopsis:       Update port: devel/pear-PEAR add support for sql dir
 
 Hello,
 
 The submitted patch does not apply:
 
 patch < /tmp/70915.diff                               /usr/ports/devel/pear-PEAR
 Hmm...  Looks like a unified diff to me...
 The text leading up to this was:
 --------------------------
 |--- Makefile.common.old Tue Aug 24 16:00:30 2004
 |+++ Makefile.common Tue Aug 24 16:11:06 2004
 --------------------------
 Patching file Makefile.common using Plan A...
 Hunk #1 failed at 21.
 Hunk #2 failed at 40.
 Hunk #3 failed at 48.
 Hunk #4 failed at 94.
 Hunk #5 failed at 102.
 Hunk #6 failed at 120.
 Hunk #7 failed at 162.
 7 out of 7 hunks failed--saving rejects to Makefile.common.rej
 done
 
 The file Makefile.common is tabs-indented, but your patch only contains
 spaces. Could you please send it again?
 
 Regards,
 -- 
 Th. Thomas.

From: =?ISO-8859-1?Q?Ant=F4nio_Carlos_Ven=E2ncio_J=FAnior?= <antonio@php.net>
To: Thierry Thomas <thierry@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70915: Update port: devel/pear-PEAR add support for sql
 dir
Date: Wed, 25 Aug 2004 18:09:11 -0300

 This is a multi-part message in MIME format.
 --------------090602030904000801010404
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 8bit
 
 Thierry,
 
 Thierry Thomas wrote:
 > Le Mar 24 ao 04  21:39:12 +0200, Antnio Carlos Venncio Jnior <antonio@php.net>
 >  crivait :
 > 
 >>>Number:         70915
 >>>Category:       ports
 >>>Synopsis:       Update port: devel/pear-PEAR add support for sql dir
 > 
 > 
 > Hello,
 > 
 > The submitted patch does not apply:
 > 
 > patch < /tmp/70915.diff                               /usr/ports/devel/pear-PEAR
 > Hmm...  Looks like a unified diff to me...
 > The text leading up to this was:
 > --------------------------
 > |--- Makefile.common.old Tue Aug 24 16:00:30 2004
 > |+++ Makefile.common Tue Aug 24 16:11:06 2004
 > --------------------------
 > Patching file Makefile.common using Plan A...
 > Hunk #1 failed at 21.
 > Hunk #2 failed at 40.
 > Hunk #3 failed at 48.
 > Hunk #4 failed at 94.
 > Hunk #5 failed at 102.
 > Hunk #6 failed at 120.
 > Hunk #7 failed at 162.
 > 7 out of 7 hunks failed--saving rejects to Makefile.common.rej
 > done
 > 
 > The file Makefile.common is tabs-indented, but your patch only contains
 > spaces. Could you please send it again?
 
 	sure. Copy/paste "killed" the tabs. ;)
 
 > Regards,
 
 
 -- 
 Cya
 
 Antnio
 echo antonio php net | sed 's/ /@/;s/ /./g'
 FreeBSD/OpenBSD | PHP/MySQL/Python | PGP Key ID 0x5BBEB073
 "Can't buy what I want because its FREE!" - Pearl Jam
 
 --------------090602030904000801010404
 Content-Type: text/plain;
  name="Makefile.common.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="Makefile.common.diff"
 
 --- Makefile.common.old	Tue Aug 24 16:00:30 2004
 +++ Makefile.common	Tue Aug 24 16:11:06 2004
 @@ -21,11 +21,13 @@
  LDOCSDIR=	share/doc/pear/${PORTNAME}
  LEXAMPLESDIR=	share/examples/pear/${PORTNAME}
  LTESTSDIR=	${LPEARDIR}/tests/${PORTNAME}
 +LSQLSDIR=	${LPEARDIR}/sql/${PORTNAME}
  PEARDIR=	${PHP_BASE}/${LPEARDIR}
  PKGREGDIR=	${PHP_BASE}/${LPKGREGDIR}
  DOCSDIR=	${PHP_BASE}/${LDOCSDIR}
  EXAMPLESDIR=	${PHP_BASE}/${LEXAMPLESDIR}
  TESTSDIR=	${PHP_BASE}/${LTESTSDIR}
 +SQLSDIR=	${PHP_BASE}/${LSQLSDIR}
  .if defined(CATEGORY) && !empty(CATEGORY)
  LINSTDIR=	${LPEARDIR}/${CATEGORY}
  .else
 @@ -38,7 +40,7 @@
  .endif
  PLIST_SUB=	PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
  		TESTSDIR=${LTESTSDIR} EXAMPLESDIR=${LEXAMPLESDIR} \
 -		INSTDIR=${LINSTDIR}
 +		INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR}
  
  PKGINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-install
  PKGDEINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-deinstall
 @@ -46,15 +48,17 @@
  FILES?=
  DOCS?=
  TESTS?=
 +SQLS?=
  EXAMPLES?=
  _TESTSDIR?=	tests
 +_SQLSDIR?=	sql
  _DOCSDIR?=	docs
  _EXAMPLESDIR?=	examples
  
  # this is an easy way to eliminate duplicate entries in a variable :)
  # if someone knows how to achieve the result without this terrible
  # hack, please tell me!
 -.for v in FILES DOCS TESTS EXAMPLES
 +.for v in FILES DOCS TESTS EXAMPLES SQLS
  X${v}DIRS=	${${v}:M*/*:C;/[^/]+$;;}
  . for XD in ${X${v}DIRS}
  ALREADYTHERE=	0
 @@ -90,6 +94,7 @@
  	@${ECHO_MSG} "===>   Generating packing list"; \
  	(for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \
  	for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \
 +	for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \
  	for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \
  	for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \
  	echo "${LPKGREGDIR}/package.xml"; \
 @@ -97,11 +102,14 @@
  	    while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \
  	for d in ${TESTS}; do echo $${d}; done | ${DIRFILTER} | \
  	    while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \
 +	for d in ${SQLS}; do echo $${d}; done | ${DIRFILTER} | \
 +	    while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \
  	for d in ${DOCS}; do echo $${d}; done | ${DIRFILTER} | \
  	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \
  	for d in ${EXAMPLES}; do echo $${d}; done | ${DIRFILTER} | \
  	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \
  	if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \
 +	if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \
  	if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
  	if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
  	echo "@dirrm ${LPKGREGDIR}"; \
 @@ -112,16 +120,17 @@
  	echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \
  	echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \
  	echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true") > ${PLIST}
 +	echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST}
  . endif
  
 -. for t in files docs tests examples
 +. for t in files docs tests sqls examples
  .  if !target(do-install-${t}-msg)
  do-install-${t}-msg: .USE
  .  endif
  . endfor
  
  pre-install: do-generate-plist
 -do-install: do-install-files do-install-docs do-install-tests do-install-examples
 +do-install: do-install-files do-install-docs do-install-tests do-install-sqls do-install-examples
  
  do-install-files: do-install-files-msg
  	@${MKDIR} ${INSTDIR}
 @@ -153,6 +162,18 @@
  .  endfor
  .  for file in ${TESTS}
  	@${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}
 +.  endfor
 +. endif
 +
 +do-install-sqls: do-install-sqls-msg
 +. if !empty(SQLS)
 +	@${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}."
 +	@${MKDIR} ${SQLSDIR}
 +.  for dir in ${SQLSDIRS}
 +	@${MKDIR} ${SQLSDIR}/${dir}
 +.  endfor
 +.  for file in ${SQLS}
 +	@${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file}
  .  endfor
  . endif
  
 
 --------------090602030904000801010404--
 
State-Changed-From-To: open->closed 
State-Changed-By: thierry 
State-Changed-When: Thu Aug 26 22:31:15 GMT 2004 
State-Changed-Why:  

Committed, thanks! 


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