Attachment 46133 Details for Bug 70915 – file.diff

[patch] file.diff

file.diff (text/plain), 3.89 KB, created by Antonio Carlos Venancio Junior on 2004-08-24 20:40:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antonio Carlos Venancio Junior

Created: 2004-08-24 20:40:28 UTC

Size: 3.89 KB

patch

obsolete

>--- 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

Actions: View | Diff

Attachments on bug 70915: 46133 | 46134