PERFORCE change 115563 for review
Gabor Kovesdan
gabor at FreeBSD.org
Thu Mar 8 22:28:28 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=115563
Change 115563 by gabor at gabor_server on 2007/03/08 22:28:01
Roll back current DESTDIR implementation, step 3.
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#5 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#5 edit
Differences ...
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#5 (text+ko) ====
@@ -1343,12 +1343,6 @@
LOCALBASE?= /usr/local
X11BASE?= /usr/X11R6
LINUXBASE?= /compat/linux
-LOCALBASE_REL:= ${LOCALBASE}
-X11BASE_REL:= ${X11BASE}
-LINUXBASE_REL:= ${LINUXBASE}
-LOCALBASE:= ${LOCALBASE_REL}
-X11BASE:= ${X11BASE_REL}
-LINUXBASE:= ${LINUXBASE_REL}
DISTDIR?= ${PORTSDIR}/distfiles
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
INDEXDIR?= ${PORTSDIR}
@@ -1358,8 +1352,6 @@
INDEXFILE?= INDEX
.endif
-TARGETDIR:= ${PREFIX}
-
.if defined(USE_LINUX_RPM)
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
.endif
@@ -1927,10 +1919,10 @@
PL_BUILD?= Build
CONFIGURE_ARGS+= \
create_packlist=0 \
- install_path=lib="${TARGETDIR}/${SITE_PERL_REL}" \
- install_path=arch="${TARGETDIR}/${SITE_PERL_REL}/${PERL_ARCH}" \
- install_path=script="${TARGETDIR}/bin" \
- install_path=bin="${TARGETDIR}/bin" \
+ install_path=lib="${PREFIX}/${SITE_PERL_REL}" \
+ install_path=arch="${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}" \
+ install_path=script="${PREFIX}/bin" \
+ install_path=bin="${PREFIX}/bin" \
install_path=libdoc="${MAN3PREFIX}/man/man3" \
install_path=bindoc="${MAN1PREFIX}/man/man1"
.elif defined(PERL_CONFIGURE)
@@ -2280,32 +2272,17 @@
.if (${OSVERSION} < 504105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600103) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700012)) && ${PKGORIGIN} != "ports-mgmt/pkg_install"
EXTRACT_DEPENDS+= ${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/ports-mgmt/pkg_install
.endif
-.if !defined(DESTDIR)
PKG_CMD?= ${LOCALBASE}/sbin/pkg_create
PKG_ADD?= ${LOCALBASE}/sbin/pkg_add
PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete
PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version
.else
-PKG_CMD?= ${LOCALBASE}/sbin/pkg_create
-PKG_ADD?= ${CHROOT} ${DESTDIR} ${LOCALBASE}/sbin/pkg_add
-PKG_DELETE?= ${CHROOT} ${DESTDIR} ${LOCALBASE}/sbin/pkg_delete
-PKG_INFO?= ${CHROOT} ${DESTDIR} ${LOCALBASE}/sbin/pkg_info
-.endif
-.else
-.if !defined(DESTDIR)
PKG_CMD?= /usr/sbin/pkg_create
PKG_ADD?= /usr/sbin/pkg_add
PKG_DELETE?= /usr/sbin/pkg_delete
PKG_INFO?= /usr/sbin/pkg_info
PKG_VERSION?= /usr/sbin/pkg_version
-.else
-PKG_CMD?= /usr/sbin/pkg_create
-PKG_ADD?= ${CHROOT} ${DESTDIR} /usr/sbin/pkg_add
-PKG_DELETE?= ${CHROOT} ${DESTDIR} /usr/sbin/pkg_delete
-PKG_INFO?= ${CHROOT} ${DESTDIR} /usr/sbin/pkg_info
-PKG_VERSION?= ${CHROOT} ${DESTDIR} /usr/sbin/pkg_version
-.endif
.endif
# Does the pkg_create tool support conflict checking?
@@ -2832,10 +2809,10 @@
PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${LATEST_LINK}${PKG_SUFX}
.if defined(PERL_CONFIGURE)
-CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${TARGETDIR}" \
- INSTALLPRIVLIB="${TARGETDIR}/lib" INSTALLARCHLIB="${TARGETDIR}/lib"
+CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
+ INSTALLPRIVLIB="${TARGETDIR}/lib" INSTALLARCHLIB="${PREFIX}/lib"
CONFIGURE_SCRIPT?= Makefile.PL
-MAN3PREFIX?= ${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION}
.undef HAS_CONFIGURE
.endif
@@ -2870,7 +2847,7 @@
.if ${PREFIX} == /usr
MANPREFIX?= /usr/share
.else
-MANPREFIX?= ${TARGETDIR}
+MANPREFIX?= ${PREFIX}
.endif
.for sect in 1 2 3 4 5 6 7 8 9
@@ -2966,9 +2943,9 @@
.if defined(_MANPAGES)
.if defined(NOMANCOMPRESS)
-__MANPAGES:= ${_MANPAGES:S%^${TARGETDIR}/%%}
+__MANPAGES:= ${_MANPAGES:S%^${PREFIX}/%%}
.else
-__MANPAGES:= ${_MANPAGES:S%^${TARGETDIR}/%%:S%$%.gz%}
+__MANPAGES:= ${_MANPAGES:S%^${PREFIX}/%%:S%$%.gz%}
.endif
.if ${MANCOMPRESSED} == "yes"
@@ -2983,16 +2960,16 @@
INFO_PATH?= info
.endif
-DOCSDIR?= ${TARGETDIR}/share/doc/${PORTNAME}
-EXAMPLESDIR?= ${TARGETDIR}/share/examples/${PORTNAME}
-DATADIR?= ${TARGETDIR}/share/${PORTNAME}
+DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}
+EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME}
+DATADIR?= ${PREFIX}/share/${PORTNAME}
-PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${TARGETDIR}/,,}" \
- EXAMPLESDIR="${EXAMPLESDIR:S,^${TARGETDIR}/,,}" \
- DATADIR="${DATADIR:S,^${TARGETDIR}/,,}"
+PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}" \
+ EXAMPLESDIR="${EXAMPLESDIR:S,^${PREFIX}/,,}" \
+ DATADIR="${DATADIR:S,^${PREFIX}/,,}"
-DESKTOPDIR?= ${TARGETDIR}/share/applications
-_DESKTOPDIR_REL= ${DESKTOPDIR:S,^${TARGETDIR}/,,}/
+DESKTOPDIR?= ${PREFIX}/share/applications
+_DESKTOPDIR_REL= ${DESKTOPDIR:S,^${PREFIX}/,,}/
.if ${_DESKTOPDIR_REL} == ${DESKTOPDIR}/
# DESKTOPDIR is not beneath PREFIX
@@ -3636,11 +3613,7 @@
done; \
if [ -n "$${conflicts_with}" ]; then \
${ECHO_MSG}; \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s) in ${DESTDIR}: "; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \
for entry in $${conflicts_with}; do \
${ECHO_MSG} " $${entry}"; \
done; \
@@ -3768,12 +3741,8 @@
.if !target(check-already-installed)
check-already-installed:
.if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
-.if !defined(DESTDIR)
- @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed"
-.else
- @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed in ${DESTDIR}"
-.endif
- @${MKDIR} ${PKG_DBDIR}; \
+ @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed"; \
+ ${MKDIR} ${PKG_DBDIR}; \
already_installed=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
if [ -n "$${already_installed}" ]; then \
for p in $${already_installed}; do \
@@ -3789,17 +3758,9 @@
fi ; \
if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} is already installed in ${DESTDIR}"; \
- fi; \
+ ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \
else \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_CMD} "===> An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
- else \
- ${ECHO_MSG} "===> An older version of ${PKGORIGIN} is already installed in ${DESTDIR} ($${found_package})"; \
- fi; \
+ ${ECHO_CMD} "===> An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
fi; \
${ECHO_CMD} " You may wish to \`\`make deinstall'' and install this port again"; \
${ECHO_CMD} " by \`\`make reinstall'' to upgrade it properly."; \
@@ -3824,12 +3785,12 @@
.if !target(install-mtree)
install-mtree:
- @${MKDIR} ${TARGETDIR}
+ @${MKDIR} ${PREFIX}
@if [ `${ID} -u` != 0 ]; then \
- if [ -w ${TARGETDIR}/ ]; then \
+ if [ -w ${PREFIX}/ ]; then \
${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \
else \
- ${ECHO_MSG} "Error: ${TARGETDIR}/ not writable."; \
+ ${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \
${FALSE}; \
fi; \
fi
@@ -3840,9 +3801,9 @@
${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
exit 1; \
else \
- ${MTREE_CMD} ${MTREE_ARGS} ${TARGETDIR}/ >/dev/null; \
+ ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \
- cd ${TARGETDIR}/share/nls; \
+ cd ${PREFIX}/share/nls; \
${LN} -shf C POSIX; \
${LN} -shf C en_US.US-ASCII; \
fi; \
@@ -3859,22 +3820,12 @@
.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) || defined(INSTALLS_SHLIB)
.if defined(USE_LDCONFIG)
.if !defined(INSTALL_AS_USER)
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig"
${LDCONFIG} -m ${USE_LDCONFIG}
.else
- @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR}"
- ${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${USE_LDCONFIG}
-.endif
-.else
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig (errors are ignored)"
-${LDCONFIG} -m ${USE_LDCONFIG}
-.else
- @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR} (errors are ignored)"
- ${CHROOT} ${DESTDIR} -${LDCONFIG} -m ${USE_LDCONFIG}
.endif
-.endif
.if ${USE_LDCONFIG} != "${PREFIX}/lib"
@${ECHO_MSG} "===> Installing ldconfig configuration file"
.if defined(NO_LDCONFIG_MTREE)
@@ -3891,22 +3842,12 @@
.endif
.if defined(USE_LDCONFIG32)
.if !defined(INSTALL_AS_USER)
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig"
${LDCONFIG} -32 -m ${USE_LDCONFIG32}
.else
- @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR}"
- ${CHROOT} ${DESTDIR} ${LDCONFIG} -32 -m ${USE_LDCONFIG32}
-.endif
-.else
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig (errors are ignored)"
-${LDCONFIG} -32 -m ${USE_LDCONFIG32}
-.else
- @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR} (errors are ignored)"
- ${CHROOT} ${DESTDIR} -${LDCONFIG} -32 -m ${USE_LDCONFIG32}
.endif
-.endif
@${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file"
.if defined(NO_LDCONFIG_MTREE)
@${MKDIR} ${PREFIX}/${LDCONFIG_32DIR}
@@ -3922,18 +3863,10 @@
# This can be removed once all ports have been converted to USE_LDCONFIG.
.if defined(INSTALLS_SHLIB)
.if !defined(INSTALL_AS_USER)
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig"
-.else
- @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR}"
-.endif
${LDCONFIG_CMD}
.else
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig (errors are ignored)"
-.else
- @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR} (errors are ignored)"
-.endif
-${LDCONFIG_CMD}
.endif
.endif
@@ -4035,57 +3968,30 @@
${GREP} '^etc/rc.d/' ${TMPPLIST} > ${WRKDIR}/.PLIST.startup; \
if [ -s ${WRKDIR}/.PLIST.setuid -o -s ${WRKDIR}/.PLIST.network -o -s ${WRKDIR}/.PLIST.writable ]; then \
if [ -n "$$PORTS_AUDIT" ]; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> SECURITY REPORT (PARANOID MODE): "; \
- else \
- ${ECHO_MSG} "===> SECURITY REPORT FOR ${DESTDIR} (PARANOID MODE): "; \
- fi; \
+ ${ECHO_MSG} "===> SECURITY REPORT (PARANOID MODE): "; \
else \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> SECURITY REPORT: "; \
- else \
- ${ECHO_MSG} "===> SECURITY REPORT FOR ${DESTDIR}: "; \
- fi; \
+ ${ECHO_MSG} "===> SECURITY REPORT: "; \
fi; \
if [ -s ${WRKDIR}/.PLIST.setuid ] ; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} " This port has installed the following binaries,"; \
- else \
- ${ECHO_MSG} " This port has installed the following binaries into ${DESTDIR},"; \
- fi; \
+ ${ECHO_MSG} " This port has installed the following binaries,"; \
${ECHO_MSG} " which execute with increased privileges."; \
${CAT} ${WRKDIR}/.PLIST.setuid; \
${ECHO_MSG}; \
fi; \
if [ -s ${WRKDIR}/.PLIST.network ] ; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} " This port has installed the following files, which may act as network"; \
- ${ECHO_MSG} " servers and may therefore pose a remote security risk to the system."; \
- else \
- ${ECHO_MSG} " This port has installed the following files into ${DESTDIR}, which may"; \
- ${ECHO_MSG} " act as network servers and may therefore pose a remote security risk to"; \
- ${ECHO_MSG} " the system."; \
- fi; \
+ ${ECHO_MSG} " This port has installed the following files, which may act as network"; \
+ ${ECHO_MSG} " servers and may therefore pose a remote security risk to the system."; \
${CAT} ${WRKDIR}/.PLIST.network; \
${ECHO_MSG}; \
if [ -s ${WRKDIR}/.PLIST.startup ] ; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} " This port has installed the following startup scripts,"; \
- else \
- ${ECHO_MSG} " This port has installed the following startup scripts into ${DESTDIR},"; \
- fi; \
+ ${ECHO_MSG} " This port has installed the following startup scripts,"; \
${ECHO_MSG} " which may cause these network services to be started at boot time."; \
${SED} s,^,${PREFIX}/, < ${WRKDIR}/.PLIST.startup; \
${ECHO_MSG}; \
fi; \
fi; \
if [ -s ${WRKDIR}/.PLIST.writable ] ; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} " This port has installed the following world-writable files/directories."; \
- else \
- ${ECHO_MSG} " This port has installed the following world-writable files/directories"; \
- ${ECHO_MSG} " into ${DESTDIR}."; \
- fi; \
+ ${ECHO_MSG} " This port has installed the following world-writable files/directories."; \
${CAT} ${WRKDIR}/.PLIST.writable; \
${ECHO_MSG}; \
fi; \
@@ -4316,11 +4222,7 @@
if [ "$${check_name}" = "${PKGBASE}" ]; then \
prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
if [ "x${PREFIX}" = "x$${prfx}" ]; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> Deinstalling $${p}"; \
- else \
- ${ECHO_MSG} "===> Deinstalling $${p} from ${DESTDIR}"; \
- fi; \
+ ${ECHO_MSG} "===> Deinstalling $${p}"; \
${PKG_DELETE} -f $${p}; \
else \
${ECHO_MSG} "===> $${p} has a different PREFIX: $${prfx}, skipping"; \
@@ -4328,11 +4230,7 @@
fi; \
done; \
if [ -z "$${found_names}" ]; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGBASE} not installed, skipping"; \
- else \
- ${ECHO_MSG} "===> ${PKGBASE} not installed in ${DESTDIR}, skipping"; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGBASE} not installed, skipping"; \
fi
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
@@ -4354,19 +4252,11 @@
@deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
if [ -n "$${deinstall_names}" ]; then \
for d in $${deinstall_names}; do \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> Deinstalling $${d}"; \
- else \
- ${ECHO_MSG} "===> Deinstalling $${d} from ${DESTDIR}"; \
- fi; \
+ ${ECHO_MSG} "===> Deinstalling $${d}"; \
${PKG_DELETE} -f $${d}; \
done; \
else \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGORIGIN} not installed, skipping"; \
- else \
- ${ECHO_MSG} "===> ${PKGORIGIN} not installed in ${DESTDIR}, skipping"; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGORIGIN} not installed, skipping"; \
fi; \
${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
@@ -4759,24 +4649,15 @@
if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \
- ${PKG_ADD} $${subpkgfile}; \
- else \
- ${ECHO_MSG} "===> Installing existing package $${subpkgfile} into ${DESTDIR}"; \
- ${PKG_ADD} -C ${DESTDIR} $${subpkgfile}; \
- fi; \
+ ${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \
+ ${PKG_ADD} $${subpkgfile}; \
else \
(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
fi; \
else \
(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
fi; \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \
- else \
- ${ECHO_MSG} "===> Returning to build of ${PKGNAME} for ${DESTDIR}"; \
- fi;
+ ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"
.for deptype in EXTRACT PATCH FETCH BUILD RUN
${deptype:L}-depends:
@@ -4798,11 +4679,7 @@
${ECHO_MSG} "Error: ${NONEXISTENT} exists. Please remove it, and restart the build."; \
${FALSE}; \
else \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - found"; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on file in ${DESTDIR}: $$prog - found"; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - found"; \
if [ ${_DEPEND_ALWAYS} = 1 ]; then \
${ECHO_MSG} " (but building it anyway)"; \
notfound=1; \
@@ -4811,11 +4688,7 @@
fi; \
fi; \
else \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - not found"; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on file in ${DESTDIR}: $$prog - not found"; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - not found"; \
notfound=1; \
fi; \
else \
@@ -4825,11 +4698,7 @@
esac; \
if [ "$$pkg" != "" ]; then \
if ${PKG_INFO} "$$prog" > /dev/null 2>&1 ; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - found"; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on package in ${DESTDIR}: $$prog - found"; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - found"; \
if [ ${_DEPEND_ALWAYS} = 1 ]; then \
${ECHO_MSG} " (but building it anyway)"; \
notfound=1; \
@@ -4837,11 +4706,7 @@
notfound=0; \
fi; \
else \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - not found"; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on package in ${DESTDIR}: $$prog - not found"; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - not found"; \
notfound=1; \
fi; \
if [ $$notfound != 0 ]; then \
@@ -4855,11 +4720,7 @@
fi; \
fi; \
elif ${WHICH} "$$prog" > /dev/null 2>&1 ; then \
- if [ -z "${PREFIX}" ] ; then \
${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - found"; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on executable in ${DESTDIR}: $$prog - found"; \
- fi; \
if [ ${_DEPEND_ALWAYS} = 1 ]; then \
${ECHO_MSG} " (but building it anyway)"; \
notfound=1; \
@@ -4867,11 +4728,7 @@
notfound=0; \
fi; \
else \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - not found"; \
- else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on executable in ${DESTDIR}: $$prog - not found"; \
- fi; \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - not found"; \
notfound=1; \
fi; \
fi; \
@@ -5433,14 +5290,14 @@
@if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \
if [ ! -e ${DOCSDIR}/${x} ]; then \
${ECHO_CMD} ${DOCSDIR}/${x} | \
- ${SED} -e 's,^${TARGETDIR}/,,' >> ${TMPPLIST}; \
+ ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
fi;fi
.endfor
@${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \
- ${SED} -ne 's,^${TARGETDIR}/,,p' >> ${TMPPLIST}
+ ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
@${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \
- ${SED} -ne 's,^${TARGETDIR}/, at dirrm ,p' >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${TARGETDIR}/,,}" >> ${TMPPLIST}
+ ${SED} -ne 's,^${PREFIX}/, at dirrm ,p' >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
.else
@${DO_NADA}
.endif
@@ -5451,10 +5308,10 @@
# Process GNU INFO files at package install/deinstall time
.if defined(INFO)
.for i in ${INFO}
- install-info --quiet ${TARGETDIR}/${INFO_PATH}/$i.info ${TARGETDIR}/${INFO_PATH}/dir
+ install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>> ${TMPPLIST}
- @${LS} ${TARGETDIR}/${INFO_PATH}/$i.info* | ${SED} -e s:${TARGETDIR}/::g >> ${TMPPLIST}
+ @${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>> ${TMPPLIST}
@if [ "`${DIRNAME} $i`" != "." ]; then \
@@ -5488,7 +5345,7 @@
@${ECHO_CMD} "===> Installing early rc.d startup script(s)"
@${ECHO_CMD} "@cwd /" >> ${TMPPLIST}
@for i in ${USE_RCORDER}; do \
- ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}/etc/rc.d/$${i%.sh}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \
${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
done
@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
@@ -5497,7 +5354,7 @@
@${ECHO_CMD} "===> Installing rc.d startup script(s)"
@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
@for i in ${USE_RC_SUBR}; do \
- ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${TARGETDIR}/etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}; \
${ECHO_CMD} "etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}" >> ${TMPPLIST}; \
done
.endif
@@ -5551,11 +5408,7 @@
@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
.endif
@if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
- if [ -z "${DESTDIR}" ] ; then \
- ${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \
- else \
- ${ECHO_MSG} "===> Registering installation for ${PKGNAME} in ${DESTDIR}"; \
- fi; \
+ ${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \
${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#5 (text+ko) ====
@@ -64,7 +64,6 @@
ID?= /usr/bin/id
UID!= ${ID} -u
-LOCALBASE?= ${LOCALBASE}
.if exists(${LOCALBASE}/sbin/pkg_info)
PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
.else
More information about the p4-projects
mailing list