Date: Thu, 4 Nov 2004 12:03:55 -0200 (BRST) From: Antonio Carlos Venancio Junior <antonio@php.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73533: Update port: devel/pear-PEAR Message-ID: <200411041403.iA4E3t6c006845@digitalsign.com> Resent-Message-ID: <200411041410.iA4EAQOv005533@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73533 >Category: ports >Synopsis: Update port: devel/pear-PEAR >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 04 14:10:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Antonio Carlos Venancio Junior <antonio@php.net> >Release: FreeBSD 4.10-STABLE i386 >Organization: >Environment: System: FreeBSD antonio.cb.sc.gov.br 4.10-STABLE FreeBSD 4.10-STABLE #4: Thu Oct 14 15:21:29 BRT 2004 root@antonio.cb.pm.sc.gov.br:/usr/src/sys/compile/ANTONIO i386 >Description: + add support for script installation >How-To-Repeat: >Fix: --- Makefile.old Thu Nov 4 11:50:19 2004 +++ Makefile Thu Nov 4 12:00:25 2004 @@ -7,6 +7,7 @@ PORTNAME= PEAR PORTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= devel www pear MAINTAINER= antonio@php.net --- Makefile.common.old Thu Nov 4 10:13:59 2004 +++ Makefile.common Thu Nov 4 11:49:48 2004 @@ -1,4 +1,4 @@ -# $FreeBSD: /repoman/r/pcvs/ports/devel/pear-PEAR/Makefile.common,v 1.7 2004/08/26 22:29:13 thierry Exp $ +# $FreeBSD: ports/devel/pear-PEAR/Makefile.common,v 1.7 2004/08/26 22:29:13 thierry Exp $ # Common code for pear- ports. @@ -22,6 +22,7 @@ LDOCSDIR= share/doc/pear/${PORTNAME} LEXAMPLESDIR= share/examples/pear/${PORTNAME} LSQLSDIR= ${LPEARDIR}/sql/${PORTNAME} +LSCRIPTSDIR= bin LTESTSDIR= ${LPEARDIR}/tests/${PORTNAME} PEARDIR= ${PHP_BASE}/${LPEARDIR} PKGREGDIR= ${PHP_BASE}/${LPKGREGDIR} @@ -29,6 +30,7 @@ DOCSDIR= ${PHP_BASE}/${LDOCSDIR} EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR} SQLSDIR= ${PHP_BASE}/${LSQLSDIR} +SCRIPTFILESDIR= ${LOCALBASE}/bin TESTSDIR= ${PHP_BASE}/${LTESTSDIR} .if defined(CATEGORY) && !empty(CATEGORY) LINSTDIR= ${LPEARDIR}/${CATEGORY} @@ -41,7 +43,8 @@ PLIST= ${WRKDIR}/PLIST .endif PLIST_SUB= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \ - TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} + TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \ + SCRIPTFILESDIR=${LCRIPTSDIR} PKGINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-install PKGDEINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-deinstall @@ -51,6 +54,7 @@ DOCS?= EXAMPLES?= SQLS?= +SCRIPTFILES?= TESTS?= _DATADIR?= data _DOCSDIR?= docs @@ -61,7 +65,7 @@ # 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 SQLS DATA +.for v in FILES DOCS TESTS EXAMPLES SQLS SCRIPTFILES DATA X${v}DIRS= ${${v}:M*/*:C;/[^/]+$;;} . for XD in ${X${v}DIRS} ALREADYTHERE= 0 @@ -99,6 +103,7 @@ for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \ for file in ${DATA}; do echo "${LDATADIR}/$${file}"; done; \ for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \ + for file in ${SCRIPTFILES}; do echo "${LSCRIPTSDIR}/$${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"; \ @@ -128,10 +133,11 @@ echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \ echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true"; \ echo "@unexec rmdir %D/${LDATADIR:H} 2> /dev/null || true"; \ + echo "@unexec rmdir %D/${LSCRIPTSDIR:H} 2> /dev/null || true"; \ echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST} . endif -. for t in files docs tests sqls examples data +. for t in files docs tests sqls scriptfiles examples data . if !target(do-install-${t}-msg) do-install-${t}-msg: .USE . endif @@ -139,7 +145,7 @@ pre-install: do-generate-plist do-install: do-install-files do-install-docs do-install-tests do-install-sqls \ - do-install-examples do-install-data + do-install-scriptfiles do-install-examples do-install-data do-install-files: do-install-files-msg @${MKDIR} ${INSTDIR} @@ -195,6 +201,17 @@ . endfor . for file in ${SQLS} @${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file} +. endfor +. endif + +do-install-scriptfiles: do-install-scriptfiles-msg +. if !empty(SCRIPTFILES) + @${ECHO_MSG} "===> Installing scripts in ${SCRIPTFILESDIR}." +. for file in ${SCRIPTFILES} + @${MV} ${WRKSRC}/pear-${file} ${WRKSRC}/${file} + @${REINPLACE_CMD} -e "s|@php_bin@|${SCRIPTFILESDIR}/php|g" ${WRKSRC}/${file} + @${INSTALL_DATA} ${WRKSRC}/${file} ${SCRIPTFILESDIR}/${file} + @${CHMOD} 555 ${SCRIPTFILESDIR}/${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?200411041403.iA4E3t6c006845>