From owner-freebsd-alpha Tue May 21 7:51: 5 2002 Delivered-To: freebsd-alpha@freebsd.org Received: from duke.cs.duke.edu (duke.cs.duke.edu [152.3.140.1]) by hub.freebsd.org (Postfix) with ESMTP id 8A7E837B40B; Tue, 21 May 2002 07:50:52 -0700 (PDT) Received: from moe.cs.duke.edu (moe.cs.duke.edu [152.3.140.74]) by duke.cs.duke.edu (8.9.3/8.9.3) with ESMTP id KAA12728; Tue, 21 May 2002 10:50:50 -0400 (EDT) Received: (gallatin@localhost) by moe.cs.duke.edu (8.8.5/8.6.9) id KAA10654; Tue, 21 May 2002 10:50:49 -0400 (EDT) From: Andrew Gallatin MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15594.24265.783159.484930@moe.cs.duke.edu> Date: Tue, 21 May 2002 10:50:49 -0400 (EDT) To: Will Andrews Cc: kde@FreeBSD.ORG, alpha@FreeBSD.ORG, re@FreeBSD.ORG Subject: Re: KDE2 failing on alpha In-Reply-To: <20020521055628.GH53809@squall.waterspout.com> References: <20020520193019.A5609@xor.obsecurity.org> <20020521055628.GH53809@squall.waterspout.com> X-Mailer: VM 6.72 under 21.1 (patch 9) "Canyonlands" XEmacs Lucid Sender: owner-freebsd-alpha@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org Will Andrews writes: > finish.. so I have no idea what's going on there. The kdeutils3 > error seems to require a patch for alpha. But I don't have the > resources or time to figure out what the patch should be. I have it building. Can you approve the following patch, please? It simply yanks klaptopdaemon support for alpha. I can't see what use its features would be on a platform which doesn't support power mgmnt, so it seems simplest to just yank it. Drew Index: Makefile =================================================================== RCS file: /home/ncvs/ports/misc/kdeutils3/Makefile,v retrieving revision 1.65 diff -u -r1.65 Makefile --- Makefile 21 Apr 2002 23:45:55 -0000 1.65 +++ Makefile 21 May 2002 14:48:48 -0000 @@ -23,4 +23,15 @@ USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +#klaptop doesn't like alpha because alpha doesn't support apm +.if ${MACHINE_ARCH} == "alpha" +post-extract: + mv ${WRKSRC}/subdirs ${WRKSRC}/subdirs.orig + grep -v klaptopdaemon ${WRKSRC}/subdirs.orig > ${WRKSRC}/subdirs + +PLIST_SUB+= ALPHA_NA="@comment " +.else +PLIST_SUB+= ALPHA_NA="" +.endif + .include Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/misc/kdeutils3/pkg-plist,v retrieving revision 1.24 diff -u -r1.24 pkg-plist --- pkg-plist 23 Apr 2002 00:13:09 -0000 1.24 +++ pkg-plist 21 May 2002 14:45:02 -0000 @@ -11,7 +11,7 @@ bin/kfloppy bin/khexedit bin/kjots -bin/klaptopdaemon +%%ALPHA_NA%%bin/klaptopdaemon bin/kljettool bin/klpq bin/klprfax @@ -30,24 +30,24 @@ lib/kde3/kcharselectapplet.so.1 lib/kde3/kcm_kdf.la lib/kde3/kcm_kdf.so -lib/kde3/kcm_laptop.la -lib/kde3/kcm_laptop.so +%%ALPHA_NA%%lib/kde3/kcm_laptop.la +%%ALPHA_NA%%lib/kde3/kcm_laptop.so lib/kde3/kedit.la lib/kde3/kedit.so lib/kde3/libkregexpeditorgui.la lib/kde3/libkregexpeditorgui.so -lib/klaptopdaemon.la -lib/klaptopdaemon.so +%%ALPHA_NA%%lib/klaptopdaemon.la +%%ALPHA_NA%%lib/klaptopdaemon.so lib/libark.la lib/libark.so lib/libark.so.1 share/applnk/Editors/KEdit.desktop share/applnk/Settings/Information/kcmdf.desktop -share/applnk/Settings/Information/pcmcia.desktop -share/applnk/Settings/PowerControl/battery.desktop -share/applnk/Settings/PowerControl/bwarning.desktop -share/applnk/Settings/PowerControl/cwarning.desktop -share/applnk/Settings/PowerControl/power.desktop +%%ALPHA_NA%%share/applnk/Settings/Information/pcmcia.desktop +%%ALPHA_NA%%share/applnk/Settings/PowerControl/battery.desktop +%%ALPHA_NA%%share/applnk/Settings/PowerControl/bwarning.desktop +%%ALPHA_NA%%share/applnk/Settings/PowerControl/cwarning.desktop +%%ALPHA_NA%%share/applnk/Settings/PowerControl/power.desktop share/applnk/System/kdf.desktop share/applnk/System/kwikdisk.desktop share/applnk/Utilities/KCharSelect.desktop @@ -81,11 +81,11 @@ share/apps/khexedit/toolbar/hexwrite.png share/apps/kicker/applets/kcharselectapplet.desktop share/apps/kjots/pics/filedel.png -share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png -share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png -share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png -share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png -share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png +%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png +%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png +%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png +%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png +%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png share/apps/kljettool/pics/kljetlogo.png share/apps/konqueror/servicemenus/arkservicemenu.desktop share/apps/kregexpeditor/pics/altn.png @@ -185,13 +185,13 @@ share/icons/hicolor/16x16/apps/kfloppy.png share/icons/hicolor/16x16/apps/khexedit.png share/icons/hicolor/16x16/apps/kjots.png -share/icons/hicolor/16x16/apps/klaptopdaemon.png +%%ALPHA_NA%%share/icons/hicolor/16x16/apps/klaptopdaemon.png share/icons/hicolor/16x16/apps/kljettool.png share/icons/hicolor/16x16/apps/klpq.png share/icons/hicolor/16x16/apps/klprfax.png share/icons/hicolor/16x16/apps/kwikdisk.png -share/icons/hicolor/16x16/apps/laptop_battery.png -share/icons/hicolor/16x16/apps/laptop_pcmcia.png +%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_battery.png +%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_pcmcia.png share/icons/hicolor/32x32/apps/ark.png share/icons/hicolor/32x32/apps/kcalc.png share/icons/hicolor/32x32/apps/kcmdf.png @@ -204,8 +204,8 @@ share/icons/hicolor/32x32/apps/klpq.png share/icons/hicolor/32x32/apps/klprfax.png share/icons/hicolor/32x32/apps/kwikdisk.png -share/icons/hicolor/32x32/apps/laptop_battery.png -share/icons/hicolor/32x32/apps/laptop_pcmcia.png +%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_battery.png +%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_pcmcia.png share/icons/hicolor/48x48/apps/ark.png share/icons/hicolor/48x48/apps/kcalc.png share/icons/hicolor/48x48/apps/kcharselect.png @@ -215,12 +215,12 @@ share/icons/hicolor/48x48/apps/kjots.png share/icons/hicolor/48x48/apps/kljettool.png share/icons/hicolor/48x48/apps/klpq.png -share/icons/hicolor/48x48/apps/laptop_battery.png -share/icons/hicolor/48x48/apps/laptop_pcmcia.png +%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_battery.png +%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_pcmcia.png share/icons/locolor/16x16/apps/klprfax.png share/icons/locolor/32x32/apps/klprfax.png share/services/arkpart.desktop -share/services/klaptopdaemon.desktop +%%ALPHA_NA%%share/services/klaptopdaemon.desktop share/services/kregexpeditorgui.desktop @exec /bin/mkdir -p %D/share/apps/kcalc/pics @exec /bin/mkdir -p %D/share/apps/kcalc/pics To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-alpha" in the body of the message