PERFORCE change 115022 for review
Gabor Kovesdan
gabor at FreeBSD.org
Sun Feb 25 13:30:43 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=115022
Change 115022 by gabor at gabor_server on 2007/02/25 13:30:18
Roll back current DESTDIR implementation, step 2.
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#3 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#4 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#2 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#4 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#4 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#3 edit
Differences ...
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#3 (text+ko) ====
@@ -236,8 +236,8 @@
# find where emacsen is installed
# look for it in PREEFIX first and fall back to LOCALBASE then
-.if exists(${TARGETDIR}/bin/${EMACS_NAME}-${EMACS_VER})
-EMACS_BASE?= ${TARGETDIR}
+.if exists(/bin/${EMACS_NAME}-${EMACS_VER})
+EMACS_BASE?= ${PREFIX}
.else
EMACS_BASE?= ${LOCALBASE}
.endif
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#4 (text+ko) ====
@@ -107,13 +107,13 @@
GNOME_HTML_DIR?= ${PREFIX}/share/doc
GCONF_CONFIG_OPTIONS?= merged
GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
-GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${TARGETDIR}/${GCONF_CONFIG_DIRECTORY}
+GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY}
GNOME_LOCALSTATEDIR?= ${PREFIX}/share/gnome
gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \
- --datadir=${TARGETDIR}/share/gnome \
+ --datadir=${PREFIX}/share/gnome \
--with-html-dir=${GNOME_HTML_DIR} \
- --with-help-dir=${TARGETDIR}/share/gnome/help \
+ --with-help-dir=${PREFIX}/share/gnome/help \
--disable-gtk-doc \
--with-gconf-source=${GCONF_CONFIG_SOURCE} \
--mandir=${PREFIX}/man
@@ -764,10 +764,10 @@
gnome-pre-su-install:
.if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomeprefix}!="" && !defined(NO_MTREE)
- @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${TARGETDIR}/ >/dev/null
+ @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${PREFIX}/ >/dev/null
.endif
.if defined(GCONF_SCHEMAS)
- @${MKDIR} ${TARGETDIR}/etc/gconf/gconf.xml.defaults/
+ @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/
.else
@${DO_NADA}
.endif
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#2 (text+ko) ====
@@ -59,10 +59,10 @@
.endif
.if defined(WITH_OPENSSL_BASE)
-OPENSSLBASE= ${DESTDIR}/usr
-OPENSSLDIR= ${DESTDIR}/etc/ssl
+OPENSSLBASE= /usr
+OPENSSLDIR= /etc/ssl
-.if !exists(${DESTDIR}/usr/lib/libcrypto.so)
+.if !exists(/usr/lib/libcrypto.so)
check-depends::
@${ECHO_CMD} "Dependency error: this port requires the OpenSSL library, which is part of"
@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
@@ -98,7 +98,7 @@
.endif
MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
.endif
-OPENSSLRPATH= ${DESTDIR}/usr/lib:${LOCALBASE}/lib
+OPENSSLRPATH= /usr/lib:${LOCALBASE}/lib
.else
@@ -121,11 +121,11 @@
.if !defined(OPENSSL_PORT) && \
exists(${LOCALBASE}/lib/libcrypto.so)
# find installed port and use it for dependency
-PKG_DBDIR?= ${DESTDIR}/var/db/pkg
+PKG_DBDIR?= /var/db/pkg
OPENSSL_INSTALLED!= grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \
while read contents; do \
sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \
- if test "$${sslprefix}" = "@cwd ${LOCALBASE_REL}" ; then \
+ if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \
echo "$${contents}"; break; fi; done
OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2
OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}"
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#4 (text+ko) ====
@@ -1395,16 +1395,16 @@
USE_XLIB= yes
.endif
.if defined(USE_X_PREFIX)
-PREFIX?= ${X11BASE_REL}
+PREFIX?= ${X11BASE}
.elif defined(USE_LINUX_PREFIX)
-PREFIX?= ${LINUXBASE_REL}
+PREFIX?= ${LINUXBASE}
NO_MTREE= yes
.else
-PREFIX?= ${LOCALBASE_REL}
+PREFIX?= ${LOCALBASE}
.endif
.if defined(USE_LINUX_PREFIX)
-LDCONFIG_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+LDCONFIG_CMD?= ${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE}
LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD}
LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG_CMD}
.else
@@ -1613,8 +1613,8 @@
BUILD_WRKSRC?= ${WRKSRC}
INSTALL_WRKSRC?=${WRKSRC}
-PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL}
-SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
+PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
PLIST_REINPLACE+= dirrmtry stopdaemon
@@ -2099,8 +2099,8 @@
.endif
.if exists(/sbin/sha256)
SHA256?= /sbin/sha256
-.elif exists(${LOCALBASE_REL}/sbin/sha256)
-SHA256?= ${LOCALBASE_REL}/sbin/sha256
+.elif exists(${LOCALBASE}/sbin/sha256)
+SHA256?= ${LOCALBASE}/sbin/sha256
.else
SHA256?= NO
.endif
@@ -2112,7 +2112,7 @@
MAKE_FLAGS?= -f
MAKEFILE?= Makefile
MAKE_ENV+= PREFIX=${PREFIX} \
- LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
+ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
@@ -2208,7 +2208,7 @@
# Figure out where the local mtree file is
.if !defined(MTREE_FILE) && !defined(NO_MTREE)
-.if ${PREFIX} == ${X11BASE_REL} || defined(USE_X_PREFIX)
+.if ${PREFIX} == ${X11BASE} || defined(USE_X_PREFIX)
# User may have specified non-standard PREFIX for installing a port that
# uses X
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
@@ -2281,16 +2281,16 @@
EXTRACT_DEPENDS+= ${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/ports-mgmt/pkg_install
.endif
.if !defined(DESTDIR)
-PKG_CMD?= ${LOCALBASE_REL}/sbin/pkg_create
-PKG_ADD?= ${LOCALBASE_REL}/sbin/pkg_add
-PKG_DELETE?= ${LOCALBASE_REL}/sbin/pkg_delete
-PKG_INFO?= ${LOCALBASE_REL}/sbin/pkg_info
-PKG_VERSION?= ${LOCALBASE_REL}/sbin/pkg_version
+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_REL}/sbin/pkg_create
-PKG_ADD?= ${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_add
-PKG_DELETE?= ${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_delete
-PKG_INFO?= ${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_info
+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)
@@ -5463,7 +5463,7 @@
.endfor
.if (${PREFIX} != "/usr")
@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
-.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL})
+.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE})
@${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST}
.endif
.endif
@@ -5474,7 +5474,7 @@
# deinstall-time
.if !target(add-plist-post)
add-plist-post:
-.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL} && ${PREFIX} != "/usr")
+.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
.else
@${DO_NADA}
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#4 (text+ko) ====
@@ -64,7 +64,7 @@
ID?= /usr/bin/id
UID!= ${ID} -u
-LOCALBASE?= ${LOCALBASE_REL}
+LOCALBASE?= ${LOCALBASE}
.if exists(${LOCALBASE}/sbin/pkg_info)
PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
.else
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#3 (text+ko) ====
@@ -414,7 +414,7 @@
@${ECHO} "Legal values are: 2.7 (default), 2.8, 2.9, 2.10, 3.2"
@${FALSE}
.endif
-ZOPEBASEDIR?= ${TARGETDIR}/${SZOPEBASEDIR}
+ZOPEBASEDIR?= ${PREFIX}/${SZOPEBASEDIR}
ZOPEPRODUCTDIR?= Products
.endif
More information about the p4-projects
mailing list