Date: Tue, 15 May 2012 08:37:46 -0500 From: Zhihao Yuan <lichray@gmail.com> To: rina.inverse01@gmail.com Cc: freebsd-ports@freebsd.org Subject: Re: Xfce 4.10 on FreeBSD 9 release powerpc Message-ID: <CAGsORuDU3R%2BsLP3VZ7kHoaCUBxQqaYZuqx0dNPhGRtfiCMjHYA@mail.gmail.com> In-Reply-To: <4FB250FD.2060801@gmail.com> References: <4FB24A67.4050701@gmail.com> <CAGsORuDa7Hrs5-JA94cRz-h%2Bu5W1nkzOiroRbG3%2B6B_G8aUSfQ@mail.gmail.com> <4FB250FD.2060801@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Tue, May 15, 2012 at 7:50 AM, Takashi Fujita <rina.inverse01@gmail.com> wrote: > After deleting a file, when make install clean was performed again, the > following errors came out and compile was interrupted. > > ==>Patching for xfce4-session-4.10.0 > ==>Applying FreeBSD patches for xfce4-session-4.10.0 > 1 out of 1 hunks ignored--saving rejects to > xfce4-session/xfsm-shutdown-helper.c.rej > =>Patch patch-xfce4-session_xfsm-shutdown-helper.c failed to apply cleanly. > > > (2012/05/15 21:26), Zhihao Yuan wrote: >> >> On Tue, May 15, 2012 at 7:21 AM, Takashi Fujita >> <rina.inverse01@gmail.com> wrote: >>> >>> M9686J/A Mac mini G4 FreeBSD 9-Release is installed in 1.25 GHz. >>> >>> The following contribution tends to be seen and it is going to install >>> Xfce4.10 in this environment. >>> >>>> Hi folks, >>>> >>>> I've updated the xfce-4.10 tarball [1] (it contains only the latest >>>> versions of Xfce4 core). >>>> Changes : >>>> - Delete thunarvfs in bsd.xfce.mk, because this library now, is >>>> obsolete, even if it always used by archiver/squeeze (no update since >>>> 4 years). >>>> - Drop support of GTK3 in x11-themes/gtk-xfce-engine >>>> >>>> I've also add shell script 'xfcemerge' [2] (based on marcusmerge and >>>> kdemerge) to easily update ports tree. It works with tarball and with >>>> my repository. >>>> >>>> In my repository we can found the latest versions of : >>>> - x11/xfce4-screenshooter-plugin, >>>> http://www.freebsd.org/cgi/query-pr.cgi?pr=167537 >>>> - www/midori, http://www.freebsd.org/cgi/query-pr.cgi?pr=167536 >>>> - sysutils/xfce4-battery-plugin (1.0.2) >>>> - sysutils/xfce4-systemload-plugin (1.1.0) >>>> - x11-clocks/xfce4-timer-out-plugin (1.0.1) >>>> - graphics/ristretto (0.6.0) >>>> >>>> Enjoy >>>> >>>> [1] http://xfce-ports.googlecode.com/files/xfce-4.10.tar.xz >>>> [2] http://xfce-ports.googlecode.com/files/xfcemerge >>>> >>> >>> shell script'xfcemerge' was performed and port tree was updated. >>> >>> When >>> [cd /usr/ports/x11-wm/xfce4] >>> [make config-recursive] >>> [make install clean] >>> and a command are executed after that, the following error comes out and >>> compile goes wrong. >>> >>> ===> Installing for xfce-4.10 >>> ===> xfce-4.10 depends on executable: xfwm4 - not found >>> ===> Verifying install for xfwm4 in /usr/ports/x11-wm/xfce4-wm >>> ===> Patching for xfce4-wm-4.10.0 >>> ===> Applying FreeBSD patches for xfce4-wm-4.10.0 >>> File to patch: >>> No file found--skip this patch? [n]y >>> 2 out of 2 hunks ignored--saving rehects to >>> doc/manual/images/Makefile.in.rej >>> Can't create doc/manual/images/Makefile.in.rej, output is in >>> /tmp/patchrvHLsNE: No such file or directory >>> => Patch patch-doc_manual_images_Makefile.in failed to apply cleanly. >>> *** Error code 1 >>> >>> Stop in /usr/ports/x11-wm/xfce4-wm. >>> *** Error code 1 >>> >>> Stop in /usr/ports/x11-wm/xfce4-wm. >>> *** Error code 1 >>> >>> Stop in /usr/ports/x11-wm/xfce4. >>> *** Error code 1 >>> >>> Stop in /usr/ports/x11-wm/xfce4. >>> >>> -- >>> Takashi Fujita >>> rina.inverse01@gmail.com >>> _______________________________________________ >>> freebsd-ports@freebsd.org mailing list >>> http://lists.freebsd.org/mailman/listinfo/freebsd-ports >>> To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" >> >> >> As I said, the xfcemerge script does not remove old files. So please >> remove any file under xfce4-wm/files except extrapatch-src__events.c. >> > > > -- > Takashi Fujita > rina.inverse01@gmail.com > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" I see. I'll fix this. Try the new xfcemerge script attached. -- Zhihao Yuan, nickname lichray The best way to predict the future is to invent it. ___________________________________________________ 4BSD -- http://4bsd.biz/ [-- Attachment #2 --] #!/bin/sh #- # Copyright (c) 2002-2006 FreeBSD GNOME Team <freebsd-gnome@FreeBSD.org> # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # Based on marcusmerge script, adapted for 'xfce-ports' by Olivier Duchateau. # # The path to your Xfce ports. : ${SRCDIR:="/home/xfce4"} XFCE_BRANCH="4.10" # The path to the official ports collection. PORTSDIR="/usr/ports" # Set to yes to download a tarball instead of using hg. TARBALL="no" #### Don't change anything below CWD=`pwd` HG_CMD="/usr/local/bin/hg" HG_REPO="https://code.google.com/p/xfce-ports/" merge() { echo "===> Updating the main ports tree." # Mk file if [ -d ${SRCDIR}/Mk ] && [ -d ${PORTSDIR} ]; then cp ${SRCDIR}/Mk/*.mk ${PORTSDIR}/Mk fi # Port names cd ${SRCDIR} ppaths=`find . -type d -depth 2 ! -path './.hg/*'` for ppath in ${ppaths}; do pname=${ppath#./} # New port. if [ ! -d ${PORTSDIR}/${pname} ]; then mkdir ${PORTSDIR}/${pname} fi # It will be override. if [ -d ${PORTSDIR}/${pname}/files ]; then rm -Rf ${PORTSDIR}/${pname}/files fi # Clean port. if [ -d ${PORTSDIR}/${pname}/work ]; then rm -Rf ${PORTSDIR}/${pname}/work fi # Update ports tree. cp -R ${SRCDIR}/${pname}/* \ ${PORTSDIR}/${pname}/ done echo "===> Update done." } download_tarball() { url="http://xfce-ports.googlecode.com/files/" distname="xfce-${XFCE_BRANCH}" echo "===> Downloading the tarball." cd /tmp fetch ${url}${distname}.tar.xz if [ $? != 0 ]; then echo "Failed to download ${distname}.tar.xz from ${url}" exit 1 else echo "===> Download done." extract_tarball ${distname}.tar.xz fi } extract_tarball() { echo "===> Extracting ${1}." src_dir=`/bin/realpath ${SRCDIR}` p=`/usr/bin/dirname ${src_dir}` n=`/usr/bin/basename ${src_dir}` tar -C ${p} -xJf ${1} cd ${p} ; mv `/usr/bin/basename $1 .tar.xz` ${n} rm -f /tmp/${1} cd ${CWD} echo "===> Extraction done." } # Clone or update repository. hg_repository() { echo "===> Cloning ${HG_REPO}." if [ ! -d ${SRCDIR} ]; then _clone elif [ -e ${SRCDIR}/.hg/hgrc ]; then _update elif [ -d ${SRCDIR} -a ! -d ${SRCDIR}/.hg ]; then echo "`/bin/realpath ${SRCDIR}` is already used." exit 1 fi echo "===> Cloning done." } _clone() { ${HG_CMD} clone ${HG_REPO} -b ${XFCE_BRANCH} ${SRCDIR} if [ $? != 0 ]; then echo "Failed to clone ${HG_REPO}." exit 1 else cd ${SRCDIR} last_id=`${HG_CMD} id | awk '{printf "%s", $1;}'` cd ${CWD} echo "===> Last commit is: ${last_id}." fi } _update() { cd ${SRCDIR} ${HG_CMD} update if [ $? != 0 ]; then echo "Failed to update ${HG_REPO}." exit 1 else last_id=`${HG_CMD} id | awk '{printf "%s", $1;}'` cd ${CWD} echo "===> Last commit is: ${last_id}." fi } if [ "${TARBALL}" = "yes" ]; then download_tarball else if [ -e ${HG_CMD} ]; then hg_repository else echo "Mercurial is required." exit 1 fi fi merge
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGsORuDU3R%2BsLP3VZ7kHoaCUBxQqaYZuqx0dNPhGRtfiCMjHYA>