diff options
| author | obache <obache@pkgsrc.org> | 2011-10-29 14:40:00 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2011-10-29 14:40:00 +0000 |
| commit | b7d9cf5bd04ef537c35260e012339cea8754f77c (patch) | |
| tree | d94252f8dc7b4f83002febc0e45d8eaab5fe51b6 /lang/python27 | |
| parent | 2e114682a5230820832429cd5dbf125f419f5996 (diff) | |
| download | pkgsrc-b7d9cf5bd04ef537c35260e012339cea8754f77c.tar.gz | |
Revert last commit, and simple fix.
Drop "@pkgdir lib/python${PY_VER_SUFFIX}/test/data" from PLIST.common_end,
it should be removed at updated to 2.7.1rc1.
Diffstat (limited to 'lang/python27')
| -rw-r--r-- | lang/python27/DEINSTALL | 19 | ||||
| -rw-r--r-- | lang/python27/Makefile | 3 | ||||
| -rw-r--r-- | lang/python27/PLIST.common_end | 2 |
3 files changed, 4 insertions, 20 deletions
diff --git a/lang/python27/DEINSTALL b/lang/python27/DEINSTALL deleted file mode 100644 index e891ff479c4..00000000000 --- a/lang/python27/DEINSTALL +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.1 2011/10/29 13:45:49 marino Exp $ - -# DEINSTALL is used rather than @pkgdir because the automatic directory -# deletion mechanism makes python packages remove these directories first, -# and thus "Directory disappeared" messages will likely appear under @pkgdir - -case ${STAGE} in -POST-DEINSTALL) - CYCLE="@PREFIX@/lib/python@PY_VER_SUFFIX@/test/data \ - @PREFIX@/lib/python@PY_VER_SUFFIX@/lib-old" - for genpath in ${CYCLE}; do - if [ -d ${genpath} ]; then - if [ -n `${LS} -A ${$genpath}` ]; then - ${RMDIR} ${genpath} - fi - fi - done - ;; -esac diff --git a/lang/python27/Makefile b/lang/python27/Makefile index dbacd285127..47c852f5641 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2011/10/29 13:45:50 marino Exp $ +# $NetBSD: Makefile,v 1.9 2011/10/29 14:40:00 obache Exp $ .include "dist.mk" @@ -52,6 +52,7 @@ PLIST_SRC= ${.CURDIR}/../../lang/python27/PLIST.common .if exists(${.CURDIR}/../../lang/python27/PLIST.${OPSYS}) PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.${OPSYS} .endif +PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.common_end .if ${OPSYS} == "NetBSD" PRIVILEGED_STAGES+= clean diff --git a/lang/python27/PLIST.common_end b/lang/python27/PLIST.common_end new file mode 100644 index 00000000000..71a27b64721 --- /dev/null +++ b/lang/python27/PLIST.common_end @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.common_end,v 1.3 2011/10/29 14:40:00 obache Exp $ +@pkgdir lib/python${PY_VER_SUFFIX}/lib-old |