macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Delete old vendor files when installing

Browse Source
This commit is contained in:
Joshua Root
2017-01-08 22:30:47 +11:00
parent f4d52e25a3
commit b7e73d8906
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+1 -1
View File
@@ -16,7 +16,7 @@ include Mk/macports.autoconf.mk
all:: Mk/macports.autoconf.mk
Mk/macports.autoconf.mk: Mk/macports.autoconf.mk.in src/config.h.in Makefile.in doc/Makefile.in src/Makefile.in src/cflib1.0/Makefile.in src/cregistry/Makefile.in src/darwintracelib1.0/Makefile.in src/machista1.0/Makefile.in src/macports1.0/Makefile.in src/mpcommon1.0/Makefile.in src/package1.0/Makefile.in src/pextlib1.0/Makefile.in src/port/Makefile.in src/port1.0/Makefile.in src/programs/Makefile.in src/programs/daemondo/Makefile.in src/registry2.0/Makefile.in tests/Makefile.in config.status
Mk/macports.autoconf.mk: Mk/macports.autoconf.mk.in src/config.h.in Makefile.in doc/Makefile.in src/Makefile.in src/cflib1.0/Makefile.in src/cregistry/Makefile.in src/darwintracelib1.0/Makefile.in src/machista1.0/Makefile.in src/macports1.0/Makefile.in src/mpcommon1.0/Makefile.in src/package1.0/Makefile.in src/pextlib1.0/Makefile.in src/port/Makefile.in src/port1.0/Makefile.in src/programs/Makefile.in src/programs/daemondo/Makefile.in src/registry2.0/Makefile.in tests/Makefile.in vendor/Makefile.in config.status
./config.status
${MAKE} clean
portmgr/dmg/postflight.in
+14 -2
View File
@@ -33,8 +33,8 @@
#set -x
# Script identification ('cause more often than not the svn Id is not expanded):
VERSION=2.3.1
# Script identification:
VERSION=2.4
# Abstraction variables:
PREFIX="@prefix@"
@@ -53,6 +53,8 @@ OUR_STRING="${OUR_BASESTRING} on ${TIMESTAMP}"
OLD_MACPORTS_TCL_DIR=${PREFIX}/share/macports/Tcl
OLD_TCL_PACKAGE_DIR=/Library/Tcl
OLD_TCL_FILES="tcl8/8.4/http-2.7.12.tm tcl8/8.4/platform-1.0.12.tm tcl8/8.4/platform-1.0.13.tm tcl8/8.5/tcltest-2.3.5.tm"
OLD_VENDOR_DIRS="thread2.7.0 thread2.7.2 tcllib1.15 tcllib1.17"
# Create config files from defaults if not present
function setup_configs {
@@ -137,6 +139,16 @@ function delete_old_tcl_packages {
if [[ -d "${OLD_MACPORTS_TCL_DIR}" ]]; then
rm -vrf "${OLD_MACPORTS_TCL_DIR}"
fi
for f in ${OLD_TCL_FILES}; do
if [[ -f "${TCL_PACKAGE_PATH}/${f}" ]]; then
rm -vf "${TCL_PACKAGE_PATH}/${f}"
fi
done
for d in ${OLD_VENDOR_DIRS}; do
if [[ -d "${TCL_PACKAGE_PATH}/${d}" ]]; then
rm -vrf "${TCL_PACKAGE_PATH}/${d}"
fi
done
}
# create the user to use for privilege dropping
vendor/Makefile.in
Generated Vendored
+9
View File
@@ -64,11 +64,19 @@ destroot-tcllib: all-tcllib
@umask 0022; $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ DESTDIR=${DESTROOT} TCLSH_PROG=@INTREE_TCLSH@ @VENDOR_TCLLIB_INSTALL@
install: install-tcl install-tclthread install-tclx install-tcllib
TCL_PACKAGE_PATH=@TCL_PACKAGE_PATH@
OLD_TCL_FILES= $(DESTDIR)$(TCL_PACKAGE_PATH)/tcl8/8.4/http-2.7.12.tm \
$(DESTDIR)$(TCL_PACKAGE_PATH)/tcl8/8.4/platform-1.0.12.tm \
$(DESTDIR)$(TCL_PACKAGE_PATH)/tcl8/8.4/platform-1.0.13.tm \
$(DESTDIR)$(TCL_PACKAGE_PATH)/tcl8/8.5/tcltest-2.3.5.tm
install-tcl:
rm -rf $(OLD_TCL_FILES)
@echo ===\> making $(@:%-tcl=%) in ${DIRPRFX}@VENDOR_TCL_SUBDIR@
@umask 0022; $(MAKE) -C @VENDOR_TCL_SUBDIR@ @VENDOR_TCL_INSTALL@
install-tclthread:
rm -rf $(DESTDIR)$(TCL_PACKAGE_PATH)/thread2.7.{0,2}
@echo ===\> making $(@:%-tclthrad=%) in ${DIRPRFX}@VENDOR_TCLTHREAD_SUBDIR@
@umask 0022; $(MAKE) -C @VENDOR_TCLTHREAD_SUBDIR@ @VENDOR_TCLTHREAD_INSTALL@
@@ -77,6 +85,7 @@ install-tclx:
@umask 0022; $(MAKE) -C @VENDOR_TCLX_SUBDIR@ @VENDOR_TCLX_INSTALL@
install-tcllib:
rm -rf $(DESTDIR)$(TCL_PACKAGE_PATH)/tcllib1.1{5,7}
@echo ===\> making $(@:%-tcllib=%) in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
@umask 0022; $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ @VENDOR_TCLLIB_INSTALL@