PERFORCE change 114996 for review
Gabor Kovesdan
gabor at FreeBSD.org
Sat Feb 24 23:12:35 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=114996
Change 114996 by gabor at gabor_server on 2007/02/24 23:11:44
Roll back current DESTDIR implementation, step 1.
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#3 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.mail.mk#2 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#3 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#3 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#3 edit
Differences ...
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#3 (text+ko) ====
@@ -110,9 +110,9 @@
GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${TARGETDIR}/${GCONF_CONFIG_DIRECTORY}
GNOME_LOCALSTATEDIR?= ${PREFIX}/share/gnome
gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
-gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \
+gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \
--datadir=${TARGETDIR}/share/gnome \
- --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \
+ --with-html-dir=${GNOME_HTML_DIR} \
--with-help-dir=${TARGETDIR}/share/gnome/help \
--disable-gtk-doc \
--with-gconf-source=${GCONF_CONFIG_SOURCE} \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.mail.mk#2 (text+ko) ====
@@ -51,9 +51,9 @@
.endif
.if defined(QMAIL_SLAVEPORT)
-QMAIL_DEPENDS= ${DESTDIR}${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L}
+QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L}
.else
-QMAIL_DEPENDS= ${DESTDIR}${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
+QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
.endif
.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN)
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#3 (text+ko) ====
@@ -1162,10 +1162,10 @@
# Get __FreeBSD_version
.if !defined(OSVERSION)
-.if exists(${DESTDIR}/usr/include/sys/param.h)
-OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h
-.elif exists(${DESTDIR}/usr/src/sys/sys/param.h)
-OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h
+.if exists(/usr/include/sys/param.h)
+OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h
+.elif exists(/usr/src/sys/sys/param.h)
+OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h
.else
OSVERSION!= ${SYSCTL} -n kern.osreldate
.endif
@@ -1234,7 +1234,7 @@
.endif
# where 'make config' records user configuration options
-PORT_DBDIR?= ${DESTDIR}/var/db/ports
+PORT_DBDIR?= /var/db/ports
LDCONFIG_DIR= libdata/ldconfig
LDCONFIG32_DIR= libdata/ldconfig32
@@ -1346,9 +1346,9 @@
LOCALBASE_REL:= ${LOCALBASE}
X11BASE_REL:= ${X11BASE}
LINUXBASE_REL:= ${LINUXBASE}
-LOCALBASE:= ${DESTDIR}${LOCALBASE_REL}
-X11BASE:= ${DESTDIR}${X11BASE_REL}
-LINUXBASE:= ${DESTDIR}${LINUXBASE_REL}
+LOCALBASE:= ${LOCALBASE_REL}
+X11BASE:= ${X11BASE_REL}
+LINUXBASE:= ${LINUXBASE_REL}
DISTDIR?= ${PORTSDIR}/distfiles
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
INDEXDIR?= ${PORTSDIR}
@@ -1358,7 +1358,7 @@
INDEXFILE?= INDEX
.endif
-TARGETDIR:= ${DESTDIR}${PREFIX}
+TARGETDIR:= ${PREFIX}
.if defined(USE_LINUX_RPM)
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
@@ -1404,23 +1404,12 @@
.endif
.if defined(USE_LINUX_PREFIX)
-.if !defined(DESTDIR)
LDCONFIG_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD}
LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG_CMD}
.else
-LDCONFIG_CMD?= ${CHROOT} ${DESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
-LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD}
-LDCONFIG_PLIST_UNEXEC_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
-.endif
-.else
-.if !defined(DESTDIR)
LDCONFIG_CMD?= ${LDCONFIG} -m ${LDCONFIG_RUNLIST}
LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG} -m ${LDCONFIG_PLIST}
-.else
-LDCONFIG_CMD?= ${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_RUNLIST}
-LDCONFIG_PLIST_EXEC_CMD?= ${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_PLIST}
-.endif
LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R
.endif
@@ -1476,8 +1465,8 @@
SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
.if ${PERL_LEVEL} < 500600
-PERL5= ${DESTDIR}/usr/bin/perl${PERL_VERSION}
-PERL= ${DESTDIR}/usr/bin/perl
+PERL5= /usr/bin/perl${PERL_VERSION}
+PERL= /usr/bin/perl
.else
PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
PERL= ${LOCALBASE}/bin/perl
@@ -1624,11 +1613,9 @@
BUILD_WRKSRC?= ${WRKSRC}
INSTALL_WRKSRC?=${WRKSRC}
-PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
- DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}
+PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL}
SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
- DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
- DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}
+ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
PLIST_REINPLACE+= dirrmtry stopdaemon
PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true!
@@ -2124,7 +2111,7 @@
MAKE_FLAGS?= -f
MAKEFILE?= Makefile
-MAKE_ENV+= TARGETDIR=${TARGETDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \
+MAKE_ENV+= PREFIX=${PREFIX} \
LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
@@ -2324,11 +2311,7 @@
# Does the pkg_create tool support conflict checking?
# XXX Slow?
.if !defined(PKGINSTALLVER)
-.if !defined(DESTDIR)
PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
-.else
-PKGINSTALLVER!= ${CHROOT} ${DESTDIR} ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
-.endif
.endif
.if ${PKGINSTALLVER} < 20030417
DISABLE_CONFLICTS= YES
@@ -2355,7 +2338,7 @@
.endif
.endif
# where pkg_add records its dirty deeds.
-PKG_DBDIR?= ${DESTDIR}/var/db/pkg
+PKG_DBDIR?= /var/db/pkg
MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp
@@ -2878,14 +2861,14 @@
WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
- X11BASE=${X11BASE} DESTDIR=${DESTDIR} TARGETDIR=${DESTDIR}
+ X11BASE=${X11BASE}
.if defined(BATCH)
SCRIPTS_ENV+= BATCH=yes
.endif
.if ${PREFIX} == /usr
-MANPREFIX?= ${DESTDIR}/usr/share
+MANPREFIX?= /usr/share
.else
MANPREFIX?= ${TARGETDIR}
.endif
@@ -3169,7 +3152,7 @@
@cd ${.CURDIR} && ${SETENV} CURDIR=${.CURDIR} DISTNAME=${DISTNAME} \
DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
- FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \
+ FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" X11BASE=${X11BASE} \
CONFLICTS="${CONFLICTS}" \
${ALL_HOOK}
@@ -4244,11 +4227,7 @@
build-message:
@${ECHO_MSG} "===> Building for ${PKGNAME}"
install-message:
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Installing for ${PKGNAME}"
-.else
- @${ECHO_MSG} "===> Installing for ${PKGNAME} into ${DESTDIR}"
-.endif
package-message:
@${ECHO_MSG} "===> Building package for ${PKGNAME}"
@@ -4330,11 +4309,7 @@
${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}"
@${ECHO_MSG} "===> Returning to user credentials"
.else
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}"
-.else
- @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN} from ${DESTDIR}"
-.endif
@found_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
for p in $${found_names}; do \
check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \
@@ -4375,11 +4350,7 @@
${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}"
@${ECHO_MSG} "===> Returning to user credentials"
.else
-.if !defined(DESTDIR)
@${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}"
-.else
- @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN} from ${DESTDIR}"
-.endif
@deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
if [ -n "$${deinstall_names}" ]; then \
for d in $${deinstall_names}; do \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#3 (text+ko) ====
@@ -48,10 +48,10 @@
.if !defined(NOPRECIOUSMAKEVARS)
.if !defined(ARCH)
-ARCH!= ${DESTDIR}/usr/bin/uname -p
+ARCH!= /usr/bin/uname -p
.endif
.if !defined(OSREL)
-OSREL!= ${DESTDIR}/usr/bin/uname -r | sed -e 's/[-(].*//'
+OSREL!= /usr/bin/uname -r | sed -e 's/[-(].*//'
.endif
.if !defined(OSVERSION)
.if exists(/sbin/sysctl)
@@ -62,19 +62,19 @@
.endif
.endif
-ID?= ${DESTDIR}/usr/bin/id
+ID?= /usr/bin/id
UID!= ${ID} -u
-LOCALBASE?= ${DESTDIR}${LOCALBASE_REL}
+LOCALBASE?= ${LOCALBASE_REL}
.if exists(${LOCALBASE}/sbin/pkg_info)
PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
.else
-PKG_INFO?= ${DESTDIR}/usr/sbin/pkg_info
+PKG_INFO?= /usr/sbin/pkg_info
.endif
-SED?= ${DESTDIR}/usr/bin/sed
+SED?= /usr/bin/sed
PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
.if !defined(OPSYS)
-OPSYS!= ${DESTDIR}/usr/bin/uname -s
+OPSYS!= /usr/bin/uname -s
.endif
ECHO_MSG?= echo
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#3 (text+ko) ====
@@ -136,7 +136,7 @@
RUBY_VER?= ${RUBY_DEFAULT_VER}
.if defined(RUBY)
-.if !exists(${DESTDIR}${RUBY})
+.if !exists(${RUBY})
IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it does not seem to exist. Please specify an already installed ruby executable.
.endif
@@ -145,7 +145,7 @@
IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it failed to include rbconfig. Please specify a properly installed ruby executable.
.endif
-_RUBY_CONFIG= ${DESTDIR}${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e
+_RUBY_CONFIG= ${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e
RUBY_VERSION!= ${_RUBY_CONFIG} 'puts VERSION'
RUBY_SUFFIX?= # empty
More information about the p4-projects
mailing list