Date: Sun, 8 Apr 2007 13:21:48 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 117645 for review Message-ID: <200704081321.l38DLmqW059081@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=117645 Change 117645 by gabor@gabor_server on 2007/04/08 13:21:40 Roll back current DESTDIR implementation, step 4. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#10 edit .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#3 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#10 (text+ko) ==== @@ -490,7 +490,7 @@ # If this is set to a list of files, these files will be # automatically added to ${SUB_FILES}, some %%VAR%%'s will # automatically be expanded, they will be installed in -# ${TARGETDIR}/etc/rc.d and added to the packing list. +# ${PREFIX}/etc/rc.d and added to the packing list. # USE_RCORDER - List of rc.d startup scripts to be called early in the boot # process. This acts exactly like USE_RC_SUBR except that # scripts are installed in /etc/rc.d. @@ -516,46 +516,23 @@ # Various directory definitions and variables to control them. # You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR. # -# TARGETDIR - The fully qualified path, where everything is installed. -# See the other variables below. -# Default: ${DESTDIR}${PREFIX} -# -# DESTDIR - The path to the environment we are installing to. Define -# this if you want to install packages into a jail -# or into an another FreeBSD environment mounted -# elsewhere than /. ${PREFIX} is relative to -# ${DESTDIR}. E.g. setting DESTDIR=/bla PREFIX=/opt will -# result packages installed under /bla/opt and registered -# under /bla/var/db/pkg. -# Default: not set (means /) -# # X11BASE - Where X11 ports install things. -# Default: ${DESTDIR}/usr/X11R6 -# X11BASE_REL - Same as X11BASE, but relative to DESTDIR # Default: /usr/X11R6 # LOCALBASE - Where non-X11 ports install things. -# Default: ${DESTDIR}/usr/local -# LOCALBASE_REL - Same as LOCALBASE, but relative to DESTDIR # Default: /usr/local # LINUXBASE - Where Linux ports install things. -# Default: ${DESTDIR}/compat/linux -# LINUXBASE_REL - Same as LINUXBASE, but relative to DESTDIR # Default: /compat/linux # PREFIX - Where *this* port installs its files. -# Default: ${X11BASE_REL} if USE_X_PREFIX is set, -# ${LINUXBASE_REL} if USE_LINUX_PREFIX is set, -# otherwise ${LOCALBASE_REL} +# Default: ${X11BASE} if USE_X_PREFIX is set, +# ${LINUXBASE} if USE_LINUX_PREFIX is set, +# otherwise ${LOCALBASE} # # IGNORE_PATH_CHECKS -# - There are some sanity checks against PREFIX and DESTDIR. +# - There are some sanity checks against PREFIX. # You can disable these checks with defining # this variable, but this is not recommended! # Only do this if you really know what you are # doing. These sanity checks are the following: -# - DESTDIR can't be /. Just leave it undefined -# if you want to install to /. -# - DESTDIR has to be an absolute path. -# - DESTDIR can't have a trailing slash. # - PREFIX has to be an absolute path. # - PREFIX can't have a trailing slash. # @@ -636,7 +613,7 @@ # installs its own manpage links so they will show up # correctly in ${PLIST}.) # MANPREFIX - The directory prefix for ${MAN<sect>} and ${MLINKS}. -# Default: ${TARGETDIR} +# Default: ${PREFIX} # MAN<sect>PREFIX # - If manual pages of some sections install in different # locations than others, use these. @@ -927,7 +904,7 @@ # rest of PLIST, so ${PLIST_SUB} substitutions also # apply here. It is recommended that you use # %%PREFIX%% for ${PREFIX}, %%LOCALBASE%% for -# ${LOCALBASE_REL} and %%X11BASE%% for ${X11BASE_REL}. +# ${LOCALBASE} and %%X11BASE%% for ${X11BASE}. # Default: %%PREFIX%%/lib # USE_LDCONFIG - If set to "yes", this subsumes the function of the # deprecated variable INSTALLS_SHLIB and adds ${PREFIX}/lib @@ -950,22 +927,22 @@ # internal to bsd.port.mk and must not be set in your Makefile. # # DOCSDIR - Name of the directory to install the packages docs in. -# Default: ${TARGETDIR}/share/doc/${PORTNAME} -# DOCSDIR_REL - The DOCSDIR relative to ${TARGETDIR} +# Default: ${PREFIX}/share/doc/${PORTNAME} +# DOCSDIR_REL - The DOCSDIR relative to ${PREFIX} # EXAMPLESDIR - Name of the directory to install the packages examples in. -# Default: ${TARGETDIR}/share/examples/${PORTNAME} +# Default: ${PREFIX}/share/examples/${PORTNAME} # EXAMPLESDIR_REL -# - The EXAMPLESDIR relative to ${TARGETDIR} +# - The EXAMPLESDIR relative to ${PREFIX} # DATADIR - Name of the directory to install the packages shared data in. -# Default: ${TARGETDIR}/share/${PORTNAME} -# DATADIR_REL - The DATADIR relative to ${TARGETDIR} +# Default: ${PREFIX}/share/${PORTNAME} +# DATADIR_REL - The DATADIR relative to ${PREFIX} # # WWWDIR - Name of the directory to install the packages www data in. -# Default: ${TARGETDIR}/www/${PORTNAME} -# WWWDIR_REL - The WWWDIR relative to ${TARGETDIR} +# Default: ${PREFIX}/www/${PORTNAME} +# WWWDIR_REL - The WWWDIR relative to ${PREFIX} # # DESKTOPDIR - Name of the directory to install ${DESKTOP_ENTRIES} in. -# Default: ${TARGETDIR}/share/applications +# Default: ${PREFIX}/share/applications # DESKTOP_ENTRIES # - List of desktop entry files to generate and install in # ${DESKTOPDIR}. The format is @@ -1034,9 +1011,9 @@ # it attempts to apply them. # PKG_DBDIR - Where package installation is recorded; this directory # must not contain anything else. -# Default: ${DESTDIR}/var/db/pkg +# Default: /var/db/pkg # PORT_DBDIR - Where port configuration options are recorded. -# Default: ${DESTDIR}/var/db/ports +# Default: /var/db/ports # NO_PKG_REGISTER # - Don't register a port installation as a package. # FORCE_PKG_REGISTER @@ -1526,7 +1503,6 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif -# These do some path checks if DESTDIR is set correctly. # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if (${PREFIX:C,(^.).*,\1,} != "/") @@ -1535,28 +1511,7 @@ @${ECHO_MSG} "is invoked in the work area PREFIX points to the right place." @${FALSE} .endif -.if defined(DESTDIR) -.if (${DESTDIR:C,(^.).*,\1,} != "/") -.if ${DESTDIR} == "/" -.BEGIN: - @${ECHO_MSG} "You can't set DESTDIR to /. Please re-run make with" - @${ECHO_MSG} "DESTDIR unset." - @${FALSE} -.else -.BEGIN: - @${ECHO_MSG} "DESTDIR must be defined as an absolute path so that when 'make'" - @${ECHO_MSG} "is invoked in the work area DESTDIR points to the right place." - @${FALSE} -.endif .endif -.if (${DESTDIR:C,^.*(/)$$,\1,} == "/") -.BEGIN: - @${ECHO_MSG} "DESTDIR can't have a trailing slash. Please remove the trailing" - @${ECHO_MSG} "slash and re-run 'make'" - @${FALSE} -.endif -.endif -.endif X_WINDOW_SYSTEM ?= xorg @@ -2775,7 +2730,7 @@ .if defined(PERL_CONFIGURE) CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ - INSTALLPRIVLIB="${TARGETDIR}/lib" INSTALLARCHLIB="${PREFIX}/lib" + INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" CONFIGURE_SCRIPT?= Makefile.PL MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION} .undef HAS_CONFIGURE @@ -3872,7 +3827,7 @@ | ${XARGS} -0 -J % ${FIND} % -prune ! -type l -type f -print0 2> /dev/null \ | ${XARGS} -0 -n 1 ${OBJDUMP} -R 2> /dev/null > ${WRKDIR}/.PLIST.objdump; \ if \ - ! ${AWK} -v audit="$${PORTS_AUDIT}" -v destdir="${DESTDIR}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \ + ! ${AWK} -v audit="$${PORTS_AUDIT}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \ ${WRKDIR}/.PLIST.flattened ${WRKDIR}/.PLIST.objdump ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable; \ then \ www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ ==== //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#3 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704081321.l38DLmqW059081>