From owner-p4-projects@FreeBSD.ORG  Thu Jul 20 13:24:24 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 17CBE16A4E0; Thu, 20 Jul 2006 13:24:24 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AD0C316A4DE
	for <perforce@FreeBSD.org>; Thu, 20 Jul 2006 13:24:23 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 509CF43D49
	for <perforce@FreeBSD.org>; Thu, 20 Jul 2006 13:24:23 +0000 (GMT)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6KDONqf003218
	for <perforce@FreeBSD.org>; Thu, 20 Jul 2006 13:24:23 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6KDOMFQ003215
	for perforce@freebsd.org; Thu, 20 Jul 2006 13:24:22 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Thu, 20 Jul 2006 13:24:22 GMT
Message-Id: <200607201324.k6KDOMFQ003215@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@FreeBSD.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 101993 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jul 2006 13:24:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=101993

Change 101993 by gabor@gabor_spitfire on 2006/07/20 13:24:14

	s/${DESTDIR}${PREFIX}/${TARGETDIR}/

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#4 edit
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.emacs.mk#3 edit
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#4 edit
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#4 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#4 (text+ko) ====

@@ -175,7 +175,7 @@
 				--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
 				--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}"
 .if ${USE_APACHE:Mcommon2*} != ""
-CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-bin="${DESTDIR}${PREFIX}/sbin/suexec"
+CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-bin="${TARGETDIR}/sbin/suexec"
 .endif
 
 .   if defined(WITH_SUEXEC_UMASK)

==== //depot/projects/soc2006/gabor_ports/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(${DESTDIR}${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER})
-EMACS_BASE?=			${DESTDIR}${PREFIX}
+.if exists(${TARGETDIR}/bin/${EMACS_NAME}-${EMACS_VER})
+EMACS_BASE?=			${TARGETDIR}
 .else
 EMACS_BASE?=			${LOCALBASE}
 .endif

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#4 (text+ko) ====

@@ -106,13 +106,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}:${DESTDIR}${PREFIX}/${GCONF_CONFIG_DIRECTORY}
+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} \
-			   --datadir=${DESTDIR}${PREFIX}/share/gnome \
+			   --datadir=${TARGETDIR}/share/gnome \
 			   --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \
-			   --with-help-dir=${DESTDIR}${PREFIX}/share/gnome/help \
+			   --with-help-dir=${TARGETDIR}/share/gnome/help \
 			   --disable-gtk-doc \
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
@@ -725,10 +725,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}/} ${DESTDIR}${PREFIX}/ >/dev/null
+	@${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${TARGETDIR}/ >/dev/null
 .endif
 .if defined(GCONF_SCHEMAS)
-	@${MKDIR} ${DESTDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/
+	@${MKDIR} ${TARGETDIR}/etc/gconf/gconf.xml.defaults/
 .else
 	@${DO_NADA}
 .endif

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#4 (text+ko) ====

@@ -404,7 +404,7 @@
 	@${ECHO} "Legal values are:	2.7 (default), 2.8, 2.9, 3.2"
 	@${FALSE}
 .endif
-ZOPEBASEDIR?=			${DESTDIR}${PREFIX}/${SZOPEBASEDIR}
+ZOPEBASEDIR?=			${TARGETDIR}/${SZOPEBASEDIR}
 ZOPEPRODUCTDIR?=		Products
 .endif