diff options
| author | ale <ale@FreeBSD.org> | 2005-12-16 15:47:23 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2005-12-16 15:47:23 +0800 |
| commit | f77dc2fbcc8383ff8f9c8457d35015012772185d (patch) | |
| tree | 7ed4a0491300bb4e9168f0c512dc1a101abf70e0 /devel/pear | |
| parent | 7edc098b568b56215c498840a72098ec35fbe384 (diff) | |
| download | freebsd-ports-gnome-f77dc2fbcc8383ff8f9c8457d35015012772185d.tar.gz freebsd-ports-gnome-f77dc2fbcc8383ff8f9c8457d35015012772185d.tar.zst freebsd-ports-gnome-f77dc2fbcc8383ff8f9c8457d35015012772185d.zip | |
Partially revert previous commit and fix auto plist generation.
This should fix harmless directory deletion found by pointyhat.
Diffstat (limited to 'devel/pear')
| -rw-r--r-- | devel/pear/Makefile | 3 | ||||
| -rw-r--r-- | devel/pear/bsd.pear.mk | 8 | ||||
| -rw-r--r-- | devel/pear/pkg-plist | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/devel/pear/Makefile b/devel/pear/Makefile index 57e21b9db105..6f95da3beb62 100644 --- a/devel/pear/Makefile +++ b/devel/pear/Makefile @@ -7,7 +7,7 @@ PORTNAME= pear PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ale @@ -31,7 +31,6 @@ post-patch: do-install: @${LOCALBASE}/bin/php -q ${WRKSRC}/go-pear - @${MKDIR} ${DATADIR}/packages ${DATADIR}/sql @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/devel/pear/bsd.pear.mk b/devel/pear/bsd.pear.mk index b24675a90d77..78fa22927855 100644 --- a/devel/pear/bsd.pear.mk +++ b/devel/pear/bsd.pear.mk @@ -129,16 +129,12 @@ do-generate-plist: if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \ if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \ echo "@dirrm ${LPKGREGDIR}"; \ - echo "@unexec rmdir %D/${LINSTDIR} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LINSTDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LPEARDIR}/.registry 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LPEARDIR}/packages 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LPEARDIR} 2> /dev/null || true"; \ + if [ -n "${CATEGORY}" ]; then echo "@unexec rmdir %D/${LINSTDIR} 2> /dev/null || true"; fi; \ + echo "@unexec rmdir %D/${LPKGREGDIR:H} 2> /dev/null || true"; \ 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"; \ 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 diff --git a/devel/pear/pkg-plist b/devel/pear/pkg-plist index b1b6dd3a469f..d93ec06a6900 100644 --- a/devel/pear/pkg-plist +++ b/devel/pear/pkg-plist @@ -113,10 +113,8 @@ etc/pear.conf %%DATADIR%%/XML/RPC.php %%DATADIR%%/data/PEAR/package.dtd %%DATADIR%%/data/PEAR/template.spec -@exec mkdir -p %D/share/pear/packages 2> /dev/null || true %%DATADIR%%/pearcmd.php %%DATADIR%%/peclcmd.php -@exec mkdir -p %D/share/pear/sql 2> /dev/null || true %%DATADIR%%/tests/XML_RPC/tests/allgot.inc %%DATADIR%%/tests/XML_RPC/tests/empty-value-struct.php %%DATADIR%%/tests/XML_RPC/tests/empty-value.php @@ -165,8 +163,6 @@ etc/pear.conf @unexec rmdir %D/share/pear/XML 2> /dev/null || true @dirrm %%DATADIR%%/data/PEAR @unexec rmdir %D/share/pear/data 2> /dev/null || true -@unexec rmdir %D/share/pear/packages 2> /dev/null || true -@unexec rmdir %D/share/pear/sql 2> /dev/null || true @dirrm %%DATADIR%%/tests/XML_RPC/tests @dirrm %%DATADIR%%/tests/XML_RPC @unexec rmdir %D/share/pear/tests 2> /dev/null || true |