Date: Tue, 24 Aug 2004 19:39:12 GMT From: Antônio Carlos Venâncio Júnior <antonio@php.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/70915: Update port: devel/pear-PEAR add support for sql dir Message-ID: <200408241939.i7OJdCHe035562@www.freebsd.org> Resent-Message-ID: <200408241940.i7OJeTi2056534@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70915
>Category: ports
>Synopsis: Update port: devel/pear-PEAR add support for sql dir
>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: Tue Aug 24 19:40:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Antônio Carlos Venâncio Júnior
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408241939.i7OJdCHe035562>