From owner-freebsd-emulation@FreeBSD.ORG Mon Apr 11 11:02:07 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0118F16A4CE for ; Mon, 11 Apr 2005 11:02:07 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCFB043D1F for ; Mon, 11 Apr 2005 11:02:06 +0000 (GMT) (envelope-from owner-bugmaster@freebsd.org) Received: from freefall.freebsd.org (peter@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3BB26Ll088113 for ; Mon, 11 Apr 2005 11:02:06 GMT (envelope-from owner-bugmaster@freebsd.org) Received: (from peter@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3BB25iL088107 for emulation@freebsd.org; Mon, 11 Apr 2005 11:02:05 GMT (envelope-from owner-bugmaster@freebsd.org) Date: Mon, 11 Apr 2005 11:02:05 GMT Message-Id: <200504111102.j3BB25iL088107@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: peter set sender to owner-bugmaster@freebsd.org using -f From: FreeBSD bugmaster To: emulation@FreeBSD.org Subject: Current problem reports assigned to you X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2005 11:02:07 -0000 Current FreeBSD problem reports Critical problems S Submitted Tracker Resp. Description ------------------------------------------------------------------------------- o [2003/06/28] kern/53874 emulation /usr/ports/emulators/linux_base isn't wor 1 problem total. Serious problems S Submitted Tracker Resp. Description ------------------------------------------------------------------------------- o [2000/09/22] kern/21463 emulation Linux compatability mode should not allow o [2000/11/13] kern/22826 emulation Memory limits have no effect in linux com o [2001/03/28] kern/26171 emulation not work Linux-emulator, but hi is work i p [2002/04/16] kern/37161 emulation ext2 linux file system, error handling la o [2002/11/07] kern/45023 emulation flexlm does not run with linux-base-7, st o [2003/09/24] kern/57192 emulation linux-ibm-java1.4 freeze f [2004/03/04] ports/63747 emulation vmmon is not performing o [2004/06/20] kern/68131 emulation java/linux-ibm-jdk14: linux ibm jdk 1.4.1 o [2004/06/22] ports/68202 emulation [patch] Make vmware2 compile on -current o [2005/01/25] ports/76644 emulation FreeBSD 5.3 will freeze or crash when run o [2005/02/19] i386/77710 emulation Linux page fault sigcontext information i 11 problems total. Non-critical problems S Submitted Tracker Resp. Description ------------------------------------------------------------------------------- o [1999/04/16] i386/11165 emulation IBCS2 don't work correctly with PID_MAX 9 o [2000/12/15] kern/23561 emulation Linux compatibility mode does not support o [2001/08/14] kern/29698 emulation linux ipcs doesn'work o [2002/06/12] kern/39201 emulation ptrace(2) and rfork(RFLINUXTHPN) confuse o [2002/08/11] kern/41543 emulation Easier wine/w23 support p [2002/09/04] kern/42404 emulation TIOCSCTTY not implemented in linuxulator s [2002/09/06] kern/42466 emulation linux: 'ipc' typ=258 not implemented p [2003/01/22] kern/47349 emulation Fake a sound ioctl (plus linux hook) o [2003/08/21] kern/55835 emulation Linux IPC emulation missing SETALL syscal f [2004/06/30] ports/68532 emulation Add support for multiple VMWare instances o [2004/10/19] ports/72865 emulation emulators/vmware3 crashes on 5.3-STABLE o [2004/10/20] kern/72920 emulation linux emulation : path "prefixing" is not o [2004/10/26] kern/73165 emulation [patch] getting rid of COMPAT_43 dependan o [2004/11/10] kern/73777 emulation [patch] linux emulation: root dir special o [2005/03/19] ports/79009 emulation [patch] Some linux ports are incorrectly o [2005/04/07] ports/79655 emulation linux_base-8 fails to install as non-root 16 problems total. From owner-freebsd-emulation@FreeBSD.ORG Tue Apr 12 07:10:30 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BFE516A4CE for ; Tue, 12 Apr 2005 07:10:30 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E5FE43D31 for ; Tue, 12 Apr 2005 07:10:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3C7AUda076286 for ; Tue, 12 Apr 2005 07:10:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3C7ATf7076285; Tue, 12 Apr 2005 07:10:29 GMT (envelope-from gnats) Date: Tue, 12 Apr 2005 07:10:29 GMT Message-Id: <200504120710.j3C7ATf7076285@freefall.freebsd.org> To: emulation@FreeBSD.org From: Matteo Riondato Subject: Re: kern/37161: ext2 linux file system, error handling large files X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Matteo Riondato List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 07:10:30 -0000 The following reply was made to PR kern/37161; it has been noted by GNATS. From: Matteo Riondato To: freebsd-gnats-submit@freebsd.org Cc: tjr@freebsd.org Subject: Re: kern/37161: ext2 linux file system, error handling large files Date: Tue, 12 Apr 2005 09:02:33 +0200 This was fixed in RELENG_5 too, long time ago (Feb 2004). No fix in RELENG_4 yet and I don't know if it is possible to merge to that branch. If it's not, then this PR can be closed. Thank you. Best Regards -- Rionda aka Matteo Riondato Disinformato per default G.U.F.I. Staff Member (http://www.gufi.org) FreeSBIE Developer (http://www.freesbie.org) From owner-freebsd-emulation@FreeBSD.ORG Mon Apr 11 17:01:23 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0843B16A4CE; Mon, 11 Apr 2005 17:01:23 +0000 (GMT) Received: from mailout11.sul.t-online.com (mailout11.sul.t-online.com [194.25.134.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EE9743D58; Mon, 11 Apr 2005 17:01:21 +0000 (GMT) (envelope-from Alexander@Leidinger.net) Received: from fwd25.aul.t-online.de by mailout11.sul.t-online.com with smtp id 1DL2HH-00063j-00; Mon, 11 Apr 2005 19:00:47 +0200 Received: from Andro-Beta.Leidinger.net (Jb1UueZHwemFszxyGYEoi6qz0AyenyntFqxi3ZggvwtlGS2chW9hww@[217.83.25.128]) by fwd25.sul.t-online.de with esmtp id 1DL1IZ-0PK9GC0; Mon, 11 Apr 2005 17:58:03 +0200 Received: from localhost (localhost [127.0.0.1])j3BFvcaJ020744; Mon, 11 Apr 2005 17:57:39 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from 141.113.101.32 ([141.113.101.32]) by netchild.homeip.net (Horde MIME library) with HTTP for ; Mon, 11 Apr 2005 17:57:36 +0200 Message-ID: <20050411175736.mabpo9me4g4cwc4g@netchild.homeip.net> X-Priority: 3 (Normal) Date: Mon, 11 Apr 2005 17:57:36 +0200 From: Alexander Leidinger To: alexs@snark.rinet.ru, apeiron@coitusmentis.info, arundel@h3c.de, asa@gascom.ru, benlutz@datacomm.ch, blackend@FreeBSD.org, bms@FreeBSD.org, brett@peloton.runet.edu, cartola@openit.com.br, chris@chrisburkert.de, cjh@kr.freebsd.org, cracauer@cons.org, cyrille.lefevre@laposte.net, danfe@FreeBSD.org, darius@dons.net.au, des@FreeBSD.org, dyeske@yahoo.com, ebert@informatik.unibw-muenchen.de, frank@opengroupware.org, freebsd-emulation@FreeBSD.org, girgen@FreeBSD.org, glewis@FreeBSD.org, hido@coreblack.com, holger@e-gitt.net, ip@doom.homeunix.org, jamie@bishopston.net, janos.mohacsi@bsd.hu, java@FreeBSD.org, jylefort@brutele.be, kiesel@schlund.de, kris@FreeBSD.org, lioux@FreeBSD.org, maho@FreeBSD.org, matt@peterson.org, matusita@FreeBSD.org, mb@imp.ch, mbr@FreeBSD.org, mezz@FreeBSD.org, mi@aldan.algebra.com, mranner@inode.at, nik@FreeBSD.org, nivit@users.sourceforge.net, orlando@break.net, pat@FreeBSD.org, pav@FreeBSD.org, ports@brandon.dvalentine.com, riggs@rrr.de, rjoseph@mammalia.org, roam@FreeBSD.org, ryan@sasknow.com, se@FreeBSD.org, sethk@meowfishies.com, sime@logos.hr, simond@irrelevant.org, sr-13@mail.ru, trevor@FreeBSD.org, tux@pinguru.net, udo.schweigert@siemens.com, user@unknown.nu, voisine@gmail.FreeBSD.ORG MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_6apxqruzpe4o" Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.0.2) / FreeBSD-4.11 X-ID: Jb1UueZHwemFszxyGYEoi6qz0AyenyntFqxi3ZggvwtlGS2chW9hww@t-dialin.net X-TOI-MSGID: 28f830cc-3dc7-4ab8-8fba-9de67ab5644f X-Mailman-Approved-At: Tue, 12 Apr 2005 12:04:15 +0000 Subject: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2005 17:01:23 -0000 This message is in MIME format. --=_6apxqruzpe4o Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 7bit Dear maintainers, attached is a patch to cleanup some issues in our linux ports. Additionally to the changes described in $PORTSDIR/CHANGES and $PORTSDIR/UPDATING (after patching off-course :-) ) and corresponding changes in the ports there are also some cleanups related to the (mis(?)-)use of PREFIX and some cleanups related to superflous variable definitions. Please apply the patch (cd into $PORTSDIR and run "patch --quiet -p1 , if the port needs emulators/linux_base-. #=09=09=09=09 If set to "7", a dependency is registered to emulators/linu= x_base. +#=09=09=09=09 Implies appropriate settings for NO_FILTER_SHLIBS, +#=09=09=09=09 STRIP and STRIP_CMD. # USE_LINUX_PREFIX -#=09=09=09=09- controls the action of PREFIX (see above). +#=09=09=09=09- controls the action of PREFIX (see above). Only use this +#=09=09=09=09 if the port is a linux infrastructure port (e.g. contains l= ibs +#=09=09=09=09 or a sound server which supports the FreeBSD native one), +#=09=09=09=09 use the default or the X11 prefix if it's a leaf port +#=09=09=09=09 (e.g. a game or program). +#=09=09=09=09 Implies NO_MTREE=3Dyes. ## # USE_MYSQL=09=09- Add MySQL client dependency. #=09=09=09=09 If no version is given (by the maintainer via the port or @@ -1500,15 +1508,35 @@ .endif .if defined(USE_LINUX) + +# install(1) also does a brandelf on strip, so don't strip with FreeBSD to= ols. +STRIP=3D +.=09if exists(${LINUXBASE}/usr/bin/strip) +STRIP_CMD=3D=09${LINUXBASE}/usr/bin/strip +.=09else +STRIP_CMD=3D=09${TRUE} +.=09endif + +NO_FILTER_SHLIBS=3D=09yes + +# Allow the user to specify another linux_base version. +.=09if defined(OVERRIDE_DEFAULT_LINUX_BASE) +.=09=09if ${USE_LINUX} =3D=3D yes +USE_LINUX=3D=09${OVERRIDE_DEFAULT_LINUX_BASE} +.=09=09endif +.=09endif + .=09if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX}) -RUN_DEPENDS+=3D=09${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${U= SE_LINUX} +DEFAULT_LINUX_BASE=3D=09${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_ba= se-${USE_LINUX} .=09else .=09=09if ${USE_LINUX} =3D=3D "7" -RUN_DEPENDS+=3D ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linu= x_base +DEFAULT_LINUX_BASE=3D=09${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulat= ors/linux_base .=09=09else -RUN_DEPENDS+=3D=09${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/li= nux_base-8 +DEFAULT_LINUX_BASE=3D=09${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulat= ors/linux_base-8 .=09=09endif .=09endif + +RUN_DEPENDS+=3D=09${DEFAULT_LINUX_BASE} .endif .if defined(USE_MOTIF) @@ -1775,7 +1803,11 @@ .endif .if defined(USE_XLIB) +.=09if defined(USE_LINUX) +RUN_DEPENDS+=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x= 11/linux-XFree86-libs +.=09else LIB_DEPENDS+=3D=09X11.6:${X_LIBRARIES_PORT} +.=09endif # Add explicit X options to avoid problems with false positives in configu= re .if defined(GNU_CONFIGURE) CONFIGURE_ARGS+=3D--x-libraries=3D${X11BASE}/lib --x-includes=3D${X11BASE}= /include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/UPDATING devel_ports/UPDATING --- ports/UPDATING=09Mon Apr 11 10:14:22 2005 +++ devel_ports/UPDATING=09Mon Apr 11 14:19:55 2005 @@ -15,6 +15,15 @@ gdm_enable=3D"YES" +2005XXYY: + AFFECTS: users of alternate linux_base ports + AUTHOR: netchild@FreeBSD.org + + The Ports Collection now allows to override the default linux_base port. + Specify e.g. OVERRIDE_DEFAULT_LINUX_BASE=3Drh-9 in /etc/make.conf to use + ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use + ${PORTSDIR}/emulators/linux_base-${OVERRIDE_DEFAULT_LINUX_BASE}). + 20050406: AFFECTS: users of databases/mysql50-server AUTHOR: ale@FreeBSD.org @@ -41,7 +50,7 @@ 11.x to 12.x. 20050324: - AFFECTS: users of net/mDNSResponder, + AFFECTS: users of net/mDNSResponder AUTHOR: brooks@FreeBSD.org In mDNSResponder 98_1, mdnsd is no longer started by default due to a diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/archivers/stuffit/Makefile devel_ports/archivers/stuffit/Makef= ile --- ports/archivers/stuffit/Makefile=09Tue Mar 1 22:51:24 2005 +++ devel_ports/archivers/stuffit/Makefile=09Thu Apr 7 16:34:24 2005 @@ -20,8 +20,7 @@ ONLY_FOR_ARCHS=3D=09i386 amd64 -USE_LINUX?=3D=09yes -STRIP=3D=09=09# empty: do not strip linux binary during INSTALL_PROGRAM +USE_LINUX=3D=09yes NO_WRKSUBDIR=3D=09yes STUFFIT_FILES=3D=09bin/unstuff bin/stuff STUFFIT_MAN=3D=09man/man1/stuff.1 man/man1/unstuff.1 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/astro/linux-setiathome/Makefile devel_ports/astro/linux-setiat= home/Makefile --- ports/astro/linux-setiathome/Makefile=09Tue Mar 1 22:51:24 2005 +++ devel_ports/astro/linux-setiathome/Makefile=09Thu Apr 7 15:01:20 2005 @@ -16,7 +16,7 @@ # ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes # Local variables # diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/audio/baudline/Makefile devel_ports/audio/baudline/Makefile --- ports/audio/baudline/Makefile=09Tue Mar 1 22:51:25 2005 +++ devel_ports/audio/baudline/Makefile=09Thu Apr 7 16:34:41 2005 @@ -16,15 +16,14 @@ MAINTAINER=3D=09dyeske@yahoo.com COMMENT=3D=09A real-time signal analysis tool and an offline time-frequenc= y browser -RUN_DEPENDS=3D=09mpg123:${PORTSDIR}/audio/mpg123 \ -=09=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFr= ee86-libs +RUN_DEPENDS=3D=09mpg123:${PORTSDIR}/audio/mpg123 BROKEN=3D=09=09Unfetchable USE_X_PREFIX=3D=09yes +USE_LINUX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 NO_BUILD=3D=09yes -STRIP=3D # Linux binary should not be stripped by INSTALL_PROGRAM # because as a side effect it brands the binary as FreeBSD. diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/audio/linux-arts/Makefile devel_ports/audio/linux-arts/Makefil= e --- ports/audio/linux-arts/Makefile=09Mon Apr 11 10:01:27 2005 +++ devel_ports/audio/linux-arts/Makefile=09Mon Apr 11 15:27:32 2005 @@ -21,15 +21,13 @@ BUILD_DEPENDS=3D=09=09rpm:${PORTSDIR}/archivers/rpm -USE_LINUX?=3D=09=09yes -PREFIX?=3D=09=09${LINUXBASE} -NO_MTREE=3D=09=09yes +USE_LINUX=3D=09=09yes +USE_LINUX_PREFIX=3D=09yes LDCONFIG_LINUX=3D=09=09${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS=3D=09=09i386 DIST_SUBDIR=3D=09=09rpm NO_BUILD=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes PLIST=3D=09=09=09${MASTERDIR}/pkg-plist.${ARCH} MD5_FILE=3D=09=09${MASTERDIR}/distinfo.${ARCH} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/audio/linux-mbrola/Makefile devel_ports/audio/linux-mbrola/Mak= efile --- ports/audio/linux-mbrola/Makefile=09Tue Mar 1 22:51:25 2005 +++ devel_ports/audio/linux-mbrola/Makefile=09Thu Apr 7 15:16:18 2005 @@ -19,7 +19,7 @@ MASTERDIR=3D=09${PORTSDIR}/audio/mbrola MD5_FILE=3D=09${.CURDIR}/distinfo ONLY_FOR_ARCHS=3D=09alpha i386 ppc sparc64 -USE_LINUX?=3D=09y +USE_LINUX=3D=09yes USE_ZIP=3D=09y MASTERDIR=3D=09${.CURDIR}/../mbrola diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/audio/linux-vsound/Makefile devel_ports/audio/linux-vsound/Mak= efile --- ports/audio/linux-vsound/Makefile=09Tue Mar 1 22:51:25 2005 +++ devel_ports/audio/linux-vsound/Makefile=09Thu Apr 7 15:14:18 2005 @@ -19,7 +19,7 @@ RUN_DEPENDS=3D=09sox:${PORTSDIR}/audio/sox/ -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_BUILD=3D=09yes do-install: diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/audio/teamspeak_client/Makefile devel_ports/audio/teamspeak_cl= ient/Makefile --- ports/audio/teamspeak_client/Makefile=09Wed Mar 2 06:42:43 2005 +++ devel_ports/audio/teamspeak_client/Makefile=09Thu Apr 7 16:22:17 2005 @@ -21,8 +21,8 @@ ONLY_FOR_ARCHS=3D=09i386 USE_BZIP2=3D=09yes +USE_LINUX=3D=09yes NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3Dyes do-install: =09${MKDIR} ${PREFIX}/lib/teamspeak_client diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/audio/teamspeak_server/Makefile devel_ports/audio/teamspeak_se= rver/Makefile --- ports/audio/teamspeak_server/Makefile=09Tue Mar 1 22:51:26 2005 +++ devel_ports/audio/teamspeak_server/Makefile=09Thu Apr 7 16:22:24 2005 @@ -20,8 +20,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_BZIP2=3D=09yes NO_BUILD=3D=09yes -USE_LINUX?=3D=09yes -NO_FILTER_SHLIBS=3Dyes +USE_LINUX=3D=09yes do-install: =09@ ${SETENV} PKG_PREFIX=3D${PREFIX} \ diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/cad/linux-eagle/Makefile devel_ports/cad/linux-eagle/Makefile --- ports/cad/linux-eagle/Makefile=09Tue Mar 1 22:51:26 2005 +++ devel_ports/cad/linux-eagle/Makefile=09Thu Apr 7 15:01:14 2005 @@ -28,7 +28,7 @@ RESTRICTED=3D=09"Usage permitted for non-commercial purposes only" NO_CDROM=3D=09"Sale for profit is not permitted" -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_BUILD=3D=09yes PKGMESSAGE=3D=09${WRKDIR}/pkg-message diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/databases/sybase_ase/Makefile devel_ports/databases/sybase_ase= /Makefile --- ports/databases/sybase_ase/Makefile=09Tue Mar 1 22:51:26 2005 +++ devel_ports/databases/sybase_ase/Makefile=09Mon Apr 11 15:28:26 2005 @@ -22,7 +22,7 @@ NO_INSTALL_MANPAGES=3D yes PKGDEINSTALL=3D=09${PKGDIR}/pkg-install -USE_LINUX?=3D yes +USE_LINUX=3D=09yes pre-install: =09@${ECHO_MSG} "---> Creating sybase user and group" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/devel/linux-allegro/Makefile devel_ports/devel/linux-allegro/M= akefile --- ports/devel/linux-allegro/Makefile=09Mon Apr 11 10:01:46 2005 +++ devel_ports/devel/linux-allegro/Makefile=09Mon Apr 11 14:19:58 2005 @@ -18,14 +18,13 @@ MAINTAINER=3D=09freebsd-emulation@FreeBSD.org COMMENT=3D=09Cross-platform game programming library (linux version) -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=09yes USE_LINUX_PREFIX=3D=09yes LDCONFIG_LINUX=3D=09${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS=3D=09i386 DIST_SUBDIR=3D=09rpm NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3D=09yes DBPATH=3D=09=09/var/lib/rpm RPMFLAGS=3D=09--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/devel/linux-runrev/Makefile devel_ports/devel/linux-runrev/Mak= efile --- ports/devel/linux-runrev/Makefile=09Tue Mar 1 22:51:26 2005 +++ devel_ports/devel/linux-runrev/Makefile=09Thu Apr 7 16:40:05 2005 @@ -19,23 +19,18 @@ MAINTAINER=3D=09blackend@FreeBSD.org COMMENT=3D=09Revolution is a rapid application development environment -RUN_DEPENDS=3D=09xanim:${PORTSDIR}/multimedia/xanim \ -=09=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFr= ee86-libs +RUN_DEPENDS=3D=09xanim:${PORTSDIR}/multimedia/xanim NO_CDROM=3D=09"Sale for profit is not permitted" ONLY_FOR_ARCHS=3D=09i386 NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/Revolution-${PORTVERSION} DATADIR=3D=09${PREFIX}/share/Revolution-${PORTVERSION} -BRANDELF?=3D=09/usr/bin/brandelf -# do not strip linux binaries -STRIP=3D -# try using the Linux strip command -STRIP_CMD=3D=09${LINUXBASE}/usr/bin/strip - BIN_FILES=3D=09revolution LIB_DIRS=3D=09Databases components components/assistants \ =09=09components/help components/help/Appendixes \ @@ -99,9 +94,7 @@ .endfor # binaries .for file in ${BIN_FILES} -. if exists(${STRIP_CMD}) =09@${STRIP_CMD} ${WRKSRC}/${file} -. endif =09@${BRANDELF} -t Linux ${WRKSRC}/${file} =09@${INSTALL_PROGRAM} ${WRKSRC}/${file} ${DATADIR}/${file} .endfor diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/devel/linux-understand_ada/Makefile devel_ports/devel/linux-un= derstand_ada/Makefile --- ports/devel/linux-understand_ada/Makefile=09Fri Apr 1 03:27:54 2005 +++ devel_ports/devel/linux-understand_ada/Makefile=09Mon Apr 11 15:30:58 2= 005 @@ -17,8 +17,6 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09Understand can parse a Ada project helping reverse engineer i= t -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - IGNORE=3D=09=09"is unfetchable and outdated and new version requires suppo= rt contract" DEPRECATED=3D=09${IGNORE} EXPIRATION_DATE=3D=092005-05-01 @@ -27,11 +25,10 @@ ONLY_FOR_ARCHS=3D=09i386 NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes PREFIX_LINUX?=3D=09${LINUXBASE} -STRIP=3D=09=09${LINUXBASE}/usr/bin/strip -BRANDELF?=3D=09/usr/bin/brandelf -FMT?=3D=09=09/usr/bin/fmt INSTALL_DATA_DIR?=3D=09${INSTALL} -d -o ${SHAREOWN} \ =09=09=09-g ${SHAREGRP} -m 755 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/devel/linux-understand_c/Makefile devel_ports/devel/linux-unde= rstand_c/Makefile --- ports/devel/linux-understand_c/Makefile=09Fri Apr 1 03:27:54 2005 +++ devel_ports/devel/linux-understand_c/Makefile=09Mon Apr 11 15:31:26 200= 5 @@ -18,8 +18,6 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09Understand can parse a C/C++ project helping reverse engineer= it -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - IGNORE=3D=09=09"is unfetchable and outdated and new version requires suppo= rt contract" DEPRECATED=3D=09${IGNORE} EXPIRATION_DATE=3D=092005-05-01 @@ -28,11 +26,10 @@ ONLY_FOR_ARCHS=3D=09i386 NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes PREFIX_LINUX?=3D=09${LINUXBASE} -STRIP=3D=09=09${LINUXBASE}/usr/bin/strip -BRANDELF?=3D=09/usr/bin/brandelf -FMT?=3D=09=09/usr/bin/fmt CONF_DIRS=3D=09compilers configs fonts license CONF_FILES=3D=09compilers/aix.cfg compilers/alpha.cfg \ diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/devel/linux-understand_java/Makefile devel_ports/devel/linux-u= nderstand_java/Makefile --- ports/devel/linux-understand_java/Makefile=09Fri Apr 1 03:27:54 2005 +++ devel_ports/devel/linux-understand_java/Makefile=09Mon Apr 11 15:32:00 = 2005 @@ -17,8 +17,6 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09Understand can parse a Java project helping reverse engineer = it -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - IGNORE=3D=09=09"is unfetchable and outdated and new version requires suppo= rt contract" DEPRECATED=3D=09${IGNORE} EXPIRATION_DATE=3D=092005-05-01 @@ -27,11 +25,10 @@ ONLY_FOR_ARCHS=3D=09i386 NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes PREFIX_LINUX?=3D=09${LINUXBASE} -STRIP=3D=09=09${LINUXBASE}/usr/bin/strip -BRANDELF?=3D=09/usr/bin/brandelf -FMT?=3D=09=09/usr/bin/fmt INSTALL_DATA_DIR?=3D=09${INSTALL} -d -o ${SHAREOWN} \ =09=09=09-g ${SHAREGRP} -m 755 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/devel/linux_devtools/Makefile devel_ports/devel/linux_devtools= /Makefile --- ports/devel/linux_devtools/Makefile=09Mon Apr 11 04:59:57 2005 +++ devel_ports/devel/linux_devtools/Makefile=09Mon Apr 11 14:23:45 2005 @@ -35,17 +35,12 @@ BUILD_DEPENDS=3D=09rpm:${PORTSDIR}/archivers/rpm -RESTRICTED=3D=09=09"binaries under GNU GPL without accompanying source" - -USE_LINUX?=3D=09=09yes -NO_LATEST_LINK=3D=09=09yes +USE_LINUX=3D=09=098 +USE_LINUX_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09=09i386 amd64 CONFLICTS=3D=09=09linux_devtools-* DIST_SUBDIR=3D=09=09rpm/${ARCH}/${PORTVERSION} -PREFIX=3D=09=09=09${LINUXBASE} NO_BUILD=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes -NO_MTREE=3D=09=09yes PLIST=3D=09=09=09${WRKDIR}/pkg-plist # Let's avoid hardcoding 'en' as the language. @@ -57,8 +52,8 @@ DBPATH=3D=09=09=09/var/lib/rpm RPM=3D=09=09=09LC_ALL=3DC rpm -RPMFLAGS=3D=09=09--root ${LINUXBASE} --dbpath ${DBPATH} --nodeps \ -=09=09=09--replacepkgs --ignoreos +RPMFLAGS=3D=09=09--root ${PREFIX} --dbpath ${DBPATH} --nodeps \ +=09=09=09--replacepkgs --ignoreos --ignorearch RPMDIR=3D=09=09=09${DISTDIR}/${DIST_SUBDIR} REMOVE_DIRS=3D=09=09dev tmp var/tmp @@ -87,12 +82,15 @@ do-install: =09@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -=09@${MKDIR} ${LINUXBASE}/tmp -=09@${MKDIR} ${LINUXBASE}/var/tmp -=09@${MKDIR} ${LINUXBASE}/dev -=09@${RM} -f ${LINUXBASE}/dev/null -=09@mknod ${LINUXBASE}/dev/null c 2 2 -=09@${CHMOD} 666 ${LINUXBASE}/dev/null +=09@${MKDIR} ${PREFIX}/tmp +=09@${MKDIR} ${PREFIX}/var/tmp +# this isn't needed on a devfs system +.if ( ${OSVERSION} < 502100 ) +=09@${MKDIR} ${PREFIX}/dev +=09@${RM} -f ${PREFIX}/dev/null +=09@mknod ${PREFIX}/dev/null c 2 2 +=09@${CHMOD} 666 ${PREFIX}/dev/null +.endif # # Install all packages. =09@for R in ${DISTFILES}; do \ @@ -108,10 +106,10 @@ # # Finish =09@for D in ${REMOVE_DIRS}; do \ -=09=09${RM} -rf ${LINUXBASE}/$$D; \ +=09=09${RM} -rf ${PREFIX}/$$D; \ =09done =09@for F in ${REMOVE_FILES}; do \ -=09=09${RM} ${LINUXBASE}/$$F; \ +=09=09${RM} ${PREFIX}/$$F; \ =09done .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/devel/zendstudio/Makefile devel_ports/devel/zendstudio/Makefil= e --- ports/devel/zendstudio/Makefile=09Tue Mar 1 22:51:27 2005 +++ devel_ports/devel/zendstudio/Makefile=09Thu Apr 7 15:29:23 2005 @@ -20,6 +20,7 @@ RESTRICTED=3D=09"Redistribution is not permitted" NO_PACKAGES=3D=09${RESTRICTED} NO_CDROM=3D=09${RESTRICTED} +USE_LINUX=3D=09yes .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/editors/edith/Makefile devel_ports/editors/edith/Makefile --- ports/editors/edith/Makefile=09Tue Mar 1 22:51:27 2005 +++ devel_ports/editors/edith/Makefile=09Thu Apr 7 16:42:30 2005 @@ -16,10 +16,9 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09A X11 GUI editor for binary and plain text files -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - -USE_X_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes RESTRICTED=3D=09"Redistribution not allowed" NO_BUILD=3D=09yes @@ -29,7 +28,6 @@ WRKSRC=3D=09=09${WRKDIR}/edith EDITHDIR=3D=09${PREFIX}/lib/edith -STRIP=3D do-install: =09${INSTALL_PROGRAM} ${WRKSRC}/bin/linux/edith ${PREFIX}/bin diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/editors/staroffice5/Makefile devel_ports/editors/staroffice5/M= akefile --- ports/editors/staroffice5/Makefile=09Tue Mar 1 22:51:27 2005 +++ devel_ports/editors/staroffice5/Makefile=09Thu Apr 7 15:30:45 2005 @@ -26,6 +26,7 @@ NO_CDROM=3D=09'Must be downloaded direct from Sun via www interface' USE_REINPLACE=3D=09yes +USE_LINUX=3D=09yes IS_INTERACTIVE=3D=09yes EXTRACT_ONLY=3D=09${DISTNAME}${EXTRACT_SUFX} EXTRACT_CMD=3D=09${CAT} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/editors/staroffice52/Makefile devel_ports/editors/staroffice52= /Makefile --- ports/editors/staroffice52/Makefile=09Tue Mar 1 22:51:28 2005 +++ devel_ports/editors/staroffice52/Makefile=09Thu Apr 7 15:31:15 2005 @@ -42,6 +42,7 @@ IS_INTERACTIVE=3D=09yes NO_BUILD=3D=09yes USE_REINPLACE=3D=09yes +USE_LINUX=3D=09yes DIST_SUBDIR=3D=09staroffice52 WRKSRC=3D=09=09${WRKDIR}/office52 TMPDIR=3D=09=09${WRKDIR}/tmp diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/editors/staroffice60/Makefile devel_ports/editors/staroffice60= /Makefile --- ports/editors/staroffice60/Makefile=09Tue Mar 1 22:51:28 2005 +++ devel_ports/editors/staroffice60/Makefile=09Thu Apr 7 15:31:32 2005 @@ -32,6 +32,7 @@ ONLY_FOR_ARCHS=3D=09i386 NO_CDROM=3D=09'Must be bought and downloaded direct from Sun via www inter= face' +USE_LINUX=3D=09yes IS_INTERACTIVE=3D=09yes NO_BUILD=3D=09yes SOVERSION=3D=09${PORTNAME}${PORTVERSION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/editors/staroffice70/Makefile devel_ports/editors/staroffice70= /Makefile --- ports/editors/staroffice70/Makefile=09Tue Mar 1 22:51:28 2005 +++ devel_ports/editors/staroffice70/Makefile=09Thu Apr 7 15:31:46 2005 @@ -35,6 +35,7 @@ ONLY_FOR_ARCHS=3D=09i386 NO_CDROM=3D=09'Must be bought and downloaded direct from Sun via www inter= face' +USE_LINUX=3D=09yes IS_INTERACTIVE=3D=09yes NO_BUILD=3D=09yes SOVERSION=3D=09${PORTNAME}${PORTVERSION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/linux-geepee32/Makefile devel_ports/emulators/linux-= geepee32/Makefile --- ports/emulators/linux-geepee32/Makefile=09Tue Mar 1 22:51:28 2005 +++ devel_ports/emulators/linux-geepee32/Makefile=09Thu Apr 7 16:51:20 200= 5 @@ -15,17 +15,16 @@ MAINTAINER=3D=09arundel@h3c.de COMMENT=3D=09The only GP32 emulator for i386 -RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/li= nux-sdl12 \ -=09=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFr= ee86-libs +RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/li= nux-sdl12 ONLY_FOR_ARCHS=3D=09i386 USE_X_PREFIX=3D=09yes +USE_LINUX=3D=09yes USE_ZIP=3D=09yes NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes USE_REINPLACE=3D=09yes REINPLACE_ARGS=3D -STRIP=3D TARGET_DIR=3D=09${PREFIX}/${PORTNAME} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/linux-peops-softgpu/Makefile devel_ports/emulators/l= inux-peops-softgpu/Makefile --- ports/emulators/linux-peops-softgpu/Makefile=09Tue Mar 1 22:51:28 2005 +++ devel_ports/emulators/linux-peops-softgpu/Makefile=09Thu Apr 7 16:44:1= 9 2005 @@ -19,22 +19,20 @@ NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D - MAJOR=3D=09=09${PORTVERSION:R} MINOR=3D=09=09${PORTVERSION:E} PLIST_SUB+=3D=09MAJOR=3D${MAJOR} MINOR=3D${MINOR} .include -PSEMUPRO_PLUGINS_DIR=3D=09${LOCALBASE}/lib/psemupro/plugins -PSEMUPRO_CFGBINS_DIR=3D=09${LOCALBASE}/libexec/psemupro/cfg -PSEMUPRO_CFGFILES_DIR=3D=09${LOCALBASE}/share/psemupro/cfg +PSEMUPRO_PLUGINS_DIR=3D=09${PREFIX}/lib/psemupro/plugins +PSEMUPRO_CFGBINS_DIR=3D=09${PREFIX}/libexec/psemupro/cfg +PSEMUPRO_CFGFILES_DIR=3D=09${PREFIX}/share/psemupro/cfg do-install: =09${MKDIR} ${PSEMUPRO_PLUGINS_DIR} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/linux-peops-spu/Makefile devel_ports/emulators/linux= -peops-spu/Makefile --- ports/emulators/linux-peops-spu/Makefile=09Tue Mar 1 22:51:29 2005 +++ devel_ports/emulators/linux-peops-spu/Makefile=09Thu Apr 7 16:44:58 20= 05 @@ -19,22 +19,20 @@ NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D - MAJOR=3D=09=09${PORTVERSION:R} MINOR=3D=09=09${PORTVERSION:E} PLIST_SUB+=3D=09MAJOR=3D${MAJOR} MINOR=3D${MINOR} .include -PSEMUPRO_PLUGINS_DIR=3D=09${LOCALBASE}/lib/psemupro/plugins -PSEMUPRO_CFGBINS_DIR=3D=09${LOCALBASE}/libexec/psemupro/cfg -PSEMUPRO_CFGFILES_DIR=3D=09${LOCALBASE}/share/psemupro/cfg +PSEMUPRO_PLUGINS_DIR=3D=09${PREFIX}/lib/psemupro/plugins +PSEMUPRO_CFGBINS_DIR=3D=09${PREFIX}/libexec/psemupro/cfg +PSEMUPRO_CFGFILES_DIR=3D=09${PREFIX}/share/psemupro/cfg do-install: =09${MKDIR} ${PSEMUPRO_PLUGINS_DIR} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/linux-pete-mesagpu/Makefile devel_ports/emulators/li= nux-pete-mesagpu/Makefile --- ports/emulators/linux-pete-mesagpu/Makefile=09Tue Mar 1 22:51:29 2005 +++ devel_ports/emulators/linux-pete-mesagpu/Makefile=09Thu Apr 7 16:49:36= 2005 @@ -21,22 +21,20 @@ NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D - MAJOR=3D=09=09${PORTVERSION:R} MINOR=3D=09=09${PORTVERSION:E} PLIST_SUB+=3D=09MAJOR=3D${MAJOR} MINOR=3D${MINOR} .include -PSEMUPRO_PLUGINS_DIR=3D=09${LOCALBASE}/lib/psemupro/plugins -PSEMUPRO_CFGBINS_DIR=3D=09${LOCALBASE}/libexec/psemupro/cfg -PSEMUPRO_CFGFILES_DIR=3D=09${LOCALBASE}/share/psemupro/cfg +PSEMUPRO_PLUGINS_DIR=3D=09${PREFIX}/lib/psemupro/plugins +PSEMUPRO_CFGBINS_DIR=3D=09${PREFIX}/libexec/psemupro/cfg +PSEMUPRO_CFGFILES_DIR=3D=09${PREFIX}/share/psemupro/cfg do-install: =09${MKDIR} ${PSEMUPRO_PLUGINS_DIR} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/linux-vmware-toolbox2/Makefile devel_ports/emulators= /linux-vmware-toolbox2/Makefile --- ports/emulators/linux-vmware-toolbox2/Makefile=09Tue Mar 1 22:51:29 20= 05 +++ devel_ports/emulators/linux-vmware-toolbox2/Makefile=09Thu Apr 7 16:49= :55 2005 @@ -16,8 +16,6 @@ MAINTAINER=3D=09matusita@FreeBSD.org COMMENT=3DVMware toolbox for guest OS (for VMware 2.x, Linux version) -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - ONLY_FOR_ARCHS=3D=09i386 PLIST_FILES=3D=09bin/linux-vmware-toolbox USE_X_PREFIX=3D=09yes @@ -47,7 +45,6 @@ .else MOUNT_DEV?=3D=09fd0 .endif -STRIP=3D VMWARE_VER=3D=092.0.4 BUILD_VER=3D=091142 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/linux-vmware-toolbox4/Makefile devel_ports/emulators= /linux-vmware-toolbox4/Makefile --- ports/emulators/linux-vmware-toolbox4/Makefile=09Tue Mar 8 03:01:46 20= 05 +++ devel_ports/emulators/linux-vmware-toolbox4/Makefile=09Thu Apr 7 16:50= :34 2005 @@ -16,17 +16,15 @@ MAINTAINER=3D=09matusita@FreeBSD.org COMMENT=3DVMware toolbox for guest OS (for VMware 4.x, Linux version) -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - DISTDIR=3D=09${MOUNT_PT} IGNOREFILES=3D=09${DISTFILES} PLIST_FILES=3D=09bin/linux-vmware-toolbox WRKSRC=3D=09=09${WRKDIR}/vmware-tools-distrib -STRIP=3D ONLY_FOR_ARCHS=3D=09i386 -USE_X_PREFIX=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes .if !defined(BATCH) IS_INTERACTIVE=3D=09yes .endif diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/linux-winetools/Makefile devel_ports/emulators/linux= -winetools/Makefile --- ports/emulators/linux-winetools/Makefile=09Tue Mar 1 22:51:29 2005 +++ devel_ports/emulators/linux-winetools/Makefile=09Thu Apr 7 16:51:02 20= 05 @@ -16,16 +16,14 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09A setup and configuration tool for WINE -RUN_DEPENDS=3D=09wine:${PORTSDIR}/emulators/wine \ -=09=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFr= ee86-libs +RUN_DEPENDS=3D=09wine:${PORTSDIR}/emulators/wine NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 PLIST_FILES=3D=09bin/winetools - -BRANDELF?=3D=09/usr/bin/brandelf -STRIP=3D post-extract: =09@${BRANDELF} -t Linux ${WRKDIR}/${PORTNAME} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/rtc/Makefile devel_ports/emulators/rtc/Makefile --- ports/emulators/rtc/Makefile=09Tue Mar 1 22:51:29 2005 +++ devel_ports/emulators/rtc/Makefile=09Thu Apr 7 15:37:07 2005 @@ -18,7 +18,7 @@ WRKSRC=3D=09=09${WRKDIR}/files NO_FETCH=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes=09# because of ${DEVDIR} KMODDIR=3D=09${PREFIX}/modules diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/vmware2/Makefile devel_ports/emulators/vmware2/Makef= ile --- ports/emulators/vmware2/Makefile=09Tue Mar 1 22:51:30 2005 +++ devel_ports/emulators/vmware2/Makefile=09Thu Apr 7 15:39:47 2005 @@ -45,7 +45,7 @@ SRC_BASE?=3D=09/usr/src ONLY_FOR_ARCHS=3D=09i386 -USE_XLIB=3D=09yes +USE_LINUX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/vmware-distrib GZCAT=3D=09=09${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract MAN1=3D=09=09vmware.1 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/emulators/vmware3/Makefile devel_ports/emulators/vmware3/Makef= ile --- ports/emulators/vmware3/Makefile=09Tue Mar 1 22:51:30 2005 +++ devel_ports/emulators/vmware3/Makefile=09Thu Apr 7 15:40:55 2005 @@ -22,7 +22,7 @@ MAINTAINER=3D=09orlando@break.net COMMENT=3D=09A virtual machine emulator - a full PC in a window -RUN_DEPENDS=3D=09/dev/rtc:${PORTSDIR}/emulators/rtc \ +RUN_DEPENDS=3D=09${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc \ =09=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFr= ee86-libs RESTRICTED=3D=09"Not sure if we can redistribute it" @@ -39,7 +39,7 @@ SRC_BASE?=3D=09/usr/src ONLY_FOR_ARCHS=3D=09i386 -USE_XLIB=3D=09yes +USE_LINUX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/vmware-distrib GZCAT=3D=09=09${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract MAN1=3D=09=09vmware.1 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/french/gibi/Makefile devel_ports/french/gibi/Makefile --- ports/french/gibi/Makefile=09Sat Apr 2 22:14:43 2005 +++ devel_ports/french/gibi/Makefile=09Thu Apr 7 15:43:27 2005 @@ -35,6 +35,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_REINPLACE=3D=09yes +USE_LINUX=3D=09yes REINPLACE_ARGS=3D=09-i "" NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/french/homard/Makefile devel_ports/french/homard/Makefile --- ports/french/homard/Makefile=09Sat Apr 2 22:15:09 2005 +++ devel_ports/french/homard/Makefile=09Thu Apr 7 15:42:03 2005 @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_PYTHON=3D=09yes USE_REINPLACE=3D=09yes REINPLACE_ARGS=3D=09-i "" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/french/staroffice52/Makefile devel_ports/french/staroffice52/M= akefile --- ports/french/staroffice52/Makefile=09Tue Mar 1 22:51:30 2005 +++ devel_ports/french/staroffice52/Makefile=09Thu Apr 7 15:42:55 2005 @@ -36,6 +36,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes NO_CDROM=3D=09'Doit =EAtre t=E9l=E9charg=E9 depuis le site web de Sun' CD_MOUNTPT=3D=09'/cdrom' IS_INTERACTIVE=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/HeroesOfMightAndMagic/Makefile devel_ports/games/HeroesO= fMightAndMagic/Makefile --- ports/games/HeroesOfMightAndMagic/Makefile=09Tue Mar 1 22:51:31 2005 +++ devel_ports/games/HeroesOfMightAndMagic/Makefile=09Thu Apr 7 15:43:45 = 2005 @@ -20,6 +20,7 @@ PLIST=3D=09=09${WRKDIR}/PLIST IS_INTERACTIVE=3D=09yes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes NO_BUILD=3D=09yes NO_WRKSUBDIR=3D=09yes NO_CDROM=3D=09Software is commercial diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/adom/Makefile devel_ports/games/adom/Makefile --- ports/games/adom/Makefile=09Tue Mar 1 22:51:31 2005 +++ devel_ports/games/adom/Makefile=09Thu Apr 7 16:51:36 2005 @@ -15,11 +15,11 @@ MAINTAINER=3D=09sr-13@mail.ru COMMENT=3D=09An rogue-like advanced rpg with color support (binary port) -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - NO_CDROM=3D=09Copy of CD must be sent to author ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/adom NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/atitd/Makefile devel_ports/games/atitd/Makefile --- ports/games/atitd/Makefile=09Tue Mar 1 22:51:31 2005 +++ devel_ports/games/atitd/Makefile=09Thu Apr 7 16:55:30 2005 @@ -28,13 +28,14 @@ .endif PLIST_FILES=3D=09bin/atitd -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes USE_MESA=3D=09yes ONLY_FOR_ARCHS=3D=09i386 NO_CDROM=3D=09"Redistribution not allowed" -NO_PACKAGE=3D=09"Not packagable." NO_BUILD=3D=09yes +NO_PACKAGE=3D=09"Not packagable." NO_WRKSUBDIR=3D=09yes LINUX_SH=3D=09${LINUXBASE}/bin/sh @@ -58,6 +59,7 @@ post-install: =09@${ECHO_MSG} "=3D=3D=3D> Fixing permissions." =09@${CHOWN} -R atitd:atitd ${PREFIX}/games/atitd +=09@${BRANDELF} -t Linux ${PREFIX}/games/atitd/elaunch =09@${CHMOD} ug+s ${PREFIX}/games/atitd/elaunch =09${INSTALL_SCRIPT} ${WRKSRC}/atitd.sh ${PREFIX}/bin/atitd =09@${ECHO_MSG} "=3D=3D=3D> Running the post-install script." diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/dsnake/Makefile devel_ports/games/dsnake/Makefile --- ports/games/dsnake/Makefile=09Tue Mar 1 22:51:31 2005 +++ devel_ports/games/dsnake/Makefile=09Thu Apr 7 17:12:24 2005 @@ -20,9 +20,12 @@ NO_PACKAGE=3D=09Licence forbids any repacking and reselling ONLY_FOR_ARCHS=3D=09i386 -NO_BUILD=3D=09yes -PREFIX?=3D=09${X11BASE} +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/DeluxeSnake + +do-build: +=09${BRANDELF} -t Linux ${WRKSRC}/dsnake do-install: =09${MKDIR} ${DATADIR} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/halflifeserver/Makefile devel_ports/games/halflifeserver= /Makefile --- ports/games/halflifeserver/Makefile=09Tue Mar 1 22:51:31 2005 +++ devel_ports/games/halflifeserver/Makefile=09Thu Apr 7 15:45:16 2005 @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_PERL5=3D=09yes NO_CDROM=3D=09"Size; the data set is much too big" NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/hlserver-cs/Makefile devel_ports/games/hlserver-cs/Makef= ile --- ports/games/hlserver-cs/Makefile=09Tue Mar 1 22:51:31 2005 +++ devel_ports/games/hlserver-cs/Makefile=09Thu Apr 7 15:45:49 2005 @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_PERL5=3D=09yes NO_CDROM=3D=09"Size; the data set is much too big" NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/hohlin/Makefile devel_ports/games/hohlin/Makefile --- ports/games/hohlin/Makefile=09Tue Mar 1 22:51:32 2005 +++ devel_ports/games/hohlin/Makefile=09Thu Apr 7 15:50:10 2005 @@ -22,6 +22,7 @@ WRKSRC=3D=09=09${WRKDIR}/hoh-install-${PORTVERSION}/ USE_BZIP2=3D=09YES +USE_LINUX=3D=09yes NO_BUILD=3D=09YES ONLY_FOR_ARCHS=3D=09i386 SHORTPORTVERSION=3D${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/linux-enemyterritory/Makefile devel_ports/games/linux-en= emyterritory/Makefile --- ports/games/linux-enemyterritory/Makefile=09Tue Mar 1 22:51:32 2005 +++ devel_ports/games/linux-enemyterritory/Makefile=09Thu Apr 7 15:49:38 2= 005 @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_PACKAGE=3D=09Distfile is 258MB, set FORCE_PACKAGE if you really want to= build this package RESTRICTED=3D=09Redistribution is limited, see license NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/linux-nwnclient/Makefile devel_ports/games/linux-nwnclie= nt/Makefile --- ports/games/linux-nwnclient/Makefile=09Tue Mar 1 22:51:32 2005 +++ devel_ports/games/linux-nwnclient/Makefile=09Thu Apr 7 15:49:57 2005 @@ -23,6 +23,7 @@ NO_BUILD=3D=09yes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes NWNDATADIR=3D=09${LOCALBASE}/share/nwndata PLIST_SUB+=3D=09NWNVERSION=3D"${PORTVERSION:S/.//}" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/linux-nwserver/Makefile devel_ports/games/linux-nwserver= /Makefile --- ports/games/linux-nwserver/Makefile=09Tue Mar 1 22:51:32 2005 +++ devel_ports/games/linux-nwserver/Makefile=09Thu Apr 7 16:59:18 2005 @@ -16,14 +16,13 @@ MAINTAINER=3D=09apeiron@coitusmentis.info COMMENT=3D=09Neverwinter Nights Linux (x86) Dedicated Server -USE_LINUX?=3D=09yes -NO_BUILD=3D=09yes +USE_LINUX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 WRKSRC=3D=09=09${WRKDIR} -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D +do-build: +=09${BRANDELF} -t Linux ${WRKDIR}/fixinstall +=09${BRANDELF} -t Linux ${WRKDIR}/nwserver do-install: =09${INSTALL_PROGRAM} ${WRKDIR}/fixinstall ${PREFIX}/bin diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/linux-q3ademo/Makefile devel_ports/games/linux-q3ademo/M= akefile --- ports/games/linux-q3ademo/Makefile=09Tue Mar 1 22:51:32 2005 +++ devel_ports/games/linux-q3ademo/Makefile=09Thu Apr 7 16:59:49 2005 @@ -21,8 +21,9 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09Linux 3d shooter from id Software / Loki Software (demo versi= on) -PREFIX?=3D=09${X11BASE} USE_GL=3D=09=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes .include @@ -32,9 +33,6 @@ RUN_DEPENDS +=3D=09${LINUXBASE}/lib/libGL.so:${PORTSDIR}/graphics/linux_gl= x .endif -# Linux binary should not be stripped by INSTALL_PROGRAM as it uses /usr/b= in/strip which then brands the binary as a FreeBSD ELF one. -STRIP=3D - .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) IGNORE=3D=09=09may not be automatically fetched due to licensing\ =09=09restrictions. You MUST manually fetch the Linux version from:\ @@ -63,6 +61,8 @@ =09@${ECHO_CMD} "quake=3D\"./q3demo\"" >> ${WRKSRC}/q3demo =09@${ECHO_CMD} "\""$$"quake\" "$$"*" >> ${WRKSRC}/q3demo =09@${ECHO_CMD} "exit "$$"?" >> ${WRKSRC}/q3demo +=09@${BRANDELF} -t Linux ${WRKSRC}/bin/x86/glibc-2.0/q3ded +=09@${BRANDELF} -t Linux ${WRKSRC}/bin/x86/glibc-2.0/q3demo do-install: =09${INSTALL_PROGRAM} ${WRKSRC}/q3demo ${PREFIX}/bin diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/linux-spheresofchaos-demo/Makefile devel_ports/games/lin= ux-spheresofchaos-demo/Makefile --- ports/games/linux-spheresofchaos-demo/Makefile=09Tue Mar 1 22:51:32 20= 05 +++ devel_ports/games/linux-spheresofchaos-demo/Makefile=09Thu Apr 7 15:50= :22 2005 @@ -21,6 +21,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/li= nux-sdl12 USE_ZIP=3D=09yes +USE_LINUX=3D=09yes NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/linux-steam/Makefile devel_ports/games/linux-steam/Makef= ile --- ports/games/linux-steam/Makefile=09Tue Mar 1 22:51:33 2005 +++ devel_ports/games/linux-steam/Makefile=09Thu Apr 7 15:49:22 2005 @@ -18,6 +18,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/li= nux-XFree86-libs IS_INTERACTIVE=3D=09yes +USE_LINUX=3D=09yes PKGMESSAGE=3D=09${WRKDIR}/pkg-message INSTALLDIR?=3D=09steam diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/q3server/Makefile devel_ports/games/q3server/Makefile --- ports/games/q3server/Makefile=09Tue Mar 1 22:51:33 2005 +++ devel_ports/games/q3server/Makefile=09Thu Apr 7 15:46:56 2005 @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_PERL5=3D=09yes NO_CDROM=3D=09"Size; the data set is much too big" NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/rt2-demo/Makefile devel_ports/games/rt2-demo/Makefile --- ports/games/rt2-demo/Makefile=09Tue Mar 1 22:51:33 2005 +++ devel_ports/games/rt2-demo/Makefile=09Thu Apr 7 15:47:03 2005 @@ -19,7 +19,7 @@ NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes do-install: =09=09@${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/rtcw/Makefile devel_ports/games/rtcw/Makefile --- ports/games/rtcw/Makefile=09Tue Mar 1 22:51:33 2005 +++ devel_ports/games/rtcw/Makefile=09Thu Apr 7 15:47:14 2005 @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_CDROM=3D=09"Size; the data set is much too big" NO_BUILD=3D=09yes NO_WRKSUBDIR=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/rtcw-paks/Makefile devel_ports/games/rtcw-paks/Makefile --- ports/games/rtcw-paks/Makefile=09Tue Mar 1 22:51:33 2005 +++ devel_ports/games/rtcw-paks/Makefile=09Thu Apr 7 17:02:04 2005 @@ -18,17 +18,17 @@ MAINTAINER=3D=09nik@FreeBSD.org COMMENT=3D=09Return to Castle Wolfenstein for Linux .pk3 files -# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the +# Make this a BUILD_DEPENDs too, so that it can create the # directory hierarchy for us. BUILD_DEPENDS=3D=09${PREFIX}/usr/games/rtcw/wolf.x86:${PORTSDIR}/games/rtc= w +RUN_DEPENDS=3D=09${BUILD_DEPENDS} ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes EXTRACT_ONLY=3D=09# Don't extract anything -STRIP=3D -GAMEDIR=3D=09${PREFIX}/usr/games/rtcw/ +GAMEDIR=3D=09${PREFIX}/games/rtcw/ .include @@ -41,6 +41,7 @@ # Do nothing for the build. Don't set NO_BUILD because of the earlier # BUILD_DEPENDS do-build: +=09@${DO_NADA} do-install: =09${MKDIR} -p ${GAMEDIR}/main diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/ssamtse/Makefile devel_ports/games/ssamtse/Makefile --- ports/games/ssamtse/Makefile=09Tue Mar 1 22:51:34 2005 +++ devel_ports/games/ssamtse/Makefile=09Thu Apr 7 17:13:53 2005 @@ -16,11 +16,10 @@ MAINTAINER=3D=09asa@gascom.ru COMMENT=3D=09Serious Sam - The Second Encounter -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - NO_BUILD=3D=09yes USE_BZIP2=3D=09yes USE_REINPLACE=3D=09yes +USE_LINUX=3D=09yes USE_X_PREFIX=3D=09yes USE_GL=3D=09=09yes INSTALLS_SHLIB=3D=09yes @@ -59,6 +58,7 @@ =09@${SED} 's|%SSAMDIR%|${SSAMDIR}|g' ${PKGDIR}/pkg-message > ${PKGMESSAGE= } do-install: +# XXX: this is missing "${BRANDELF} -t Linux " =09@${MKDIR} ${SSAMDIR} =09@${TAR} --bzip2 -C ${SSAMDIR} -xf \ =09=09${WRKDIR}/ssam/bins.tar.bz2 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/stvef-paks/Makefile devel_ports/games/stvef-paks/Makefil= e --- ports/games/stvef-paks/Makefile=09Tue Mar 1 22:51:34 2005 +++ devel_ports/games/stvef-paks/Makefile=09Thu Apr 7 17:03:42 2005 @@ -17,17 +17,17 @@ MAINTAINER=3D=09nik@FreeBSD.org COMMENT=3D=09Star Trek Voyager: Elite Forces dedicated server for Linux .p= k3 files -# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the +# Make this a BUILD_DEPENDS too, so that it can create the # directory hierarchy for us. BUILD_DEPENDS=3D=09${PREFIX}/usr/games/stvef/linuxstvefded_1.2-static:${PO= RTSDIR}/games/stvef-server +RUN_DEPENDS=3D=09${BUILD_DEPENDS} ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes EXTRACT_ONLY=3D=09# Don't extract anything -STRIP=3D -GAMEDIR=3D=09${PREFIX}/usr/games/stvef/ +GAMEDIR=3D=09${PREFIX}/games/stvef/ .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/stvef-server/Makefile devel_ports/games/stvef-server/Mak= efile --- ports/games/stvef-server/Makefile=09Tue Mar 1 22:51:34 2005 +++ devel_ports/games/stvef-server/Makefile=09Thu Apr 7 17:04:59 2005 @@ -17,19 +17,21 @@ ONLY_FOR_ARCHS=3D=09i386 USE_ZIP=3D=09yes -USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes -NO_BUILD=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/Linux -STRIP=3D INSTALL_DIR=3D=09${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 LDCONFIG_LINUX=3D=09${LINUXBASE}/sbin/ldconfig -GAMEDIR=3D=09${PREFIX}/usr/games/stvef/ +GAMEDIR=3D=09${PREFIX}/games/stvef/ # files which should be installed with executables perms EXECUTABLES=3D=09linuxstvefded_1.2-static linuxstvefded_1.2-glibc2.1.3 + +de-build: +=09${BRANDELF} -t Linux ${WRKSRC}/linuxstvefded_1.2-static +=09${BRANDELF} -t Linux ${WRKSRC}/linuxstvefded_1.2-glibc2.1.3 do-install: =09${MKDIR} ${GAMEDIR} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/utserver/Makefile devel_ports/games/utserver/Makefile --- ports/games/utserver/Makefile=09Sun Mar 27 04:16:32 2005 +++ devel_ports/games/utserver/Makefile=09Thu Apr 7 15:47:49 2005 @@ -23,6 +23,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3D=09yes +USE_LINUX=3D=09yes USE_PERL5=3D=09yes NO_CDROM=3D=09"Size; the data set is much too big" NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/games/utserver-to/Makefile devel_ports/games/utserver-to/Makef= ile --- ports/games/utserver-to/Makefile=09Sat Mar 26 21:12:01 2005 +++ devel_ports/games/utserver-to/Makefile=09Thu Apr 7 17:10:01 2005 @@ -22,13 +22,12 @@ MAINTAINER?=3D=09pat@FreeBSD.org COMMENT?=3D=09Unreal Tournament mod Tactical Ops full server package for L= inux -RUN_DEPENDS=3D=09${LINUXBASE}/usr/games/ut-server/System/ucc-bin:${UTSERVE= R_PORT} +RUN_DEPENDS=3D=09${LOCALBASE}/games/ut-server/System/ucc-bin:${UTSERVER_PO= RT} BROKEN=3D=09=09Unfetchable ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_PERL5=3D=09yes NO_CDROM=3D=09"Size; the data set is much too big" NO_BUILD=3D=09yes @@ -43,13 +42,8 @@ .ifndef(DO_USE_WRKSUBDIR) NO_WRKSUBDIR=3D=09yes .endif -.if defined(DO_USE_STRIP) && exists(${LINUXBASE}/usr/bin/strip) -STRIP=3D=09${LINUXBASE}/usr/bin/strip -.else -STRIP=3D -.endif -UTDIR=3D=09=09usr/games/ut-server/ +UTDIR=3D=09=09games/ut-server/ PLIST_SUB+=3D=09UTDIR=3D"${UTDIR}" INSTALL_DIR=3D=09${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} @@ -84,6 +78,7 @@ # Contributed by do-install: install-parse-plist install-scripts +# XXX: this is missing a ${BRANDELF} -t Linux install-parse-plist: generate-plist =09@${PERL} -e 'open(FHANDLER,"${TMPPLIST}");' \ =09=09-e 'open(FDIR,">${WRKDIR}/dirs.sh.tmp");' \ diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/german/citrix_ica/Makefile devel_ports/german/citrix_ica/Makef= ile --- ports/german/citrix_ica/Makefile=09Tue Mar 1 22:51:34 2005 +++ devel_ports/german/citrix_ica/Makefile=09Thu Apr 7 15:50:39 2005 @@ -23,6 +23,7 @@ NO_WRKSUBDIR=3D=09Yes NO_BUILD=3D Yes +USE_LINUX=3D=09yes CDIR=3D=09${PREFIX}/ICAClient BINDIR=3D=09=09${PREFIX}/bin diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/german/staroffice5/Makefile devel_ports/german/staroffice5/Mak= efile --- ports/german/staroffice5/Makefile=09Tue Mar 1 22:51:35 2005 +++ devel_ports/german/staroffice5/Makefile=09Thu Apr 7 15:50:52 2005 @@ -25,6 +25,7 @@ NO_LATEST_LINK=3D=09yes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes NO_CDROM=3D=09'Sie muessen StarOffice manuell via WWW-Interface herunterla= den.' IS_INTERACTIVE=3D=09yes EXTRACT_ONLY=3D=09${DISTNAME}${EXTRACT_SUFX} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/german/staroffice52/Makefile devel_ports/german/staroffice52/M= akefile --- ports/german/staroffice52/Makefile=09Tue Mar 1 22:51:35 2005 +++ devel_ports/german/staroffice52/Makefile=09Thu Apr 7 15:51:05 2005 @@ -35,6 +35,7 @@ NO_LATEST_LINK=3D=09yes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes NO_CDROM=3D=09'Sie muessen StarOffice manuell via WWW-Interface herunterla= den.' CD_MOUNTPT=3D=09'/cdrom' IS_INTERACTIVE=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/german/staroffice70/Makefile devel_ports/german/staroffice70/M= akefile --- ports/german/staroffice70/Makefile=09Tue Mar 1 22:51:35 2005 +++ devel_ports/german/staroffice70/Makefile=09Thu Apr 7 15:51:15 2005 @@ -37,6 +37,7 @@ IS_INTERACTIVE=3D=09yes NO_BUILD=3D=09yes +USE_LINUX=3D=09yes SOVERSION=3D=09${PORTNAME}${PORTVERSION} WRKSRC=3D=09=09${WRKDIR}/${SOVERSION} TMPDIR=3D=09=09${WRKDIR}/tmp diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux-ac3d/Makefile devel_ports/graphics/linux-ac3d/M= akefile --- ports/graphics/linux-ac3d/Makefile=09Tue Mar 15 21:40:18 2005 +++ devel_ports/graphics/linux-ac3d/Makefile=09Thu Apr 7 17:16:34 2005 @@ -16,19 +16,20 @@ MAINTAINER=3D=09ip@doom.homeunix.org COMMENT=3D=09Easy to use and powerful 3D graphics modeller (trial version) -.ifdef(INSTALL_DYNLINKED_VERSION) -LIB_DEPENDS=3D=09${LINUXBASE}/usr/libGLU.so.1:${PORTSDIR}/graphics/linux_m= esa3 -.endif -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs \ +RUN_DEPENDS=3D=09\ =09=09${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \ =09=09${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png10 \ =09=09${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff +.ifdef(INSTALL_DYNLINKED_VERSION) +RUN_DEPENDS+=3D=09${LINUXBASE}/usr/libGLU.so.1:${PORTSDIR}/graphics/linux_= mesa3 +.endif RESTRICTED=3D=09"no distribution permitted" NO_CDROM=3D=09${RESTRICTED} -NO_BUILD=3D=09yes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/${PORTNAME}lx SUB_FILES=3D=09pkg-message @@ -44,10 +45,6 @@ PROGRAM=3D=09${PORTNAME} .endif -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D - .ifndef(INSTALL_DYNLINKED_VERSION) pre-everything:: =09@${ECHO_MSG} 'Define INSTALL_DYNLINKED_VERSION=3Dyes to install' @@ -56,6 +53,9 @@ =09@${ECHO_MSG} 'It may be useful with hardware accellerated MesaGL' =09@${ECHO_MSG} '' .endif + +do-build: +=09${BRANDELF} -t Linux ${WRKSRC}/${PROGRAM} pre-install: # Generate startup script diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux-bmrt/Makefile devel_ports/graphics/linux-bmrt/M= akefile --- ports/graphics/linux-bmrt/Makefile=09Tue Mar 1 22:51:35 2005 +++ devel_ports/graphics/linux-bmrt/Makefile=09Thu Apr 7 17:17:47 2005 @@ -21,10 +21,7 @@ NO_BUILD=3D=09yes ONLY_FOR_ARCHS=3D=09i386 NO_CDROM=3D=09"See the License" - -# Linux binary should not be stripped by INSTALL_PROGRAM as it uses -# /usr/bin/strip which then brands the binary as a FreeBSD ELF one. -STRIP=3D +USE_LINUX=3D=09yes .include @@ -69,7 +66,7 @@ .endfor .for i in ${PROGRAM} =09${INSTALL_PROGRAM} ${WRKSRC}/bin/${i} ${PREFIX}/bin -=09/usr/bin/brandelf -t Linux ${PREFIX}/bin/${i} +=09${BRANDELF} -t Linux ${PREFIX}/bin/${i} .endfor post-install: diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux-gdk-pixbuf/Makefile devel_ports/graphics/linux-= gdk-pixbuf/Makefile --- ports/graphics/linux-gdk-pixbuf/Makefile=09Mon Apr 11 10:02:39 2005 +++ devel_ports/graphics/linux-gdk-pixbuf/Makefile=09Mon Apr 11 14:20:03 20= 05 @@ -24,11 +24,10 @@ CONFLICTS=3D=09linux-gtk2* USE_LINUX_PREFIX=3Dyes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 DIST_SUBDIR=3D=09rpm NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3Dyes PLIST_SUB=3D=09VERSION=3D${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} # Set the version of Fedora Core diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux-libmng/Makefile devel_ports/graphics/linux-libm= ng/Makefile --- ports/graphics/linux-libmng/Makefile=09Mon Apr 11 10:02:40 2005 +++ devel_ports/graphics/linux-libmng/Makefile=09Mon Apr 11 14:24:33 2005 @@ -22,13 +22,12 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/l= inux-jpeg BASEVERSION=3D=098.0 -USE_LINUX_RPM=3D=09yes +USE_LINUX=3D=09yes USE_LINUX_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 DIST_SUBDIR=3D=09rpm -NO_BUILD=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes +NO_BUILD=3D=09yes PLIST?=3D=09=09${PKGDIR}/pkg-plist.${ARCH} MD5_FILE?=3D=09${MASTERDIR}/distinfo.${ARCH} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux-panorama-tools/Makefile devel_ports/graphics/li= nux-panorama-tools/Makefile --- ports/graphics/linux-panorama-tools/Makefile=09Sat Mar 26 21:02:26 2005 +++ devel_ports/graphics/linux-panorama-tools/Makefile=09Thu Apr 7 15:53:2= 8 2005 @@ -29,6 +29,7 @@ BROKEN=3D=09=09Broken dependency NO_BUILD=3D=09yes +USE_LINUX=3D=09yes WRKSRC=3D=09${WRKDIR}/PTLinux PROGRAM=3D=09Helpers/PTStitcher diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux-sdl_image/Makefile devel_ports/graphics/linux-s= dl_image/Makefile --- ports/graphics/linux-sdl_image/Makefile=09Mon Apr 11 10:02:42 2005 +++ devel_ports/graphics/linux-sdl_image/Makefile=09Mon Apr 11 14:20:03 200= 5 @@ -21,13 +21,13 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/li= nux-sdl12 BUILD_DEPENDS=3D=09rpm:${PORTSDIR}/archivers/rpm +USE_LINUX=3D=09=09yes USE_LINUX_PREFIX=3D=09yes LDCONFIG_LINUX=3D=09${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS=3D=09i386 DIST_SUBDIR=3D=09rpm NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3D=09yes DBPATH=3D=09=09/var/lib/rpm RPMFLAGS=3D=09--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux_dri/Makefile devel_ports/graphics/linux_dri/Mak= efile --- ports/graphics/linux_dri/Makefile=09Tue Mar 1 22:51:36 2005 +++ devel_ports/graphics/linux_dri/Makefile=09Thu Apr 7 17:19:22 2005 @@ -20,19 +20,17 @@ MAINTAINER=3D=09freebsd-emulation@FreeBSD.org COMMENT=3D=09Binary Linux DRI libraries for 3D hardware acceleration of li= nux apps -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/li= nux-XFree86-libs - WRKSRC=3D=09=09${WRKDIR}/lib NO_BUILD=3D=09yes +USE_LINUX=3D=09yes USE_LINUX_PREFIX=3D=09yes +USE_XLIB=3D=09yes ONLY_FOR_ARCHS=3D=09i386 MODULELIST=3D=09gamma_dri.so i810_dri.so i830_dri.so mga_dri.so r128_dri.s= o \ =09=09r200_dri.so radeon_dri.so tdfx_dri.so LDCONFIG_LINUX=3D=09${LINUXBASE}/sbin/ldconfig -NO_FILTER_SHLIBS=3D=09yes -STRIP=3D do-install: =09${MKDIR} ${PREFIX}/usr/X11R6/lib/modules/dri @@ -49,7 +47,9 @@ =09${LN} -sf libglide3-v5.so.0 ${PREFIX}/usr/X11R6/lib/libglide3-v5.so =09${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/libglut.so.3.7.0 ${PREFIX}= /usr/X11R6/lib =09${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/gears ${PREFIX}/usr/X11R6/= bin +=09${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/bin/gears =09${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/glxinfo ${PREFIX}/usr/X11R= 6/bin +=09${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/bin/glxinfo post-install: =09@${LDCONFIG_LINUX} ${PREFIX}/usr/X11R6/lib diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/graphics/linux_glide/Makefile devel_ports/graphics/linux_glide= /Makefile --- ports/graphics/linux_glide/Makefile=09Tue Mar 1 22:51:36 2005 +++ devel_ports/graphics/linux_glide/Makefile=09Thu Apr 7 15:52:09 2005 @@ -22,7 +22,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3Dyes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_MTREE=3D=09yes NO_BUILD=3D=09yes WRKSRC=3D=09=09${WRKDIR}/Glide2.4 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/japanese/slimeforest/Makefile devel_ports/japanese/slimeforest= /Makefile --- ports/japanese/slimeforest/Makefile=09Thu Mar 3 08:59:29 2005 +++ devel_ports/japanese/slimeforest/Makefile=09Thu Apr 7 15:53:59 2005 @@ -18,6 +18,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0:${PORTSDIR}/gr= aphics/linux-sdl_image NO_BUILD=3D=09yes +USE_LINUX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/slimeforest FIND_DIRS=3D=09=09-type d \! -empty diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-blackdown-jdk12/Makefile devel_ports/java/linux-bla= ckdown-jdk12/Makefile --- ports/java/linux-blackdown-jdk12/Makefile=09Tue Mar 1 22:51:37 2005 +++ devel_ports/java/linux-blackdown-jdk12/Makefile=09Thu Apr 7 15:54:21 2= 005 @@ -28,6 +28,7 @@ ONLY_FOR_ARCHS=3D=09i386 amd64 USE_BZIP2=3D=09YES +USE_LINUX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/${PORTNAME}${PORTVERSION} NO_BUILD=3D=09YES APP_HOME?=3D=09${PREFIX}/${PKGBASE}${PORTVERSION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-blackdown-jdk13/Makefile devel_ports/java/linux-bla= ckdown-jdk13/Makefile --- ports/java/linux-blackdown-jdk13/Makefile=09Tue Mar 1 22:51:37 2005 +++ devel_ports/java/linux-blackdown-jdk13/Makefile=09Thu Apr 7 15:54:51 2= 005 @@ -28,6 +28,7 @@ PLIST_SUB+=3D=09T=3D${APP_HOME:S/^${PREFIX}\///} NO_BUILD=3D=09yes +USE_LINUX=3D=09yes LATEST_LINK=3D=09linux-blackdown-jdk13 ONLY_FOR_ARCHS=3D=09i386 amd64 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-blackdown-jdk14/Makefile devel_ports/java/linux-bla= ckdown-jdk14/Makefile --- ports/java/linux-blackdown-jdk14/Makefile=09Tue Mar 1 22:51:37 2005 +++ devel_ports/java/linux-blackdown-jdk14/Makefile=09Thu Apr 7 15:55:13 2= 005 @@ -25,6 +25,7 @@ EXTRACT_BEFORE_ARGS=3D=09+564 EXTRACT_AFTER_ARGS=3D=09| ${BZIP2_CMD} -dc | ${TAR} xf - USE_BZIP2=3D=09yes +USE_LINUX=3D=09yes LATEST_LINK=3D=09linux-blackdown-jdk14 WRKSRC=3D=09=09${WRKDIR}/j2sdk${PORTVERSION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-blackdown-jre11/Makefile devel_ports/java/linux-bla= ckdown-jre11/Makefile --- ports/java/linux-blackdown-jre11/Makefile=09Tue Mar 1 22:51:37 2005 +++ devel_ports/java/linux-blackdown-jre11/Makefile=09Thu Apr 7 15:56:42 2= 005 @@ -29,6 +29,7 @@ ONLY_FOR_ARCHS=3D=09i386 amd64 USE_BZIP2=3D=09YES +USE_LINUX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/jre118_v3 JRE_VERSION=3D=091.1.8 PLIST_SUB+=3D=09JRE_VERSION=3D${JRE_VERSION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-ibm-jdk13/Makefile devel_ports/java/linux-ibm-jdk13= /Makefile --- ports/java/linux-ibm-jdk13/Makefile=09Tue Mar 1 22:51:37 2005 +++ devel_ports/java/linux-ibm-jdk13/Makefile=09Thu Apr 7 17:20:49 2005 @@ -26,6 +26,7 @@ PLIST_SUB+=3D=09T=3D${APP_HOME:S/^${PREFIX}\///} NO_BUILD=3D=09yes +USE_LINUX=3D=09yes JDK_VERSION=3D=091.3.1 LATEST_LINK=3D=09linux-ibm-jdk13 ONLY_FOR_ARCHS=3D=09i386 amd64 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-ibm-jdk14/Makefile devel_ports/java/linux-ibm-jdk14= /Makefile --- ports/java/linux-ibm-jdk14/Makefile=09Tue Mar 1 22:51:37 2005 +++ devel_ports/java/linux-ibm-jdk14/Makefile=09Thu Apr 7 15:55:52 2005 @@ -28,6 +28,7 @@ NO_BUILD=3D=09yes USE_REINPLACE=3D=09yes +USE_LINUX=3D=09yes JDK_VERSION=3D=091.4.2 ONLY_FOR_ARCHS=3D=09i386 amd64 APP_HOME?=3D=09${PREFIX}/${PKGBASE}${PORTVERSION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-sun-jdk12/Makefile devel_ports/java/linux-sun-jdk12= /Makefile --- ports/java/linux-sun-jdk12/Makefile=09Tue Mar 1 22:51:38 2005 +++ devel_ports/java/linux-sun-jdk12/Makefile=09Thu Apr 7 15:56:04 2005 @@ -24,6 +24,7 @@ LATEST_LINK=3D=09linux-sun-jdk12 NO_BUILD=3D=09yes +USE_LINUX=3D=09yes JDK_VERSION=3D=091.2.2.017 ONLY_FOR_ARCHS=3D=09i386 amd64 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-sun-jdk13/Makefile devel_ports/java/linux-sun-jdk13= /Makefile --- ports/java/linux-sun-jdk13/Makefile=09Tue Mar 1 22:51:38 2005 +++ devel_ports/java/linux-sun-jdk13/Makefile=09Thu Apr 7 15:56:14 2005 @@ -30,6 +30,7 @@ =09=09JDK_VERSION=3D${JDK_VERSION} NO_BUILD=3D=09yes +USE_LINUX=3D=09yes JDK_VERSION=3D=091.3.1 JDK_REVISION=3D=0914 ONLY_FOR_ARCHS=3D=09i386 amd64 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-sun-jdk14/Makefile devel_ports/java/linux-sun-jdk14= /Makefile --- ports/java/linux-sun-jdk14/Makefile=09Tue Mar 1 22:51:38 2005 +++ devel_ports/java/linux-sun-jdk14/Makefile=09Thu Apr 7 15:56:30 2005 @@ -30,6 +30,7 @@ PKGINSTALL=3D=09${WRKDIR}/pkg-install NO_BUILD=3D=09yes +USE_LINUX=3D=09yes JDK_VERSION=3D=091.4.2 JDK_REVISION=3D=0907 DL_JDK_VERSION=3D=09${JDK_VERSION}_${JDK_REVISION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/java/linux-sun-jdk15/Makefile devel_ports/java/linux-sun-jdk15= /Makefile --- ports/java/linux-sun-jdk15/Makefile=09Mon Apr 4 21:55:10 2005 +++ devel_ports/java/linux-sun-jdk15/Makefile=09Thu Apr 7 15:56:53 2005 @@ -30,6 +30,7 @@ PKGINSTALL=3D=09${WRKDIR}/pkg-install NO_BUILD=3D=09yes +USE_LINUX=3D=09yes JDK_VERSION=3D=091.5.0 JDK_REVISION=3D=0902 DL_JDK_VERSION=3D=09${JDK_VERSION}_${JDK_REVISION} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/korean/linux_locale/Makefile devel_ports/korean/linux_locale/M= akefile --- ports/korean/linux_locale/Makefile=09Tue Mar 1 22:51:38 2005 +++ devel_ports/korean/linux_locale/Makefile=09Thu Apr 7 17:21:16 2005 @@ -19,13 +19,11 @@ ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=098=09# BUILD_DEPENDS is hardcoded, so we hardcode here too USE_LINUX_PREFIX=3Dyes -USE_LINUX?=3D=09yes -NO_MTREE=3D=09yes NO_BUILD=3D=09yes EXTRACT_ONLY=3D=09# empty NO_WRKSUBDIR=3D=09yes -NO_FILTER_SHLIBS=3D=09yes do-install: =09@zcat ${DISTDIR}/${DISTNAME}.tar.gz |(cd ${PREFIX}; ${PAX} -r) diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/compaq-cc/Makefile devel_ports/lang/compaq-cc/Makefile --- ports/lang/compaq-cc/Makefile=09Tue Mar 1 22:51:39 2005 +++ devel_ports/lang/compaq-cc/Makefile=09Thu Apr 7 17:21:30 2005 @@ -40,9 +40,7 @@ EXTRACT_ONLY=3D NO_WRKSUBDIR=3D=09=09yes NO_BUILD=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes -NO_MTREE=3D=09=09yes -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=097 .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/freetxl/Makefile devel_ports/lang/freetxl/Makefile --- ports/lang/freetxl/Makefile=09Tue Mar 1 22:51:39 2005 +++ devel_ports/lang/freetxl/Makefile=09Thu Apr 7 17:27:02 2005 @@ -14,14 +14,18 @@ MAINTAINER=3D=09ryan@sasknow.com COMMENT=3D=09The TXL Programming Language (transformation by example) -USE_LINUX?=3D=09yes -STRIP=3D -NO_BUILD=3D=09yes +USE_LINUX=3D=09yes MAN1=3D=09=09txl.1 txlc.1 txldb.1 txlp.1 PORTDOCS=3D=0900README.txt COPYRIGHT.txt Documents.html Examples.html \ =09=09FILES.txt Learning.html Support.html + +do-build: +=09${BRANDELF} -t Linux ${WRKSRC}/bin/txl \ + ${WRKSRC}/bin/txlc \ + ${WRKSRC}/bin/txldb \ + ${WRKSRC}/bin/txlp do-install: =09${INSTALL_PROGRAM} \ diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/icc/Makefile devel_ports/lang/icc/Makefile --- ports/lang/icc/Makefile=09Sun Mar 6 16:08:25 2005 +++ devel_ports/lang/icc/Makefile=09Thu Apr 7 17:24:41 2005 @@ -18,7 +18,7 @@ DISTFILES=3D=09${DISTNAME}${EXTRACT_SUFX} .if ${PORTVERSION} !=3D ${PATCHLEVEL} DISTFILES+=3D=09${DISTNAME}_${PATCHLEVEL}${EXTRACT_SUFX} -PATCH_DEPENDS=3D=09=09${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators= /linux_base-8 +PATCH_DEPENDS=3D=09=09${DEFAULT_LINUX_BASE} .endif EXTRACT_DEPENDS=3D=09rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio @@ -30,9 +30,8 @@ ONLY_FOR_ARCHS=3D=09=09i386 CONFLICTS=3D=09=09linux_devtools* -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=09yes USE_REINPLACE=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes COMPILERDIR=3D=09intel_cc_80 PLIST_SUB=3D=09COMPILERDIR=3D${COMPILERDIR} @@ -219,7 +218,8 @@ =09@${CC} ${CFLAGS} -o \ =09=09${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld \ =09=09${FILESDIR}/ld.c -=09@${STRIP_CMD} ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld +# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one= . +=09@/usr/bin/strip ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld =09@${CHMOD} 755 ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld # Make ICC happy with regards to crtbegin.o, crtend.o and libgcc.a which i= t # expects to find in GXX_ROOT. diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/icc7/Makefile devel_ports/lang/icc7/Makefile --- ports/lang/icc7/Makefile=09Tue Mar 1 22:51:39 2005 +++ devel_ports/lang/icc7/Makefile=09Thu Apr 7 17:28:08 2005 @@ -25,10 +25,9 @@ ONLY_FOR_ARCHS=3D=09=09i386 CONFLICTS=3D=09=09linux_devtools* ifc* -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=09yes USE_REINPLACE=3D=09=09yes NO_WRKSUBDIR=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes COMPILERDIR=3D=09compiler70 PLIST_SUB=3D=09COMPILERDIR=3D${COMPILERDIR} @@ -160,7 +159,8 @@ =09@${CC} ${CFLAGS} -o \ =09=09${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld \ =09=09${FILESDIR}/ld.c -=09@${STRIP_CMD} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld +# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one= . +=09@/usr/bin/strip ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/l= d =09@${CHMOD} 755 ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld do-install: diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/ifc/Makefile devel_ports/lang/ifc/Makefile --- ports/lang/ifc/Makefile=09Tue Mar 1 22:51:39 2005 +++ devel_ports/lang/ifc/Makefile=09Thu Apr 7 17:25:53 2005 @@ -18,8 +18,7 @@ DISTFILES=3D=09${DISTNAME}${EXTRACT_SUFX} .if ${PORTVERSION} !=3D ${PATCHLEVEL} DISTFILES+=3D=09${DISTNAME}_${PATCHLEVEL}${EXTRACT_SUFX} -#PATCH_DEPENDS=3D=09=09${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulato= rs/linux_base -PATCH_DEPENDS=3D=09=09${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators= /linux_base-8 +PATCH_DEPENDS=3D=09=09${DEFAULT_LINUX_BASE} .endif EXTRACT_DEPENDS=3D=09rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio @@ -31,7 +30,7 @@ ONLY_FOR_ARCHS=3D=09=09i386 CONFLICTS=3D=09=09linux_devtools* -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=09yes USE_REINPLACE=3D=09=09yes NO_FILTER_SHLIBS=3D=09yes @@ -192,7 +191,8 @@ =09@${CC} ${CFLAGS} -o \ =09=09${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld \ =09=09${FILESDIR}/ld.c -=09@${STRIP_CMD} ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld +# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one= . +=09@/usr/bin/strip ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld =09@${CHMOD} 755 ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld do-install: diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/ifc7/Makefile devel_ports/lang/ifc7/Makefile --- ports/lang/ifc7/Makefile=09Tue Mar 1 22:51:39 2005 +++ devel_ports/lang/ifc7/Makefile=09Thu Apr 7 17:28:52 2005 @@ -24,10 +24,9 @@ ONLY_FOR_ARCHS=3D=09=09i386 -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=09yes USE_REINPLACE=3D=09=09yes NO_WRKSUBDIR=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes COMPILERDIR=3D=09compiler70 PLIST_SUB=3D=09COMPILERDIR=3D${COMPILERDIR} @@ -158,7 +157,8 @@ =09@${CC} ${CFLAGS} -o \ =09=09${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld \ =09=09${FILESDIR}/ld.c -=09@${STRIP_CMD} ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld +# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one= . +=09@/usr/bin/strip ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/l= d =09@${CHMOD} 755 ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ldwrapper/ld do-install: diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/linux-j/Makefile devel_ports/lang/linux-j/Makefile --- ports/lang/linux-j/Makefile=09Fri Apr 8 20:50:42 2005 +++ devel_ports/lang/linux-j/Makefile=09Sun Apr 10 15:34:54 2005 @@ -18,7 +18,7 @@ BROKEN=3D=09=09Unfetchable -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_JAVA=3D=091.3+ ONLY_FOR_ARCHS=3D i386 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/lang/visualworks/Makefile devel_ports/lang/visualworks/Makefil= e --- ports/lang/visualworks/Makefile=09Tue Mar 1 22:51:40 2005 +++ devel_ports/lang/visualworks/Makefile=09Thu Apr 7 15:59:53 2005 @@ -18,7 +18,7 @@ MAINTAINER=3D=09=09chris@chrisburkert.de COMMENT=3D=09=09A high performance Smalltalk environment -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=09yes ONLY_FOR_ARCHS=3D=09=09i386 NO_BUILD=3D=09=09yes PLIST_FILES=3D=09=09bin/visual diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/mail/mulberry/Makefile devel_ports/mail/mulberry/Makefile --- ports/mail/mulberry/Makefile=09Tue Mar 1 22:51:40 2005 +++ devel_ports/mail/mulberry/Makefile=09Thu Apr 7 16:00:28 2005 @@ -22,6 +22,7 @@ NO_BUILD=3D=09yes NO_WRKSUBDIR=3D=09yes +USE_LINUX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/math/linux-dislin/Makefile devel_ports/math/linux-dislin/Makef= ile --- ports/math/linux-dislin/Makefile=09Mon Apr 11 10:03:18 2005 +++ devel_ports/math/linux-dislin/Makefile=09Mon Apr 11 14:20:07 2005 @@ -17,13 +17,12 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09A scientific data plotting package -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - BROKEN=3D=09=09Unfetchable ONLY_FOR_ARCHS=3D=09i386 alpha +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes NO_BUILD=3D=09yes -INSTALLS_SHLIB=3D=09yes LDCONFIG_DIRS=3D=09${DISLIN_DIR}/lib MD5_FILE=3D=09${MASTERDIR}/distinfo.${ARCH} @@ -38,6 +37,8 @@ =09 <${FILESDIR}/dislin-wrapper.sh >${WRKDIR}/dislin.sh =09${SED} -e 's,%%DISLIN_DIR%%,${DISLIN_DIR},' \ =09 <${FILESDIR}/pkg-message >${WRKDIR}/pkg-message + +# XXX: this is missing "${BRANDELF} -t Linux " do-install: =09(cd ${WRKSRC} && ${ENV} DISLIN=3D${DISLIN_DIR} ${SH} INSTALL) diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/math/linux-relview/Makefile devel_ports/math/linux-relview/Mak= efile --- ports/math/linux-relview/Makefile=09Tue Mar 1 22:51:40 2005 +++ devel_ports/math/linux-relview/Makefile=09Thu Apr 7 17:29:21 2005 @@ -19,6 +19,8 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-tool= kits/linux-gtk ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes NO_WRKSUBDIR=3D=09yes EXTRACT_AFTER_ARGS=3D=09> ${DISTNAME} @@ -26,10 +28,6 @@ NO_BUILD=3D=09yes PLIST_SUB=3D=09VERSION=3D${PORTVERSION} - -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D=09# empty do-install: =09${BRANDELF} -t Linux ${WRKDIR}/${DISTNAME} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/math/mupad/Makefile devel_ports/math/mupad/Makefile --- ports/math/mupad/Makefile=09Sat Mar 19 16:19:58 2005 +++ devel_ports/math/mupad/Makefile=09Thu Apr 7 17:30:49 2005 @@ -20,11 +20,9 @@ NO_CDROM=3D=09"unsure to sell for profit" -USE_LINUX?=3D=09=09yes +USE_LINUX=3D=09=09yes ONLY_FOR_ARCHS=3D=09=09i386 -INSTALLS_SHLIB=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes NO_WRKSUBDIR=3D=09=09yes MAN1=3D=09=09mmg.1 mmgd.1 mupad.1 xmupad.1 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/math/wingz/Makefile devel_ports/math/wingz/Makefile --- ports/math/wingz/Makefile=09Tue Mar 1 22:51:41 2005 +++ devel_ports/math/wingz/Makefile=09Thu Apr 7 17:31:52 2005 @@ -16,12 +16,13 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09A Commercial Spreadsheet -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes NO_WRKSUBDIR=3D=09yes -USE_X_PREFIX=3D=09yes + +# XXX: this is missing "${BRANDELF} -t Linux " post-install: =09@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/math/wingz3/Makefile devel_ports/math/wingz3/Makefile --- ports/math/wingz3/Makefile=09Tue Mar 1 22:51:41 2005 +++ devel_ports/math/wingz3/Makefile=09Thu Apr 7 17:32:55 2005 @@ -15,13 +15,12 @@ MAINTAINER=3D=09mi@aldan.algebra.com COMMENT=3D=09A Commercial Spreadsheet -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - NO_PACKAGE=3D=09"nothing to build. commercial software" ONLY_FOR_ARCHS=3D=09i386 - +USE_LINUX=3D=09yes USE_X_PREFIX=3D=09yes + NO_BUILD=3D=09yes do-fetch: @@ -32,6 +31,8 @@ =09#=09http://www.wingz-us.com/iisg_main/downloads.html =09# download the ${DISTFILES} and save it to ${DISTDIR}. =09# + +# XXX: this is missing "${BRANDELF} -t Linux " do-install: =09${TAR} -xzp -C ${X11BASE} -f ${DISTDIR}/${DISTFILES} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/misc/ftree/Makefile devel_ports/misc/ftree/Makefile --- ports/misc/ftree/Makefile=09Tue Mar 1 22:51:41 2005 +++ devel_ports/misc/ftree/Makefile=09Thu Apr 7 17:35:18 2005 @@ -17,23 +17,18 @@ MAINTAINER=3D=09user@unknown.nu COMMENT=3D=09An X11 genealogy program -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - -USE_X_PREFIX=3D=09yes - ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes NO_CDROM=3D=09Non-commercial use only RESTRICTED=3D=09Non-commercial use only WRKSRC=3D=09=09${WRKDIR}/usr MAN1=3D=09=09ftree.1 -STRIP=3D=09=09# empty: do not strip linux binary! - -do-patch: -do-configure: do-build: =09${BRANDELF} -t Linux ${WRKSRC}/bin/ftree + do-install: =09${INSTALL_PROGRAM} ${WRKSRC}/bin/ftree ${PREFIX}/bin =09${INSTALL_MAN} ${WRKSRC}/share/man/man1/ftree.1 ${PREFIX}/man/man1 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/misc/linux-edonkey-tool-list/Makefile devel_ports/misc/linux-e= donkey-tool-list/Makefile --- ports/misc/linux-edonkey-tool-list/Makefile=09Sun Mar 13 02:18:38 2005 +++ devel_ports/misc/linux-edonkey-tool-list/Makefile=09Thu Apr 7 17:35:40= 2005 @@ -20,19 +20,10 @@ COMMENT=3D=09Creates a web page with ed2k:// links to all your shared file= s ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes PLIST_FILES=3D=09bin/edonkey-tool-list -STRIP=3D - -STRIP_CMD=3D=09${LINUXBASE}/usr/bin/strip - -.if exists(/usr/bin/brandelf) -BRANDELF?=3D=09/usr/bin/brandelf -.else -BRANDELF?=3D=09brandelf -.endif BINARY_NAME=3D=09${PORTNAME}${PKGNAMESUFFIX} @@ -45,9 +36,7 @@ .include pre-install: -.if exists(${STRIP_CMD}) =09@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME} -.endif =09@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME} .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/misc/linux-edonkey-tool-recovermet/Makefile devel_ports/misc/l= inux-edonkey-tool-recovermet/Makefile --- ports/misc/linux-edonkey-tool-recovermet/Makefile=09Sun Mar 13 02:18:38= 2005 +++ devel_ports/misc/linux-edonkey-tool-recovermet/Makefile=09Thu Apr 7 17= :35:55 2005 @@ -20,19 +20,10 @@ COMMENT=3D=09Tool that tries to re-create x.part.met files compromised due= to crash ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes PLIST_FILES=3D=09bin/edonkey-tool-recovermet -STRIP=3D - -STRIP_CMD=3D=09${LINUXBASE}/usr/bin/strip - -.if exists(/usr/bin/brandelf) -BRANDELF?=3D=09/usr/bin/brandelf -.else -BRANDELF?=3D=09brandelf -.endif BINARY_NAME=3D=09${PORTNAME}${PKGNAMESUFFIX} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/misc/linux-opengroupware/Makefile devel_ports/misc/linux-openg= roupware/Makefile --- ports/misc/linux-opengroupware/Makefile=09Mon Apr 11 10:03:23 2005 +++ devel_ports/misc/linux-opengroupware/Makefile=09Mon Apr 11 14:20:07 200= 5 @@ -22,7 +22,7 @@ COMMENT=3D=09Groupware package including mail, calendar, palm sync and muc= h more EXTRACT_DEPENDS=3D=09rpm2cpio:${PORTSDIR}/archivers/rpm -INSTALL_DEPENDS=3D=09${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \ +RUN_DEPENDS=3D=09${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \ =09=09${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql7 \ =09=09${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \ =09=09${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake @@ -105,7 +105,7 @@ NGOBJWEB_ADAPTOR=3D opengroupware.org-mod_ngobjweb-200407092000.tar.gz PATCHDIR?=3D=09${MASTERDIR}/files -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_GMAKE=3D=09yes MAKEFILE=3D=09${WRKSRC}/opengroupware.org-mod_ngobjweb/GNUmakefile BUILD_WRKSRC?=3D=09${WRKSRC}/opengroupware.org-mod_ngobjweb diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/misc/opencyc/Makefile devel_ports/misc/opencyc/Makefile --- ports/misc/opencyc/Makefile=09Tue Mar 1 22:51:42 2005 +++ devel_ports/misc/opencyc/Makefile=09Thu Apr 7 16:02:37 2005 @@ -19,6 +19,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs NO_BUILD=3D=09yes +USE_LINUX=3D=09yes PLIST_SUB=3D=09PORTVERSION=3D"${PORTVERSION}" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/multimedia/linux-divx4linux/Makefile devel_ports/multimedia/li= nux-divx4linux/Makefile --- ports/multimedia/linux-divx4linux/Makefile=09Tue Mar 1 22:51:42 2005 +++ devel_ports/multimedia/linux-divx4linux/Makefile=09Thu Apr 7 16:03:24 = 2005 @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_REINPLACE=3D=09yes USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes WRKSRC=3D=09${WRKDIR}/${PORTNAME}-${RELEASE_DATE} NO_BUILD=3D=09yes PLIST_SUB=3D=09PKGNAME=3D"${PKGNAME}" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/multimedia/linux-divx4linux4/Makefile devel_ports/multimedia/l= inux-divx4linux4/Makefile --- ports/multimedia/linux-divx4linux4/Makefile=09Tue Mar 1 22:51:42 2005 +++ devel_ports/multimedia/linux-divx4linux4/Makefile=09Thu Apr 7 16:03:30= 2005 @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=3D=09i386 USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes USE_REINPLACE=3D=09yes WRKSRC=3D=09${WRKDIR}/${DISTNAME:C/_.+$//} NO_BUILD=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/multimedia/linux-realplayer/Makefile devel_ports/multimedia/li= nux-realplayer/Makefile --- ports/multimedia/linux-realplayer/Makefile=09Sun Mar 20 23:18:14 2005 +++ devel_ports/multimedia/linux-realplayer/Makefile=09Thu Apr 7 17:37:03 = 2005 @@ -21,12 +21,9 @@ WRKSRC=3D=09=09${WRKDIR}/usr/local/RealPlayer ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes RESTRICTED=3D=09"Redistribution not allowed" NO_BUILD=3D=09yes - -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D RADIR=3D=09=09${PREFIX}/lib/RealPlayer PLUGINSDIR=3D=09${PREFIX}/lib/linux-mozilla/plugins diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/multimedia/linux-xmovie/Makefile devel_ports/multimedia/linux-= xmovie/Makefile --- ports/multimedia/linux-xmovie/Makefile=09Tue Mar 1 22:51:43 2005 +++ devel_ports/multimedia/linux-xmovie/Makefile=09Thu Apr 7 17:37:25 2005 @@ -19,22 +19,16 @@ COMMENT=3D=09A movie player for AVI, MPEG-2/4 and MOV movies EXTRACT_DEPENDS=3Drpm2cpio:${PORTSDIR}/archivers/rpm -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes EXTRACT_CMD=3D=09rpm2cpio EXTRACT_BEFORE_ARGS=3D EXTRACT_AFTER_ARGS=3D | ${CPIO} -id --quiet NO_BUILD=3D=09yes PLIST_FILES=3D=09bin/xmovie -USE_X_PREFIX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/usr/bin - -BRANDELF?=3D=09/usr/bin/brandelf - -# Linux binary should not be stripped by INSTALL_PROGRAM as it uses -# /usr/bin/strip which then brands the binary as a FreeBSD ELF one. -STRIP=3D pre-install: =09@${BRANDELF} -t Linux ${WRKSRC}/${PORTNAME} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/multimedia/mtv/Makefile devel_ports/multimedia/mtv/Makefile --- ports/multimedia/mtv/Makefile=09Tue Mar 1 22:51:43 2005 +++ devel_ports/multimedia/mtv/Makefile=09Thu Apr 7 17:39:04 2005 @@ -15,18 +15,19 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09High-performance MPEG video player (shareware) -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/li= nux-XFree86-libs - EXTRACT_ONLY=3D=09${PORTNAME}-${PORTVERSION}.tar.gz NO_PACKAGE=3D=09"No redistribution" NO_CDROM=3D=09"No redistribution" -NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3Dyes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/mtv MAN1=3D=09mtv.1 +do-build: +=09${BRANDELF} -t Linux ${WRKSRC}/mtv ${WRKSRC}/mtvp + do-install: =09@${MKDIR} ${WRKDIR}/libSDLx11 =09@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libSDLx11.so.tar.gz \ @@ -34,8 +35,8 @@ =09${INSTALL_DATA} ${WRKDIR}/libSDLx11/libSDLx11.so.0.9.9 \ =09=09${LINUXBASE}/usr/X11R6/lib =09${LINUXBASE}/sbin/ldconfig -=09${INSTALL_SCRIPT} ${WRKSRC}/mtv ${PREFIX}/bin -=09${INSTALL_SCRIPT} ${WRKSRC}/mtvp ${PREFIX}/bin +=09${INSTALL_PROGRAM} ${WRKSRC}/mtv ${PREFIX}/bin +=09${INSTALL_PROGRAM} ${WRKSRC}/mtvp ${PREFIX}/bin =09${INSTALL_MAN} ${WRKSRC}/mtv.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) =09@${MKDIR} ${PREFIX}/share/doc/mtv diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/multimedia/netshow/Makefile devel_ports/multimedia/netshow/Mak= efile --- ports/multimedia/netshow/Makefile=09Thu Mar 17 17:42:30 2005 +++ devel_ports/multimedia/netshow/Makefile=09Thu Apr 7 17:39:48 2005 @@ -16,16 +16,13 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09Microsoft NetShow video stream player -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - RESTRICTED=3D=09"Commercial software" BROKEN=3D=09=09Unfetchable ONLY_FOR_ARCHS=3D=09i386 -PLIST_FILES=3D=09bin/netshow - -NO_BUILD=3D=09yes +USE_LINUX=3D=09yes USE_X_PREFIX=3D=09yes +PLIST_FILES=3D=09bin/netshow pre-extract: =09@${MKDIR} ${WRKDIR} @@ -33,8 +30,8 @@ do-extract: =09${GUNZIP_CMD} < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/netsh= ow -do-patch: -=09brandelf -t Linux ${WRKDIR}/netshow +do-build: +=09${BRANDELF} -t Linux ${WRKDIR}/netshow do-install: =09${INSTALL} -c -o bin -g bin -m 555 ${WRKDIR}/netshow ${PREFIX}/bin/nets= how diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/aim/Makefile devel_ports/net/aim/Makefile --- ports/net/aim/Makefile=09Tue Mar 1 22:51:43 2005 +++ devel_ports/net/aim/Makefile=09Thu Apr 7 17:41:08 2005 @@ -19,15 +19,14 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-tool= kits/linux-gtk ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes -PREFIX?=3D=09${X11BASE} -INSTALLS_SHLIB=3D=09yes -# must not strip -STRIP=3D do-install: =09${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/aim ${PREFIX}/libexec +=09${BRANDELF} -t Linux ${PREFIX}/libexec =09(cd ${WRKSRC}/usr/lib;exec ${TAR} --exclude aim/source -cf - *)|(cd ${P= REFIX}/lib;exec ${TAR} -xpf -) =09@${ECHO_CMD} "#!/bin/sh" >${PREFIX}/bin/aim =09@${ECHO_CMD} "ulimit -Sc 0" >>${PREFIX}/bin/aim diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/citrix_ica/Makefile devel_ports/net/citrix_ica/Makefile --- ports/net/citrix_ica/Makefile=09Tue Mar 1 22:51:43 2005 +++ devel_ports/net/citrix_ica/Makefile=09Thu Apr 7 16:05:20 2005 @@ -18,6 +18,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXaw.so.6:${PORTSDIR}/x11/li= nux-XFree86-libs ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes RESTRICTED=3D=09"License prohibits redistribution" IS_INTERACTIVE=3D=09"Noisy license agreement ignores stdin" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/linux-agsatellite/Makefile devel_ports/net/linux-agsatelli= te/Makefile --- ports/net/linux-agsatellite/Makefile=09Thu Mar 10 23:10:02 2005 +++ devel_ports/net/linux-agsatellite/Makefile=09Thu Apr 7 17:41:32 2005 @@ -16,18 +16,15 @@ MAINTAINER=3D=09ports@FreeBSD.org COMMENT=3D=09Client that allows you to share your music on Audiogalaxy(TM) -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs - WRKSRC=3D=09${WRKDIR}/${DISTNAME:C/-.*//} NO_BUILD=3D=09yes USE_REINPLACE=3D=09yes -STRIP=3D +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes RESTRICTED=3D=09no response from developer on licensing issues DOCS=3D=09german_readme.txt license.txt readme.txt - -BRANDELF=3D=09/usr/bin/brandelf post-patch: =09@${REINPLACE_CMD} -e "s|=0D||;s|email|username|" ${WRKSRC}/*.txt diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/linux-edonkey-core/Makefile devel_ports/net/linux-edonkey-= core/Makefile --- ports/net/linux-edonkey-core/Makefile=09Sun Mar 13 02:21:03 2005 +++ devel_ports/net/linux-edonkey-core/Makefile=09Thu Apr 7 17:41:53 2005 @@ -19,18 +19,9 @@ COMMENT=3D=09eDonkey2000 'core' command line client ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes -STRIP=3D - -STRIP_CMD=3D=09${LINUXBASE}/usr/bin/strip - -.if exists(/usr/bin/brandelf) -BRANDELF?=3D=09/usr/bin/brandelf -.else -BRANDELF?=3D=09brandelf -.endif BINARY_NAME_OLD?=3D=09donkey${PORTVERSION} BINARY_NAME=3D=09donkey @@ -51,9 +42,7 @@ .include pre-install: -.if exists(${STRIP_CMD}) =09@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME_OLD} -.endif =09@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME_OLD} .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/linux-edonkey-server/Makefile devel_ports/net/linux-edonke= y-server/Makefile --- ports/net/linux-edonkey-server/Makefile=09Mon Apr 4 01:23:03 2005 +++ devel_ports/net/linux-edonkey-server/Makefile=09Thu Apr 7 17:42:39 200= 5 @@ -20,21 +20,12 @@ COMMENT=3D=09A decentralized peer-to-peer file-sharing server (eDonkey2000= server) ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_WRKSUBDIR=3D=09yes NO_BUILD=3D=09yes -STRIP=3D # PKGDEINSTALL=3D ${PKGINSTALL} -STRIP_CMD=3D=09${LINUXBASE}/usr/bin/strip - -.if exists(/usr/bin/brandelf) -BRANDELF?=3D=09/usr/bin/brandelf -.else -BRANDELF?=3D=09brandelf -.endif - BINARY_NAME=3D=09dserver RC_SAMPLE=3D=09edonkey2000-server.sh.sample @@ -57,9 +48,7 @@ .include pre-install: -.if exists(${STRIP_CMD}) =09@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME} -.endif =09@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME} .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/linux-jigdo/Makefile devel_ports/net/linux-jigdo/Makefile --- ports/net/linux-jigdo/Makefile=09Tue Mar 1 22:51:44 2005 +++ devel_ports/net/linux-jigdo/Makefile=09Thu Apr 7 17:43:04 2005 @@ -21,9 +21,8 @@ ONLY_FOR_ARCHS=3D=09i386 USE_BZIP2=3D=09YES -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_BUILD=3D=09yes -STRIP=3D PROGRAMS=3D=09jigdo-file SCRIPTS=3D=09jigdo-lite jigdo-mirror @@ -31,7 +30,7 @@ MAN1=3D=09=09jigdo-file.1 jigdo-lite.1 jigdo-mirror.1 pre-install: -=09@brandelf -t Linux ${WRKSRC}/jigdo-file +=09@${BRANDELF} -t Linux ${WRKSRC}/jigdo-file do-install: .for i in ${PROGRAMS} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/linux-nx-client/Makefile devel_ports/net/linux-nx-client/M= akefile --- ports/net/linux-nx-client/Makefile=09Tue Mar 1 22:51:44 2005 +++ devel_ports/net/linux-nx-client/Makefile=09Thu Apr 7 17:45:23 2005 @@ -17,18 +17,15 @@ RUN_DEPENDS=3D=09=09${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphic= s/linux-jpeg NO_WRKSUBDIR=3D=09=09yes -USE_X_PREFIX=3D=09=09yes ONLY_FOR_ARCHS=3D=09=09i386 +USE_LINUX=3D=09=09yes +USE_X_PREFIX=3D=09=09yes NO_BUILD=3D=09=09yes NXSRC=3D=09=09=09${WRKSRC}/NX NXDST=3D=09=09=09${PREFIX}/lib/linux-nx-client ICONS3232=3D=09=09nx.png nxclient-admin.png nxclient-wizard.png -# Linux binary should not be stripped by INSTALL_PROGRAM -# because as a side effect it brands the binary as FreeBSD. -STRIP=3D - PLIST_SUB+=3D=09=09PORTVERSION=3D${PORTVERSION} post-extract: @@ -67,6 +64,7 @@ =09${ECHO_CMD} "export NXDIR=3D${NXDST}" >> ${WRKSRC}/${f} =09${ECHO_CMD} "exec \$$NXDIR/bin/${f} \"\$$@\"" >> ${WRKSRC}/${f} =09${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin +=09${BRANDELF} -t Linux ${NXDST}/bin/${f} .endfor .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/linux-overnet-core/Makefile devel_ports/net/linux-overnet-= core/Makefile --- ports/net/linux-overnet-core/Makefile=09Tue Mar 1 22:51:45 2005 +++ devel_ports/net/linux-overnet-core/Makefile=09Thu Apr 7 17:45:36 2005 @@ -18,10 +18,9 @@ COMMENT=3D=09Overnet 'core' command line client ONLY_FOR_ARCHS=3D=09i386 -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_BUILD=3D=09yes NO_WRKSUBDIR=3D=09yes -STRIP=3D BINARY_NAME_OLD?=3D=09${PORTNAME}clc TARGET_DIR=3D=09${PORTNAME} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/peercast/Makefile devel_ports/net/peercast/Makefile --- ports/net/peercast/Makefile=09Tue Mar 1 22:51:45 2005 +++ devel_ports/net/peercast/Makefile=09Thu Apr 7 16:07:45 2005 @@ -15,7 +15,7 @@ MAINTAINER=3D=09jylefort@brutele.be COMMENT=3D=09A peer-to-peer network for broadcasting and listening to stre= ams -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes NO_WRKSUBDIR=3D=09yes do-build: diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/net/skype/Makefile devel_ports/net/skype/Makefile --- ports/net/skype/Makefile=09Sun Mar 6 14:33:41 2005 +++ devel_ports/net/skype/Makefile=09Thu Apr 7 17:43:27 2005 @@ -16,11 +16,11 @@ COMMENT=3D=09P2P VoIP software RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-f= onts/linux-fontconfig \ -=09=09${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat = \ -=09=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFr= ee86-libs +=09=09${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat USE_BZIP2=3D=09yes -PREFIX?=3D=09${X11BASE} +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WANT_GNOME=3D=09yes ONLY_FOR_ARCHS=3D=09i386 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/portuguese/staroffice52/Makefile devel_ports/portuguese/starof= fice52/Makefile --- ports/portuguese/staroffice52/Makefile=09Tue Mar 1 22:51:45 2005 +++ devel_ports/portuguese/staroffice52/Makefile=09Thu Apr 7 16:07:57 2005 @@ -31,6 +31,7 @@ FETCH_DEPENDS=3D=09${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_= base-8 ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes NO_CDROM=3D=09'Deve ser obtido diretamente do site da Sun via interface ww= w' CD_MOUNTPT=3D=09'/cdrom' IS_INTERACTIVE=3D=09yes diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/print/acroread/Makefile devel_ports/print/acroread/Makefile --- ports/print/acroread/Makefile=09Sun Mar 20 09:33:43 2005 +++ devel_ports/print/acroread/Makefile=09Thu Apr 7 17:46:45 2005 @@ -20,15 +20,14 @@ MAINTAINER=3D=09trevor@FreeBSD.org COMMENT=3D=09View, distribute and print PDF documents -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/li= nux-XFree86-libs - CONFLICTS=3D=09acroread7 ONLY_FOR_ARCHS=3D=09amd64 i386 USE_REINPLACE=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes NO_BUILD=3D=09yes REINPLACE_ARGS=3D=09-i '' -E -NO_FILTER_SHLIBS=3D=09yes PLIST_SUB=3D=09"ARCHDIR=3Dintellinux" WRKSRC=3D=09=09${WRKDIR}/installers diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/print/bjfiltercom/Makefile devel_ports/print/bjfiltercom/Makef= ile --- ports/print/bjfiltercom/Makefile=09Tue Mar 1 22:51:45 2005 +++ devel_ports/print/bjfiltercom/Makefile=09Thu Apr 7 17:49:24 2005 @@ -43,7 +43,7 @@ DESCR=3D=09=09${.CURDIR}/pkg-descr MD5_FILE=3D=09${.CURDIR}/distinfo ONLY_FOR_ARCHS=3D=09i386 -NO_FILTER_SHLIBS=3D=09yes +USE_LINUX=3D=09yes NO_MTREE=3D=09yes RPMREVISION=3D=091 .if defined(SLAVE_PORT) @@ -75,6 +75,8 @@ =09=09-e 's,%%PRMODEL%%,${PRMODEL},g' \ =09=09-e 's,%%PREFIX%%,${PREFIX},g' \ =09=09=09${FILESDIR}/setup > ${WRKDIR}/setup.freebsd + +# XXX: this is missing "${BRANDELF} -t Linux " do-install: =09${MKDIR} ${LINUXBASE}/usr/lib/bjlib diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/sysutils/linux-acu/Makefile devel_ports/sysutils/linux-acu/Mak= efile --- ports/sysutils/linux-acu/Makefile=09Tue Mar 1 22:51:46 2005 +++ devel_ports/sysutils/linux-acu/Makefile=09Thu Apr 7 17:50:42 2005 @@ -30,9 +30,9 @@ .endif ONLY_FOR_ARCHS=3D=09i386 -PREFIX?=3D=09${X11BASE} +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes NO_WRKSUBDIR=3D=09yes -NO_BUILD=3D=09yes NO_CDROM=3D=09"Redistribution not allowed" LINPROCFS!=3D=09/sbin/mount | ${GREP} linprocfs | ${AWK} '{print $1}' @@ -54,6 +54,9 @@ =09@${ECHO} "becauce acu needs to read ${LINUXBASE}/proc/aironet" =09@${FALSE} .endif + +do-build: +=09@${BRANDELF} -t Linux ${WRKSRC}/utilities/acu do-install: =09@${MKDIR} ${PREFIX}/bin diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/sysutils/linux-afaapps/Makefile devel_ports/sysutils/linux-afa= apps/Makefile --- ports/sysutils/linux-afaapps/Makefile=09Mon Apr 11 10:04:03 2005 +++ devel_ports/sysutils/linux-afaapps/Makefile=09Mon Apr 11 14:25:11 2005 @@ -26,12 +26,11 @@ NO_BUILD=3D=09=09yes NO_WRKSUBDIR=3D=09=09yes -USE_LINUX_PREFIX=3D=09yes -NO_MTREE=3D=09=09yes +USE_LINUX=3D=09=09yes +USE_LINUX_PREFIX=3D yes LDCONFIG_LINUX=3D=09=09${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS=3D=09=09i386 -NO_FILTER_SHLIBS=3D=09yes PLIST=3D=09=09=09${MASTERDIR}/pkg-plist.${ARCH} MD5_FILE=3D=09=09${MASTERDIR}/distinfo.${ARCH} @@ -43,8 +42,9 @@ do-install: =09@${LOCALBASE}/bin/rpm -U ${RPMFLAGS} ${WRKDIR}/${RPMFILE} -=09@${RM} ${LINUXBASE}/usr/sbin/afacli -=09@${MV} ${LINUXBASE}/usr/sbin/afacli.bin ${LINUXBASE}/usr/sbin/afacli +=09@${RM} ${PREFIX}/usr/sbin/afacli +=09@${MV} ${PREFIX}/usr/sbin/afacli.bin ${PREFIX}/usr/sbin/afacli +=09@${BRANDELF} -t Linux ${PREFIX}/usr/sbin/afacli =09@${LDCONFIG_LINUX} .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/textproc/linux-aspell/Makefile devel_ports/textproc/linux-aspe= ll/Makefile --- ports/textproc/linux-aspell/Makefile=09Tue Mar 1 22:51:46 2005 +++ devel_ports/textproc/linux-aspell/Makefile=09Thu Apr 7 17:52:30 2005 @@ -27,10 +27,9 @@ NO_BUILD=3D=09=09yes USE_REINPLACE=3D=09=09yes ONLY_FOR_ARCHS=3D=09=09i386 +USE_LINUX=3D=09=09yes USE_LINUX_PREFIX=3D=09yes -USE_LINUX?=3D=09=09yes USE_GMAKE=3D=09=09yes -NO_FILTER_SHLIBS=3D=09yes LDCONFIG_LINUX=3D=09=09${LINUXBASE}/sbin/ldconfig DBPATH=3D=09=09/var/lib/rpm diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/textproc/pocketreader/Makefile devel_ports/textproc/pocketread= er/Makefile --- ports/textproc/pocketreader/Makefile=09Tue Mar 1 22:51:46 2005 +++ devel_ports/textproc/pocketreader/Makefile=09Thu Apr 7 16:10:46 2005 @@ -16,14 +16,14 @@ MAINTAINER=3D=09simond@irrelevant.org COMMENT=3D=09Siemens PocketReader -USE_LINUX?=3D=09YES +USE_LINUX=3D=09YES NO_BUILD=3D=09YES PLIST_FILES=3D=09bin/pocketreader WRKSRC=3D=09=09${WRKDIR}/linux do-install: -=09brandelf -t Linux ${WRKSRC}/installfiles/pocketreader_static +=09${BRANDELF} -t Linux ${WRKSRC}/installfiles/pocketreader_static =09${CP} ${WRKSRC}/installfiles/pocketreader_static ${PREFIX}/bin/pocketre= ader .include diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/aswedit/Makefile devel_ports/www/aswedit/Makefile --- ports/www/aswedit/Makefile=09Tue Mar 1 22:51:46 2005 +++ devel_ports/www/aswedit/Makefile=09Thu Apr 7 16:11:14 2005 @@ -21,6 +21,7 @@ NO_BUILD=3D=09yes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/asWedit-4.0.1 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-beonex/Makefile devel_ports/www/linux-beonex/Makefil= e --- ports/www/linux-beonex/Makefile=09Tue Mar 1 22:51:46 2005 +++ devel_ports/www/linux-beonex/Makefile=09Thu Apr 7 17:55:56 2005 @@ -26,14 +26,13 @@ =09${LINUXBASE}/usr/lib/libpng.so.2.1.0.16:${PORTSDIR}/graphics/linux-png1= 0 \ =09${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk -NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3Dyes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes PATCHFILES=3D=09linux-beonex-generated-files-${PORTVERSION}.tar.bz2 PKGMESSAGE=3D=09${WRKDIR}/pkg-message PLIST=3D=09=09${WRKDIR}/pkg-plist USE_BZIP2=3D=09yes -PREFIX?=3D=09${X11BASE} WRKSRC=3D=09=09${WRKDIR}/beonex-comm post-extract: @@ -55,6 +54,9 @@ =09=09${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null" \ =09=09=09>>${WRKDIR}/linkfarm .endfor + +do-build: +=09${BRANDELF} -t Linux ${WRKSRC}/lib/linux-beonex/beonex-comm pre-install: =09${ECHO_CMD} bin/linux-beonex > ${PLIST} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-firefox/Makefile devel_ports/www/linux-firefox/Makef= ile --- ports/www/linux-firefox/Makefile=09Fri Mar 11 11:12:08 2005 +++ devel_ports/www/linux-firefox/Makefile=09Thu Apr 7 18:01:46 2005 @@ -17,16 +17,13 @@ COMMENT=3D Web browser branched from Mozilla RUN_DEPENDS?=3D \ -${LINUXBASE}/usr/lib/libstdc++.so.5:${PORTSDIR}/emulators/linux_base-8 \ ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gt= k2 \ ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \ ${LINUXBASE}/usr/lib/libpangoxft-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-p= ango\ ${LINUXBASE}/usr/lib/libgobject-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \ -${LINUXBASE}${X11BASE}/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs = \ ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontco= nfig NO_BUILD=3D yes -NO_FILTER_SHLIBS=3Dyes ONLY_FOR_ARCHS=3Di386 FIREFOX_NAME=3D ${PKGNAMEPREFIX}${PORTNAME} DESCR=3D ${.CURDIR}/pkg-descr @@ -34,7 +31,6 @@ PKGMESSAGE=3D ${WRKDIR}/pkg-message PLIST=3D ${WRKDIR}/pkg-plist USE_LINUX=3D yes -USE_XLIB=3D yes USE_X_PREFIX=3D yes WRKSRC=3D ${WRKDIR}/firefox diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-flashplugin/Makefile devel_ports/www/linux-flashplug= in/Makefile --- ports/www/linux-flashplugin/Makefile=09Tue Mar 1 22:51:47 2005 +++ devel_ports/www/linux-flashplugin/Makefile=09Thu Apr 7 16:11:51 2005 @@ -24,6 +24,7 @@ RESTRICTED=3D=09"Redistribution not allowed" NO_BUILD=3D=09yes +USE_LINUX=3D=09yes WRKSRC=3D=09=09${WRKDIR}/flash_linux LATEST_LINK=3D=09flash5 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-flashplugin6/Makefile devel_ports/www/linux-flashplu= gin6/Makefile --- ports/www/linux-flashplugin6/Makefile=09Tue Mar 1 22:51:47 2005 +++ devel_ports/www/linux-flashplugin6/Makefile=09Thu Apr 7 16:12:08 2005 @@ -20,6 +20,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes RESTRICTED=3D=09"Redistribution not allowed" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-flashplugin7/Makefile devel_ports/www/linux-flashplu= gin7/Makefile --- ports/www/linux-flashplugin7/Makefile=09Tue Mar 1 22:51:47 2005 +++ devel_ports/www/linux-flashplugin7/Makefile=09Thu Apr 7 16:13:12 2005 @@ -20,6 +20,7 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes RESTRICTED=3D=09"Redistribution not allowed" diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-mozilla/Makefile devel_ports/www/linux-mozilla/Makef= ile --- ports/www/linux-mozilla/Makefile=09Tue Mar 1 22:51:47 2005 +++ devel_ports/www/linux-mozilla/Makefile=09Thu Apr 7 17:59:32 2005 @@ -20,11 +20,10 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-tool= kits/linux-gtk -NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3D=09yes ONLY_FOR_ARCHS=3D=09i386 -PREFIX?=3D=09${X11BASE} USE_ZIP=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09${WRKDIR}/xpi INSTALL_DIR=3D=09${PREFIX}/lib/linux-mozilla PKGMESSAGE=3D=09${WRKDIR}/pkg-message @@ -87,6 +86,9 @@ =09${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null" \ =09=09>> ${WRKDIR}/linkfarm .endfor + +do-build: +=09${BRANDELF} -t Linux ${WRKSRC}/bin/mozilla pre-install: =09${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-mozilla-devel/Makefile devel_ports/www/linux-mozilla= -devel/Makefile --- ports/www/linux-mozilla-devel/Makefile=09Tue Mar 1 22:51:47 2005 +++ devel_ports/www/linux-mozilla-devel/Makefile=09Thu Apr 7 17:59:58 2005 @@ -22,11 +22,10 @@ RUN_DEPENDS=3D=09${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-tool= kits/linux-gtk -NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3D=09yes ONLY_FOR_ARCHS=3D=09i386 -PREFIX?=3D=09${X11BASE} USE_ZIP=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes WRKSRC=3D=09${WRKDIR}/xpi INSTALL_DIR=3D=09linux-mozilla-devel FULL_INSTALL_DIR=3D=09${PREFIX}/lib/linux-mozilla-devel @@ -87,6 +86,9 @@ =09${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"=09>>${WRKDI= R}/linkfarm =09${ECHO_CMD} -n "${FIND} ../../linux-beonex/plugins"=09>>${WRKDIR}/linkf= arm =09${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"=09>>${WRKDI= R}/linkfarm + +do-build: +=09${BRANDELF} -t ${WRKSRC}/bin/mozilla pre-install: =09${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-mozillafirebird/Makefile devel_ports/www/linux-mozil= lafirebird/Makefile --- ports/www/linux-mozillafirebird/Makefile=09Sat Mar 26 20:37:32 2005 +++ devel_ports/www/linux-mozillafirebird/Makefile=09Thu Apr 7 18:00:52 20= 05 @@ -23,14 +23,14 @@ BROKEN=3D=09=09Incorrect pkg-plist NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3Dyes ONLY_FOR_ARCHS=3D=09i386 +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes FIREBIRD_NAME=3D=09${PKGNAMEPREFIX}${PORTNAME} DESCR=3D=09=09${.CURDIR}/pkg-descr MD5_FILE=3D=09${.CURDIR}/distinfo PKGMESSAGE=3D=09${WRKDIR}/pkg-message PLIST=3D=09=09${WRKDIR}/pkg-plist -PREFIX?=3D=09${X11BASE} WRKSRC=3D=09=09${WRKDIR}/MozillaFirebird do-patch: diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/linux-opera/Makefile devel_ports/www/linux-opera/Makefile --- ports/www/linux-opera/Makefile=09Sun Feb 20 23:22:27 2005 +++ devel_ports/www/linux-opera/Makefile=09Fri Apr 8 10:57:08 2005 @@ -25,21 +25,20 @@ MAINTAINER=3D=09mezz@FreeBSD.org COMMENT=3D=09A blazingly fast, full-featured, standards-compliant browser -RUN_DEPENDS=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x1= 1/linux-XFree86-libs \ +RUN_DEPENDS=3D=09\ =09=09${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspe= ll \ =09=09${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3:${PORTSDIR}/x11-toolkits/l= inux-openmotif RESTRICTED=3D=09"not redistributable; commercial software" -PREFIX?=3D=09${X11BASE} USE_BZIP2=3D=09yes WANT_GNOME=3D=09yes -WITH_LINUX=3D=09yes +USE_LINUX=3D=09yes USE_REINPLACE=3D=09yes +USE_X_PREFIX=3D=09yes ONLY_FOR_ARCHS=3D=09i386 NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3Dyes OPERA_VER=3D=097.54 OPERA_DATE=3D=0920050131 diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/www/netscape7/Makefile devel_ports/www/netscape7/Makefile --- ports/www/netscape7/Makefile=09Sat Mar 26 21:09:41 2005 +++ devel_ports/www/netscape7/Makefile=09Thu Apr 7 18:01:21 2005 @@ -28,12 +28,12 @@ MAJ?=3D=09=09netscape7 NETSCAPE_LANG?=3Denglish NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3D=09yes ONLY_FOR_ARCHS=3D=09i386 RESTRICTED=3D=09"no redistribution" NO_CDROM=3D=09${RESTRICTED} -PREFIX?=3D=09${X11BASE} USE_ZIP=3D=09yes +USE_LINUX=3D=09yes +USE_X_PREFIX=3D=09yes VER?=3D=09=09${PORTVERSION} WRKSRC=3D=09${WRKDIR}/netscape-installer/xpi INSTALL_DIR=3D=09lib/linux-${MAJ}-${NETSCAPE_LANG} diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/x11/linux-XFree86-libs/Makefile devel_ports/x11/linux-XFree86-= libs/Makefile --- ports/x11/linux-XFree86-libs/Makefile=09Tue Mar 1 22:51:48 2005 +++ devel_ports/x11/linux-XFree86-libs/Makefile=09Thu Apr 7 18:02:45 2005 @@ -27,9 +27,9 @@ CONFLICTS=3D=09linux_base-6* linux_base-7* linux_base-deb* USE_LINUX_PREFIX=3Dyes +USE_LINUX=3D=09yes MD5_FILE=3D=09${MASTERDIR}/distinfo.i386 NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3D=09yes ONLY_FOR_ARCHS=3D=09amd64 i386 PKGINSTALL=3D=09${WRKDIR}/pkg-install PLIST=3D=09=09${WRKDIR}/plist diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/x11/nvidia-driver/Makefile devel_ports/x11/nvidia-driver/Makef= ile --- ports/x11/nvidia-driver/Makefile=09Tue Mar 1 22:51:48 2005 +++ devel_ports/x11/nvidia-driver/Makefile=09Thu Apr 7 16:14:24 2005 @@ -41,7 +41,7 @@ =09=09LINUXBASE=3D${LINUXBASE} NVVERSION=3D${NVVERSION} .if !defined(WITHOUT_LINUX) -USE_LINUX?=3D=09yes +USE_LINUX=3D=09yes RUN_DEPENDS+=3D=09${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x= 11/linux-XFree86-libs PLIST_SUB+=3D=09LINUX=3D"" .else diff -ruHdN --exclude INDEX* --exclude CVS --exclude packages --exclude dis= tfiles ports/x11-toolkits/linux-gtk/Makefile devel_ports/x11-toolkits/linux= -gtk/Makefile --- ports/x11-toolkits/linux-gtk/Makefile=09Tue Mar 1 22:51:48 2005 +++ devel_ports/x11-toolkits/linux-gtk/Makefile=09Thu Apr 7 18:03:23 2005 @@ -23,6 +23,7 @@ ONLY_FOR_ARCHS?=3D=09i386 alpha amd64 +USE_LINUX=3D=09=09yes USE_LINUX_PREFIX=3D=09yes .include @@ -34,7 +35,6 @@ DIST_SUBDIR?=3D=09rpm EXTRACT_ONLY=3D NO_BUILD=3D=09yes -NO_FILTER_SHLIBS=3D=09yes PLIST?=3D=09=09${PKGDIR}/pkg-plist.${ARCH} MD5_FILE?=3D=09${MASTERDIR}/distinfo.${ARCH} --=_6apxqruzpe4o-- From owner-freebsd-emulation@FreeBSD.ORG Tue Apr 12 16:19:40 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1F4916A4CE for ; Tue, 12 Apr 2005 16:19:40 +0000 (GMT) Received: from mail.soaustin.net (mail.soaustin.net [207.200.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDDE143D53 for ; Tue, 12 Apr 2005 16:19:40 +0000 (GMT) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id 63D7D14987; Tue, 12 Apr 2005 11:19:40 -0500 (CDT) Date: Tue, 12 Apr 2005 11:19:40 -0500 (CDT) From: Mark Linimon X-X-Sender: linimon@pancho To: Alexander Leidinger In-Reply-To: <20050411175736.mabpo9me4g4cwc4g@netchild.homeip.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: freebsd-emulation@FreeBSD.org Subject: Re: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 16:19:41 -0000 IMHO you should add an explanation of OVERRIDE_DEFAULT_LINUX_BASE to bsd.port.mk as well. I am still looking over the patch. mcl From owner-freebsd-emulation@FreeBSD.ORG Tue Apr 12 16:59:36 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1855416A4CE for ; Tue, 12 Apr 2005 16:59:36 +0000 (GMT) Received: from mail.soaustin.net (mail.soaustin.net [207.200.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEEF243D46 for ; Tue, 12 Apr 2005 16:59:35 +0000 (GMT) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id 3B4CB149CA; Tue, 12 Apr 2005 11:59:35 -0500 (CDT) Date: Tue, 12 Apr 2005 11:59:35 -0500 (CDT) From: Mark Linimon X-X-Sender: linimon@pancho To: Alexander Leidinger In-Reply-To: <20050411175736.mabpo9me4g4cwc4g@netchild.homeip.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: freebsd-emulation@FreeBSD.org Subject: Re: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 16:59:36 -0000 I am also still confused by the RUN_DEPENDS logic (some of this logic is in the current bsd.port.mk). In certain cases we depend on bin/sh to be the marker, in other cases etc/redhat-release. This seems inconsistent. I wonder if this would cause problems if trying to install different versions? This logic also assumes that anything that isn't a partial portname or '7' should be the default. This seems wrong. IMHO after the test for '7' should be a test for 'yes', which sets whatever is the current default (currently 8). Any other value should set IGNORE. e.g. if someone mistypes USE_LINUX=rh-7 they shouldn't silently get an install dependency on 8; instead, the installation should fail. (And either the test should be made sufficiently robust to accept 'y' and 'YES' which occur in 2 ports, or those 2 ports should be changed to set the value 'yes'). mcl From owner-freebsd-emulation@FreeBSD.ORG Tue Apr 12 23:37:57 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 022FD16A4CE for ; Tue, 12 Apr 2005 23:37:57 +0000 (GMT) Received: from smtp813.mail.sc5.yahoo.com (smtp813.mail.sc5.yahoo.com [66.163.170.83]) by mx1.FreeBSD.org (Postfix) with SMTP id C9DBE43D5F for ; Tue, 12 Apr 2005 23:37:56 +0000 (GMT) (envelope-from mhjacks@swbell.net) Received: from unknown (HELO anduril.minas.tirith) (mhjacks@swbell.net@65.67.72.193 with login) by smtp813.mail.sc5.yahoo.com with SMTP; 12 Apr 2005 23:37:56 -0000 Received: from localhost (unknown [127.0.0.1]) by anduril.minas.tirith (Postfix) with ESMTP id BDFFD685765 for ; Tue, 12 Apr 2005 23:37:54 +0000 (UTC) Received: from anduril.minas.tirith ([127.0.0.1]) by localhost (anduril [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26848-03 for ; Tue, 12 Apr 2005 18:37:54 -0500 (CDT) Received: from [192.168.1.192] (arwen.minas.tirith [192.168.1.192]) by anduril.minas.tirith (Postfix) with ESMTP id E3E02685764 for ; Tue, 12 Apr 2005 18:37:53 -0500 (CDT) Message-ID: <425C5BE1.6050900@swbell.net> Date: Tue, 12 Apr 2005 18:38:09 -0500 From: Martin Jackson User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-emulation@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at minas.tirith Subject: teamspeak problems on 5 (and, I've heard, on 6) X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 23:37:57 -0000 Hello, I'm running a vanilla x86 server running teamspeak (www.goteamspeak.com) for some friends for collaborative gaming. Teamspeak is a binary-only distribution with a Linux server and client (also Windows). There is a FreeBSD port of an earlier version of the Linux server. There have been some PR's about teamspeak not being able to listen on port 14534 (which is the Web administration interface for teamspeak). Apparently it works OK on 4, though I haven't tested it there. I have run it successfully on DragonFly 1.2, so I am hopeful that it would run on 4.11. When starting on 5, it complains of an unspecified error, and will be listening on udp/8767, but not on tcp/14534. Currently I am running Linux on my teamspeak server - I would rather run a BSD on it. (Specifically 5.3 or 5.4, or 5-STABLE). I believe that the problem is in the Linux emulation in FreeBSD post 4. (The linux_base port I ran it under in DragonFly was linux_base 8.0_6 from ports.) I am familiar with Unix; I've run Linux systems for a long time but am less familiar with BSD and its diagnostic tools. Would anyone on this list be able to help determine why this port is broken? I have a machine I can install any needed version of BSD on to test (4.11, 5.3, 5.4); if you can tell me what information you need from me I will do my best to provide it. Thanks, Marty From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 03:50:55 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 039A616A4CE; Wed, 13 Apr 2005 03:50:55 +0000 (GMT) Received: from aldan.algebra.com (aldan.algebra.com [216.254.65.224]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AD5843D48; Wed, 13 Apr 2005 03:50:54 +0000 (GMT) (envelope-from mi@corbulon.video-collage.com) Received: from corbulon.video-collage.com (static-151-204-231-237.bos.east.verizon.net [151.204.231.237]) by aldan.algebra.com (8.13.1/8.13.1) with ESMTP id j3D3opOK014634 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Apr 2005 23:50:53 -0400 (EDT) (envelope-from mi@corbulon.video-collage.com) Received: from corbulon.video-collage.com (mi@localhost.video-collage.com [127.0.0.1])j3D3ojn5043998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 12 Apr 2005 23:50:46 -0400 (EDT) (envelope-from mi@corbulon.video-collage.com) Received: (from mi@localhost)j3D3ojql043997; Tue, 12 Apr 2005 23:50:45 -0400 (EDT) (envelope-from mi) From: Mikhail Teterin Message-Id: <200504130350.j3D3ojql043997@corbulon.video-collage.com> To: emulation@FreeBSD.org Date: Tue, 12 Apr 2005 23:50:45 -0400 (EDT) X-Mailer: ELM [version 2.5 PL7] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamd / ClamAV version devel-20040615, clamav-milter version 0.73a on corbulon.video-collage.com X-Virus-Status: Clean X-Scanned-By: MIMEDefang 2.43 cc: amd64@FreeBSD.org Subject: forcing NVidia's driver for Linux/amd64 to work on FreeBSD/amd64 X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 03:50:55 -0000 Hello! Based on the x11/nvidia-driver port I compile the open-source bits of the FreeBSD-driver. I then link them with the binary-only piece from NVidia, which produces an nvidia.ko, that can be kldloaded to say: kernel: nvidia0: mem 0xe0000000-0xe7ffffff,0xfd000000-0xfdffffff irq 16 at device 0.0 on pci1 I then put the Linux version of nvidia_drv.o into X11BASE/lib/modules/drivers/ and try to start X using the same config file I used with this same card on my older Xeon system. The machine hangs solid -- the last things I see from the X-server are: [...] (II) Setting vga for screen 0. (**) NVIDIA(0): Depth 16, (--) framebuffer bpp 16 (==) NVIDIA(0): RGB weight 565 (==) NVIDIA(0): Default visual is TrueColor (==) NVIDIA(0): Using gamma correction (1.0, 1.0, 1.0) (**) NVIDIA(0): Option "TwinView" (**) NVIDIA(0): Option "TwinViewOrientation" "LeftOf" (**) NVIDIA(0): Option "MetaModes" "1600x1200,1600x1200" (==) NVIDIA(0): Using HW cursor (==) NVIDIA(0): Video key set to default value of 0x83e (**) NVIDIA(0): TwinView enabled (--) NVIDIA(0): Linear framebuffer at 0xE0000000 (--) NVIDIA(0): MMIO registers at 0xFD000000 Is mine a totally wrong method, or is there hope? Any suggestions? I just want my two screens to work again :-) Thanks! -mi From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 04:26:11 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B33B16A4CE; Wed, 13 Apr 2005 04:26:11 +0000 (GMT) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.FreeBSD.org (Postfix) with ESMTP id E565743D1F; Wed, 13 Apr 2005 04:26:10 +0000 (GMT) (envelope-from scottl@samsco.org) Received: from [192.168.254.11] (junior-wifi.samsco.home [192.168.254.11]) (authenticated bits=0) by pooker.samsco.org (8.13.1/8.13.1) with ESMTP id j3D4TGBb042055; Tue, 12 Apr 2005 22:29:16 -0600 (MDT) (envelope-from scottl@samsco.org) Message-ID: <425C9E9C.30501@samsco.org> Date: Tue, 12 Apr 2005 22:22:52 -0600 From: Scott Long User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.5) Gecko/20050218 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Mikhail Teterin References: <200504130350.j3D3ojql043997@corbulon.video-collage.com> In-Reply-To: <200504130350.j3D3ojql043997@corbulon.video-collage.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.8 required=3.8 tests=ALL_TRUSTED autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on pooker.samsco.org cc: emulation@freebsd.org cc: amd64@freebsd.org Subject: Re: forcing NVidia's driver for Linux/amd64 to work on FreeBSD/amd64 X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 04:26:11 -0000 Mikhail Teterin wrote: > Hello! > > Based on the x11/nvidia-driver port I compile the open-source bits of the FreeBSD-driver. > > I then link them with the binary-only piece from NVidia, which produces an nvidia.ko, that > can be kldloaded to say: > > kernel: nvidia0: mem 0xe0000000-0xe7ffffff,0xfd000000-0xfdffffff irq 16 at device 0.0 on pci1 > > I then put the Linux version of nvidia_drv.o into X11BASE/lib/modules/drivers/ and try to start X > using the same config file I used with this same card on my older Xeon system. > > > The machine hangs solid -- the last things I see from the X-server are: > > [...] > (II) Setting vga for screen 0. > (**) NVIDIA(0): Depth 16, (--) framebuffer bpp 16 > (==) NVIDIA(0): RGB weight 565 > (==) NVIDIA(0): Default visual is TrueColor > (==) NVIDIA(0): Using gamma correction (1.0, 1.0, 1.0) > (**) NVIDIA(0): Option "TwinView" > (**) NVIDIA(0): Option "TwinViewOrientation" "LeftOf" > (**) NVIDIA(0): Option "MetaModes" "1600x1200,1600x1200" > (==) NVIDIA(0): Using HW cursor > (==) NVIDIA(0): Video key set to default value of 0x83e > (**) NVIDIA(0): TwinView enabled > (--) NVIDIA(0): Linear framebuffer at 0xE0000000 > (--) NVIDIA(0): MMIO registers at 0xFD000000 > > Is mine a totally wrong method, or is there hope? Any suggestions? > > I just want my two screens to work again :-) > > Thanks! > > -mi The Linux driver is likely assuming that it can use the PAT extension of the CPU, but we don't support it (yet). Scott From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 10:00:37 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B4AF616A4D0 for ; Wed, 13 Apr 2005 10:00:37 +0000 (GMT) Received: from mailout05.sul.t-online.com (mailout05.sul.t-online.com [194.25.134.82]) by mx1.FreeBSD.org (Postfix) with ESMTP id 566FA43D1F for ; Wed, 13 Apr 2005 10:00:37 +0000 (GMT) (envelope-from Alexander@Leidinger.net) Received: from fwd19.aul.t-online.de by mailout05.sul.t-online.com with smtp id 1DLefj-00019B-01; Wed, 13 Apr 2005 12:00:35 +0200 Received: from Andro-Beta.Leidinger.net (SmYgkaZrwen4FpPNCDolWqxJTT89OT4E7Veqqb4Eiitdq3VajMk7rW@[84.128.203.188]) by fwd19.sul.t-online.de with esmtp id 1DLefT-0iYkN60; Wed, 13 Apr 2005 12:00:19 +0200 Received: from localhost (localhost [127.0.0.1])j3DA0Eko082313; Wed, 13 Apr 2005 12:00:14 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from 141.113.101.32 ([141.113.101.32]) by netchild.homeip.net (Horde MIME library) with HTTP for ; Wed, 13 Apr 2005 12:00:13 +0200 Message-ID: <20050413120013.g8zdqhspess40sw8@netchild.homeip.net> X-Priority: 3 (Normal) Date: Wed, 13 Apr 2005 12:00:13 +0200 From: Alexander Leidinger To: Mark Linimon References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.0.2) / FreeBSD-4.11 X-ID: SmYgkaZrwen4FpPNCDolWqxJTT89OT4E7Veqqb4Eiitdq3VajMk7rW@t-dialin.net X-TOI-MSGID: f3b7198d-329a-45e6-8d93-e98a192dd0d0 cc: freebsd-emulation@FreeBSD.org Subject: Re: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 10:00:37 -0000 Mark Linimon wrote: > IMHO you should add an explanation of OVERRIDE_DEFAULT_LINUX_BASE > to bsd.port.mk as well. Initially I didn't thought it belongs to bsd.port.mk. It's noting a port is allowed to set. If a port needs a different linux base, it should use USE_LINUX=foo. I thought it more belongs into ports(7). But I just looked up some variables from the man-page, and they are dokumented in bsd.port.mk, so I will add a description. > I am still looking over the patch. You may notice, that I haven't bumped any PORTREVISION yet... I like to do this before I commit the changes, since I have to verify them anyway then. I've also noticed that I may have to look at some plists, maybe I need to correct one or two. Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 In this world, truth can wait; she's used to it. From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 10:20:44 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16DB616A4CE for ; Wed, 13 Apr 2005 10:20:44 +0000 (GMT) Received: from mailout03.sul.t-online.com (mailout03.sul.t-online.com [194.25.134.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8020F43D41 for ; Wed, 13 Apr 2005 10:20:43 +0000 (GMT) (envelope-from Alexander@Leidinger.net) Received: from fwd33.aul.t-online.de by mailout03.sul.t-online.com with smtp id 1DLezC-0006oX-01; Wed, 13 Apr 2005 12:20:42 +0200 Received: from Andro-Beta.Leidinger.net (TtMJCeZL8eaUh0ZYSjImhdJVbGx1BKyE+55v9g2zBdAXMJZD+o9pUI@[84.128.203.188]) by fwd33.sul.t-online.de with esmtp id 1DLez9-0doW2a0; Wed, 13 Apr 2005 12:20:39 +0200 Received: from localhost (localhost [127.0.0.1])j3DAKYIv085241; Wed, 13 Apr 2005 12:20:34 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from 141.113.101.32 ([141.113.101.32]) by netchild.homeip.net (Horde MIME library) with HTTP for ; Wed, 13 Apr 2005 12:20:34 +0200 Message-ID: <20050413122034.0c3fsbwxusw0ss4w@netchild.homeip.net> X-Priority: 3 (Normal) Date: Wed, 13 Apr 2005 12:20:34 +0200 From: Alexander Leidinger To: Mark Linimon References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.0.2) / FreeBSD-4.11 X-ID: TtMJCeZL8eaUh0ZYSjImhdJVbGx1BKyE+55v9g2zBdAXMJZD+o9pUI@t-dialin.net X-TOI-MSGID: 7780583c-7aa8-4fdc-82bc-e2eec2a79d51 cc: freebsd-emulation@FreeBSD.org Subject: Re: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 10:20:44 -0000 Mark Linimon wrote: > I am also still confused by the RUN_DEPENDS logic (some of this logic > is in the current bsd.port.mk). > > In certain cases we depend on bin/sh to be the marker, in other cases > etc/redhat-release. This seems inconsistent. I wonder if this > would cause problems if trying to install different versions? /bin/sh would be the canonical dependency. I don't think the actual behavior results in problems. > This logic also assumes that anything that isn't a partial portname > or '7' should be the default. This seems wrong. IMHO after the > test for '7' should be a test for 'yes', which sets whatever is the > current default (currently 8). Any other value should set IGNORE. I did this because USE_LINUX was a trigger variable before. If set to any value (even "no"), it triggered a dependency to the default linux base. We have several of such trigger variables. I don't think we should change that (for USE_LINUX only). If you think that we should get rid of trigger variables, it should be done for all trigger variables at once. Personally I think we should fix up the docs to explain that "no" doesn't DTRT for those variables instead. Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 There was a young physicist named Fisk Whose lovemaking was rather brisk. So quick was his action, The Lorentz Contraction Shortened his rod to a disc !! From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 15:10:17 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B30BC16A4CE for ; Wed, 13 Apr 2005 15:10:17 +0000 (GMT) Received: from mail.soaustin.net (mail.soaustin.net [207.200.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 766E143D41 for ; Wed, 13 Apr 2005 15:10:17 +0000 (GMT) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id C4E6C149D0; Wed, 13 Apr 2005 10:10:16 -0500 (CDT) Date: Wed, 13 Apr 2005 10:10:16 -0500 (CDT) From: Mark Linimon X-X-Sender: linimon@pancho To: Alexander Leidinger In-Reply-To: <20050413122034.0c3fsbwxusw0ss4w@netchild.homeip.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Mark Linimon cc: freebsd-emulation@FreeBSD.org Subject: Re: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 15:10:17 -0000 On Wed, 13 Apr 2005, Alexander Leidinger wrote: > Mark Linimon wrote: > > > This logic also assumes that anything that isn't a partial portname > > or '7' should be the default. This seems wrong. IMHO after the > > test for '7' should be a test for 'yes', which sets whatever is the > > current default (currently 8). Any other value should set IGNORE. > > I did this because USE_LINUX was a trigger variable before. If set to any > value (even "no"), it triggered a dependency to the default linux base. It got changed not to be a pure trigger variable in 1.505, when the acceptable value '7' was added. Now we have the worst of both worlds. If it can have multiple values then we have to test for illegal values and reject them via IGNORE. Implicit in this is going and fixing the two current cases where the value is not 'yes'. Otherwise IMHO this is completely fragile. Again, consider what happens when someone sets 'USE_LINUX=rh-7' which they might reasonably expect to do since they can set it to 'rh-9'. It should fail, not silently give them RH 8. As well, I see this fragility as an opportunity to shoot ourselves in the foot when changing default versions in the future. mcl From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 15:43:34 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81BAC16A4CE for ; Wed, 13 Apr 2005 15:43:34 +0000 (GMT) Received: from mailout04.sul.t-online.com (mailout04.sul.t-online.com [194.25.134.18]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE9AD43D49 for ; Wed, 13 Apr 2005 15:43:33 +0000 (GMT) (envelope-from Alexander@Leidinger.net) Received: from fwd18.aul.t-online.de by mailout04.sul.t-online.com with smtp id 1DLk1c-00075d-01; Wed, 13 Apr 2005 17:43:32 +0200 Received: from Andro-Beta.Leidinger.net (ZwKBZaZdYevnznB+3sHJcpWphZ3795pKBeN1MCIkktjQmFzKHgqU8g@[84.128.203.188]) by fwd18.sul.t-online.de with esmtp id 1DLk1S-0o8Oqe0; Wed, 13 Apr 2005 17:43:22 +0200 Received: from localhost (localhost [127.0.0.1])j3DFhG6h032167; Wed, 13 Apr 2005 17:43:16 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from 141.113.101.32 ([141.113.101.32]) by netchild.homeip.net (Horde MIME library) with HTTP for ; Wed, 13 Apr 2005 17:43:16 +0200 Message-ID: <20050413174316.9sygl52600ksgo88@netchild.homeip.net> X-Priority: 3 (Normal) Date: Wed, 13 Apr 2005 17:43:16 +0200 From: Alexander Leidinger To: Mark Linimon References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.0.2) / FreeBSD-4.11 X-ID: ZwKBZaZdYevnznB+3sHJcpWphZ3795pKBeN1MCIkktjQmFzKHgqU8g@t-dialin.net X-TOI-MSGID: 16f84830-0e75-49d7-a381-ef2c0e508299 cc: freebsd-emulation@FreeBSD.org Subject: Re: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 15:43:34 -0000 Mark Linimon wrote: > It got changed not to be a pure trigger variable in 1.505, when the Yes, it's my mega-patch. I refered to it in my answer. > acceptable value '7' was added. Now we have the worst of both worlds. > If it can have multiple values then we have to test for illegal values > and reject them via IGNORE. Implicit in this is going and fixing the > two current cases where the value is not 'yes'. Otherwise IMHO this is > completely fragile. Again, consider what happens when someone sets > 'USE_LINUX=rh-7' which they might reasonably expect to do since they > can set it to 'rh-9'. It should fail, not silently give them RH 8. "rh-7" isn't allowed as per the documentation of USE_LINUX. > As well, I see this fragility as an opportunity to shoot ourselves in > the foot when changing default versions in the future. I see your point, but I think porters should be clever enough to know that they have to read the documentation. And the documentation explicitely says that the value has to match emulators/linux_base-. Since you're insisting on this functionality I will implement your suggestion (I assume you don't mind if I use "Requested by: portmgr (linimon)" in the commit)... maybe tomorrow. Because this change will need a fix to some ports too, I will add my complete patchset to the PR with the bsd.port.mk changes for extended testing on the cluster. Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 microReid /mi:'kroh-reed/ n. See microLenat. From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 15:52:11 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0214416A4CE for ; Wed, 13 Apr 2005 15:52:11 +0000 (GMT) Received: from mail.soaustin.net (mail.soaustin.net [207.200.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBECF43D41 for ; Wed, 13 Apr 2005 15:52:10 +0000 (GMT) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id 4AB1C149D2; Wed, 13 Apr 2005 10:52:10 -0500 (CDT) Date: Wed, 13 Apr 2005 10:52:10 -0500 (CDT) From: Mark Linimon X-X-Sender: linimon@pancho To: Alexander Leidinger In-Reply-To: <20050413174316.9sygl52600ksgo88@netchild.homeip.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Mark Linimon cc: freebsd-emulation@FreeBSD.org Subject: Re: RFC: cleanup of linux ports X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 15:52:11 -0000 On Wed, 13 Apr 2005, Alexander Leidinger wrote: > "rh-7" isn't allowed as per the documentation of USE_LINUX. The point that I am trying to make is that assuming that everyone will always use only allowed values (e.g. not make a typo) introduces an unneeded fragility. This is assuming they even read the documentation at all, or that if they do, they don't miss this. After being shot in the foot with this kind of bullet thousands of times over the years, I am quite sensitive to it :-) mcl From owner-freebsd-emulation@FreeBSD.ORG Wed Apr 13 20:35:34 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B65E116A4CE; Wed, 13 Apr 2005 20:35:34 +0000 (GMT) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD37D43D46; Wed, 13 Apr 2005 20:35:30 +0000 (GMT) (envelope-from jkim@niksun.com) Received: from [10.70.0.244] (daemon.mj.niksun.com [10.70.0.244]) by anuket.mj.niksun.com (8.13.1/8.12.11) with ESMTP id j3DKZSdT082440; Wed, 13 Apr 2005 16:35:29 -0400 (EDT) (envelope-from jkim@niksun.com) From: Jung-uk Kim Organization: Niksun, Inc. To: freebsd-amd64@freebsd.org, freebsd-emulation@freebsd.org Date: Wed, 13 Apr 2005 16:35:26 -0400 User-Agent: KMail/1.6.2 MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_OKYXC+kkn1fOkqy" Message-Id: <200504131635.26063.jkim@niksun.com> X-Virus-Scanned: ClamAV 0.83/826/Wed Apr 13 07:03:12 2005 on anuket.mj.niksun.com X-Virus-Status: Clean cc: Juergen Lock Subject: QEMU on FreeBSD/amd64 (patches) X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 20:35:34 -0000 --Boundary-00=_OKYXC+kkn1fOkqy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline I finally manage to build QEMU snapshot on FreeBSD/amd64 6-CURRENT. There's ports/emulators/qemu but it doesn't build on AMD64 for several reasons, i. e., QEMU and FreeBSD are both fast moving targets (esp. src/lib/msun), some long double math functions don't exist on FreeBSD, GCC in base system doesn't build QEMU because of several optimization bugs specific to AMD64, etc. 1. Install GCC 3.4 from ports. Anything newer than 20050316 should work. (Theoretically you can use gcc40 newer than 20041127 but not verified. Actually I am using patched version of src/contrib/gcc. ;-) 2. Install following dependencies from ports: devel/gmake (of course) net/samba devel/sdl12 I believe samba is optional but sdl12 is not. It doesn't work without SDL because `-nographic' option is broken. I believe it is an upstream bug (related to FreeBSD's pty or termios, i. e., fail to get correct term size and segfault) but I couldn't pin-point the culprit yet. In fact, I didn't bother too much because SDL worked just fine. ;-) 3. Get the latest QEMU source from: http://www.dad-answers.com/qemu/ The file name is something like qemu-snapshot-*.tar.bz2. 4. Extract the tarball, chdir to it, and do the following: mkdir -p bsd/amd64 patch -p0 < ${PATCHDIR}/qemu-snapshot-fbsd.diff patch -p0 < ${PATCHDIR}/qemu-libmath-amd64.diff ./configure -cc=${GCC_BIN} gmake gmake install ${PATCHDIR} is where the attached patches are saved and ${GCC_BIN} is gcc path, e. g., /usr/local/bin/gcc34 for GCC 3.4.4 and /usr/local/bin/gcc40 for GCC 4.0.0, etc. I was able to run DragonFly 1.2 CD-ROM on i386 emulation (qemu) and Mandrake Linux 10.2rc1 for amd64 on x86-64 emulation (qemu-system-x86-64). ppc (qemu-system-ppc) and sparc (qemu-system-sparc) emulators are not tested. Enjoy, Jung-uk Kim Note 1: The limitations of this patch should be the same from ports because large portion was taken from it: http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/emulators/qemu/pkg-message?rev=1.7&content-type=text/plain Note 2: qemu-libmath-amd64.diff contains C99 long double math functions taken from glibc-2.3.5 and modified for FreeBSD/amd64: http://ftp.gnu.org/gnu/glibc/ http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/?cvsroot=glibc rintl() sysdeps/i386/fpu/s_rintl.c atan2l() sysdeps/i386/fpu/e_atan2l.c sqrtl() sysdeps/i386/fpu/e_sqrtl.c llrintl() sysdeps/x86_64/fpu/s_llrintl.S lrintl() sysdeps/x86_64/fpu/s_llrintl.S sinl() sysdeps/x86_64/fpu/s_sinl.S cosl() sysdeps/x86_64/fpu/s_cosl.S tanl() sysdeps/x86_64/fpu/s_tanl.S logl() sysdeps/x86_64/fpu/e_logl.S powl() sysdeps/x86_64/fpu/e_powl.S remainderl() sysdeps/x86_64/fpu/e_remainderl.S Just enough to compile QEMU snapshot until we complete C99 project. ;-) Similarly you can add other architectures under bsd/${MACHINE_ARCH}. --Boundary-00=_OKYXC+kkn1fOkqy Content-Type: text/x-diff; charset="us-ascii"; name="qemu-libmath-amd64.diff" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="qemu-libmath-amd64.diff" diff -urN bsd.orig/Makefile bsd/Makefile --- bsd.orig/Makefile Wed Dec 31 19:00:00 1969 +++ bsd/Makefile Wed Apr 13 12:43:36 2005 @@ -0,0 +1,22 @@ +SRCS= ${MACHINE_ARCH}/e_atan2l.c \ + ${MACHINE_ARCH}/e_logl.S \ + ${MACHINE_ARCH}/e_powl.S \ + ${MACHINE_ARCH}/e_remainderl.S \ + ${MACHINE_ARCH}/e_sqrtl.c \ + ${MACHINE_ARCH}/s_cosl.S \ + ${MACHINE_ARCH}/s_llrintl.S \ + ${MACHINE_ARCH}/s_lrintl.S \ + ${MACHINE_ARCH}/s_rintl.c \ + ${MACHINE_ARCH}/s_sinl.S \ + ${MACHINE_ARCH}/s_tanl.S + +OBJS= ${SRCS:R:S/$/.o/} + +all: libmath.a + +libmath.a: ${OBJS} + rm -f $@ + ${AR} rcs $@ ${OBJS:T} + +clean: + rm -f ${OBJS:T} libmath.a diff -urN bsd.orig/amd64/e_atan2l.c bsd/amd64/e_atan2l.c --- bsd.orig/amd64/e_atan2l.c Wed Dec 31 19:00:00 1969 +++ bsd/amd64/e_atan2l.c Tue Apr 12 18:53:57 2005 @@ -0,0 +1,16 @@ +/* + * Written by J.T. Conklin . + * Public domain. + * + * Adapted for `long double' by Ulrich Drepper . + */ + +long double +atan2l (long double y, long double x) +{ + long double res; + + asm ("fpatan" : "=t" (res) : "u" (y), "0" (x) : "st(1)"); + + return res; +} diff -urN bsd.orig/amd64/e_logl.S bsd/amd64/e_logl.S --- bsd.orig/amd64/e_logl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/e_logl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,34 @@ +/* + * Written by J.T. Conklin . + * Public domain. + * + * Adapted for `long double' by Ulrich Drepper . + * Adapted for x86-64 by Andreas Jaeger . + */ + +#include + +RCSID("$NetBSD: $") + +one: .double 1.0 +limit: .double 0.29 + + .text +ENTRY(logl) + fldln2 // log(2) + fldt 8(%rsp) // x : log(2) + fld %st // x : x : log(2) + fsubl one(%rip) // x-1 : x : log(2) + fld %st // x-1 : x-1 : x : log(2) + fabs // |x-1| : x-1 : x : log(2) + fcompl limit(%rip) // x-1 : x : log(2) + fnstsw // x-1 : x : log(2) + andb $0x45, %ah + jz 2f + fstp %st(1) // x-1 : log(2) + fyl2xp1 // log(x) + ret + +2: fstp %st(0) // x : log(2) + fyl2x // log(x) + ret diff -urN bsd.orig/amd64/e_powl.S bsd/amd64/e_powl.S --- bsd.orig/amd64/e_powl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/e_powl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,301 @@ +/* ix87 specific implementation of pow function. + Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +inf_zero: +infinity: + .byte 0, 0, 0, 0, 0, 0, 0xf0, 0x7f +zero: .double 0.0 +minf_mzero: +minfinity: + .byte 0, 0, 0, 0, 0, 0, 0xf0, 0xff +mzero: + .byte 0, 0, 0, 0, 0, 0, 0, 0x80 +one: .double 1.0 +limit: .double 0.29 +p63: + .byte 0, 0, 0, 0, 0, 0, 0xe0, 0x43 + + .text +ENTRY(powl) + fldt 24(%rsp) // y + fxam + + + fnstsw + movb %ah, %dl + andb $0x45, %ah + cmpb $0x40, %ah // is y == 0 ? + je 11f + + cmpb $0x05, %ah // is y == ±inf ? + je 12f + + cmpb $0x01, %ah // is y == NaN ? + je 30f + + fldt 8(%rsp) // x : y + + fxam + fnstsw + movb %ah, %dh + andb $0x45, %ah + cmpb $0x40, %ah + je 20f // x is ±0 + + cmpb $0x05, %ah + je 15f // x is ±inf + + fxch // y : x + + /* fistpll raises invalid exception for |y| >= 1L<<63. */ + fldl p63(%rip) // 1L<<63 : y : x + fld %st(1) // y : 1L<<63 : y : x + fabs // |y| : 1L<<63 : y : x + fcomip %st(1), %st // 1L<<63 : y : x + fstp %st(0) // y : x + jnc 2f + + /* First see whether `y' is a natural number. In this case we + can use a more precise algorithm. */ + fld %st // y : y : x + fistpll -8(%rsp) // y : x + fildll -8(%rsp) // int(y) : y : x + fucomip %st(1),%st // y : x + jne 2f + + /* OK, we have an integer value for y. */ + mov -8(%rsp),%eax + mov -4(%rsp),%edx + orl $0, %edx + fstp %st(0) // x + jns 4f // y >= 0, jump + fdivrl one(%rip) // 1/x (now referred to as x) + negl %eax + adcl $0, %edx + negl %edx +4: fldl one(%rip) // 1 : x + fxch + +6: shrdl $1, %edx, %eax + jnc 5f + fxch + fmul %st(1) // x : ST*x + fxch +5: fmul %st(0), %st // x*x : ST*x + shrl $1, %edx + movl %eax, %ecx + orl %edx, %ecx + jnz 6b + fstp %st(0) // ST*x + ret + + /* y is ±NAN */ +30: fldt 8(%rsp) // x : y + fldl one(%rip) // 1.0 : x : y + fucomip %st(1),%st // x : y + je 31f + fxch // y : x +31: fstp %st(1) + ret + +2: /* y is a real number. */ + fxch // x : y + fldl one(%rip) // 1.0 : x : y + fld %st(1) // x : 1.0 : x : y + fsub %st(1) // x-1 : 1.0 : x : y + fabs // |x-1| : 1.0 : x : y + fcompl limit(%rip) // 1.0 : x : y + fnstsw + fxch // x : 1.0 : y + test $4500,%eax + jz 7f + fsub %st(1) // x-1 : 1.0 : y + fyl2xp1 // log2(x) : y + jmp 8f + +7: fyl2x // log2(x) : y +8: fmul %st(1) // y*log2(x) : y + fxam + fnstsw + andb $0x45, %ah + cmpb $0x05, %ah // is y*log2(x) == ±inf ? + je 28f + fst %st(1) // y*log2(x) : y*log2(x) + frndint // int(y*log2(x)) : y*log2(x) + fsubr %st, %st(1) // int(y*log2(x)) : fract(y*log2(x)) + fxch // fract(y*log2(x)) : int(y*log2(x)) + f2xm1 // 2^fract(y*log2(x))-1 : int(y*log2(x)) + faddl one(%rip) // 2^fract(y*log2(x)) : int(y*log2(x)) + fscale // 2^fract(y*log2(x))*2^int(y*log2(x)) : int(y*log2(x)) + fstp %st(1) // 2^fract(y*log2(x))*2^int(y*log2(x)) + ret + +28: fstp %st(1) // y*log2(x) + fldl one(%rip) // 1 : y*log2(x) + fscale // 2^(y*log2(x)) : y*log2(x) + fstp %st(1) // 2^(y*log2(x)) + ret + + // pow(x,±0) = 1 +11: fstp %st(0) // pop y + fldl one(%rip) + ret + + // y == ±inf +12: fstp %st(0) // pop y + fldt 8(%rsp) // x + fabs + fcompl one(%rip) // < 1, == 1, or > 1 + fnstsw + andb $0x45, %ah + cmpb $0x45, %ah + je 13f // jump if x is NaN + + cmpb $0x40, %ah + je 14f // jump if |x| == 1 + + shlb $1, %ah + xorb %ah, %dl + andl $2, %edx +#ifdef PIC + lea inf_zero(%rip),%rcx + fldl (%rcx, %rdx, 4) +#else + fldl inf_zero(,%rdx, 4) +#endif + ret + +14: fldl one(%rip) + ret + +13: fldt 8(%rsp) // load x == NaN + ret + + // x is ±inf +15: fstp %st(0) // y + testb $2, %dh + jz 16f // jump if x == +inf + + // We must find out whether y is an odd integer. + fld %st // y : y + fistpll -8(%rsp) // y + fildll -8(%rsp) // int(y) : y + fucomip %st(1),%st + ffreep %st // + jne 17f + + // OK, the value is an integer, but is it odd? + mov -8(%rsp), %eax + mov -4(%rsp), %edx + andb $1, %al + jz 18f // jump if not odd + // It's an odd integer. + shrl $31, %edx +#ifdef PIC + lea minf_mzero(%rip),%rcx + fldl (%rcx, %rdx, 8) +#else + fldl minf_mzero(,%rdx, 8) +#endif + ret + +16: fcompl zero(%rip) + fnstsw + shrl $5, %eax + andl $8, %eax +#ifdef PIC + lea inf_zero(%rip),%rcx + fldl (%rcx, %rax, 1) +#else + fldl inf_zero(,%rax, 1) +#endif + ret + +17: shll $30, %edx // sign bit for y in right position +18: shrl $31, %edx +#ifdef PIC + lea inf_zero(%rip),%rcx + fldl (%rcx, %rdx, 8) +#else + fldl inf_zero(,%rdx, 8) +#endif + ret + + // x is ±0 +20: fstp %st(0) // y + testb $2, %dl + jz 21f // y > 0 + + // x is ±0 and y is < 0. We must find out whether y is an odd integer. + testb $2, %dh + jz 25f + + fld %st // y : y + fistpll -8(%rsp) // y + fildll -8(%rsp) // int(y) : y + fucomip %st(1),%st + ffreep %st // + jne 26f + + // OK, the value is an integer, but is it odd? + mov -8(%rsp),%eax + mov -4(%rsp),%edx + andb $1, %al + jz 27f // jump if not odd + // It's an odd integer. + // Raise divide-by-zero exception and get minus infinity value. + fldl one(%rip) + fdivl zero(%rip) + fchs + ret + +25: fstp %st(0) +26: +27: // Raise divide-by-zero exception and get infinity value. + fldl one(%rip) + fdivl zero(%rip) + ret + + // x is ±0 and y is > 0. We must find out whether y is an odd integer. +21: testb $2, %dh + jz 22f + + fld %st // y : y + fistpll -8(%rsp) // y + fildll -8(%rsp) // int(y) : y + fucomip %st(1),%st + ffreep %st // + jne 23f + + // OK, the value is an integer, but is it odd? + mov -8(%rsp),%eax + mov -4(%rsp),%edx + andb $1, %al + jz 24f // jump if not odd + // It's an odd integer. + fldl mzero(%rip) + ret + +22: fstp %st(0) +23: +24: fldl zero(%rip) + ret diff -urN bsd.orig/amd64/e_remainderl.S bsd/amd64/e_remainderl.S --- bsd.orig/amd64/e_remainderl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/e_remainderl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,19 @@ +/* + * Written by J.T. Conklin . + * Public domain. + * + * Adapted for `long double' by Ulrich Drepper . + * Adapted for x86-64 by Andreas Jaeger . + */ + +#include + +ENTRY(remainderl) + fldt 24(%rsp) + fldt 8(%rsp) +1: fprem1 + fstsw %ax + testl $0x400,%eax + jnz 1b + fstp %st(1) + ret diff -urN bsd.orig/amd64/e_sqrtl.c bsd/amd64/e_sqrtl.c --- bsd.orig/amd64/e_sqrtl.c Wed Dec 31 19:00:00 1969 +++ bsd/amd64/e_sqrtl.c Tue Apr 12 18:53:57 2005 @@ -0,0 +1,16 @@ +/* + * Written by J.T. Conklin . + * Public domain. + * + * Adapted for `long double' by Ulrich Drepper . + */ + +long double +sqrtl (long double x) +{ + long double res; + + asm ("fsqrt" : "=t" (res) : "0" (x)); + + return res; +} diff -urN bsd.orig/amd64/s_cosl.S bsd/amd64/s_cosl.S --- bsd.orig/amd64/s_cosl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/s_cosl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,30 @@ +/* + * Written by J.T. Conklin . + * Public domain. + * + * Adapted for `long double' by Ulrich Drepper . + * Adapted for x86-64 by Andreas Jaeger . + */ + +#include + +RCSID("$NetBSD: $") + +ENTRY(cosl) + fldt 8(%rsp) + fcos + fnstsw %ax + testl $0x400,%eax + jnz 1f + ret + +1: fldpi + fadd %st(0) + fxch %st(1) +2: fprem1 + fnstsw %ax + testl $0x400,%eax + jnz 2b + fstp %st(1) + fcos + ret diff -urN bsd.orig/amd64/s_llrintl.S bsd/amd64/s_llrintl.S --- bsd.orig/amd64/s_llrintl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/s_llrintl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,28 @@ +/* Round argument to nearest integral value according to current rounding + direction. + Copyright (C) 1997, 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +ENTRY(llrintl) + fldt 8(%rsp) + fistpll -8(%rsp) + fwait + movq -8(%rsp),%rax + ret diff -urN bsd.orig/amd64/s_lrintl.S bsd/amd64/s_lrintl.S --- bsd.orig/amd64/s_lrintl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/s_lrintl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,28 @@ +/* Round argument to nearest integral value according to current rounding + direction. + Copyright (C) 1997, 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +ENTRY(lrintl) + fldt 8(%rsp) + fistpll -8(%rsp) + fwait + movq -8(%rsp),%rax + ret diff -urN bsd.orig/amd64/s_rintl.c bsd/amd64/s_rintl.c --- bsd.orig/amd64/s_rintl.c Wed Dec 31 19:00:00 1969 +++ bsd/amd64/s_rintl.c Tue Apr 12 18:53:57 2005 @@ -0,0 +1,14 @@ +/* + * Written by J.T. Conklin . + * Changes for long double by Ulrich Drepper + * Public domain. + */ + +long double +rintl (long double x) +{ + long double res; + + asm ("frndint" : "=t" (res) : "0" (x)); + return res; +} diff -urN bsd.orig/amd64/s_sinl.S bsd/amd64/s_sinl.S --- bsd.orig/amd64/s_sinl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/s_sinl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,27 @@ +/* + * Written by J.T. Conklin . + * Public domain. + * + * Adapted for `long double' by Ulrich Drepper . + * Adapted for x86-64 by Andreas Jaeger . + */ + +#include + +ENTRY(sinl) + fldt 8(%rsp) + fsin + fnstsw %ax + testl $0x400,%eax + jnz 1f + ret +1: fldpi + fadd %st(0) + fxch %st(1) +2: fprem1 + fnstsw %ax + testl $0x400,%eax + jnz 2b + fstp %st(1) + fsin + ret diff -urN bsd.orig/amd64/s_tanl.S bsd/amd64/s_tanl.S --- bsd.orig/amd64/s_tanl.S Wed Dec 31 19:00:00 1969 +++ bsd/amd64/s_tanl.S Tue Apr 12 18:53:59 2005 @@ -0,0 +1,32 @@ +/* + * Written by J.T. Conklin . + * Public domain. + * + * Adapted for `long double' by Ulrich Drepper . + * Adapted for x86-64 by Andreas Jaeger . + */ + +#include + +RCSID("$NetBSD: $") + +ENTRY(tanl) + fldt 8(%rsp) + fptan + fnstsw %ax + testl $0x400,%eax + jnz 1f + fstp %st(0) + ret + +1: fldpi + fadd %st(0) + fxch %st(1) +2: fprem1 + fstsw %ax + testl $0x400,%eax + jnz 2b + fstp %st(1) + fptan + fstp %st(0) + ret --Boundary-00=_OKYXC+kkn1fOkqy Content-Type: text/x-diff; charset="us-ascii"; name="qemu-snapshot-fbsd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="qemu-snapshot-fbsd.diff" Index: Makefile =================================================================== RCS file: /cvsroot/qemu/qemu/Makefile,v retrieving revision 1.82 diff -u -r1.82 Makefile --- Makefile 10 Feb 2005 21:48:51 -0000 1.82 +++ Makefile 13 Apr 2005 18:06:10 -0000 @@ -13,7 +13,7 @@ endif DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 -all: dyngen$(EXESUF) $(TOOLS) $(DOCS) +all: bsd/libmath.a dyngen$(EXESUF) $(TOOLS) $(DOCS) for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ done @@ -21,6 +21,9 @@ $(MAKE) -C kqemu endif +bsd/libmath.a: + ( cd bsd ; /usr/bin/make ) + qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) @@ -29,6 +32,7 @@ clean: # avoid old build problems by removing potentially incorrect old files + ( cd bsd ; /usr/bin/make clean ) rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~ $(MAKE) -C tests clean @@ -82,7 +86,7 @@ # documentation %.html: %.texi - texi2html -monolithic -number $< + -texi2html -monolithic -number $< qemu.1: qemu-doc.texi ./texi2pod.pl $< qemu.pod Index: Makefile.target =================================================================== RCS file: /cvsroot/qemu/qemu/Makefile.target,v retrieving revision 1.63 diff -u -r1.63 Makefile.target --- Makefile.target 7 Apr 2005 22:20:27 -0000 1.63 +++ Makefile.target 13 Apr 2005 18:06:10 -0000 @@ -211,7 +211,7 @@ ######################################################### -DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DSMBD=\"/usr/local/sbin/smbd\" LIBS+=-lm ifndef CONFIG_USER_ONLY LIBS+=-lz @@ -388,8 +388,8 @@ VL_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld endif -$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a - $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) +$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a ../bsd/libmath.a + $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) ../bsd/libmath.a cocoa.o: cocoa.m $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< Index: block.c =================================================================== RCS file: /cvsroot/qemu/qemu/block.c,v retrieving revision 1.16 diff -u -r1.16 block.c --- block.c 12 Dec 2004 11:24:44 -0000 1.16 +++ block.c 13 Apr 2005 18:06:10 -0000 @@ -21,6 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#include "config-host.h" + +#ifdef _BSD +#include +#include +#include +#include +#include +#endif + #include "vl.h" #include "block_int.h" @@ -92,14 +103,25 @@ { int fd, ret, score, score_max; BlockDriver *drv1, *drv; - uint8_t buf[1024]; + uint8_t *buf; + size_t bufsize = 1024; + u_int sectorsize = 512; fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE); if (fd < 0) return NULL; - ret = read(fd, buf, sizeof(buf)); +#ifdef DIOCGSECTORSIZE + if (!ioctl(fd, DIOCGSECTORSIZE, §orsize) && + sectorsize > bufsize) + bufsize = sectorsize; +#endif + buf = malloc(bufsize); + if (!buf) + return NULL; + ret = read(fd, buf, bufsize); if (ret < 0) { close(fd); + free(buf); return NULL; } close(fd); @@ -113,6 +135,7 @@ drv = drv1; } } + free(buf); return drv; } @@ -532,6 +555,15 @@ return -1; bs->read_only = 1; } +#ifdef _BSD + struct stat sb; + if (!fstat(fd,&sb) && (S_IFCHR & sb.st_mode)) { +#ifdef DIOCGMEDIASIZE + if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) +#endif + size = lseek(fd, 0LL, SEEK_END); + } else +#endif size = lseek(fd, 0, SEEK_END); bs->total_sectors = size / 512; s->fd = fd; Index: configure =================================================================== RCS file: /cvsroot/qemu/qemu/configure,v retrieving revision 1.61 diff -u -r1.61 configure --- configure 13 Mar 2005 16:51:53 -0000 1.61 +++ configure 13 Apr 2005 18:06:10 -0000 @@ -18,7 +18,7 @@ # default parameters prefix="" -interp_prefix="/usr/gnemul/qemu-%M" +interp_prefix="/usr/local/bin/qemu-%M" static="no" cross_prefix="" cc="gcc" @@ -255,7 +255,7 @@ if test -z "$sdl" ; then -sdl_config="sdl-config" +sdl_config="sdl11-config" sdl=no sdl_static=no @@ -344,7 +344,7 @@ if test -z "$prefix" ; then prefix="/usr/local" fi -mandir="$prefix/share/man" +mandir="$prefix/man" datadir="$prefix/share/qemu" docdir="$prefix/share/doc/qemu" bindir="$prefix/bin" Index: vl.c =================================================================== RCS file: /cvsroot/qemu/qemu/vl.c,v retrieving revision 1.126 diff -u -r1.126 vl.c --- vl.c 7 Apr 2005 22:20:28 -0000 1.126 +++ vl.c 13 Apr 2005 18:06:11 -0000 @@ -45,6 +45,9 @@ #ifndef __APPLE__ #include #endif +#ifdef __FreeBSD__ +#include +#endif #else #include #include @@ -754,6 +757,14 @@ case QEMU_TIMER_REALTIME: #ifdef _WIN32 return GetTickCount(); +#elif defined(_BSD) + { + struct timeval r; + if (!gettimeofday(&r, NULL)) { + return ((timer_freq * 1000LL) * (int64_t)r.tv_sec + + ((int64_t)r.tv_usec * timer_freq) / 1000) / timer_freq; + } + } #else { struct tms tp; @@ -1579,8 +1590,13 @@ fclose(f); atexit(smb_exit); +#if defined(__FreeBSD__) + snprintf(smb_cmdline, sizeof(smb_cmdline), SMBD " -s %s", + smb_conf); +#else snprintf(smb_cmdline, sizeof(smb_cmdline), "/usr/sbin/smbd -s %s", smb_conf); +#endif slirp_add_exec(0, smb_cmdline, 4, 139); } @@ -1589,6 +1605,34 @@ #endif /* CONFIG_SLIRP */ +#ifdef __FreeBSD__ +#define LOAD_QUIETLY 1 +#define LOAD_VERBOSLY 2 + +int +loadmodules(int how, const char *module, ...) +{ + int loaded = 0; + va_list ap; + + va_start(ap, module); +#ifndef NO_MODULES + while (module != NULL) { + if (modfind(module) == -1) { + if (kldload(module) == -1) { + if (how == LOAD_VERBOSLY) + fprintf(stderr, "%s: Cannot load module\n", module); + } else + loaded++; + } + module = va_arg(ap, const char *); + } + va_end(ap); +#endif + return loaded; +} +#endif + #if !defined(_WIN32) #ifdef _BSD static int tun_open(char *ifname, int ifname_size) @@ -1597,11 +1641,55 @@ char *dev; struct stat s; +#ifdef __FreeBSD__ + int i, kldtried = 0, enoentcount = 0, err = 0; + char dname[100]; +#ifdef USE_DEVTAP + /* + * 5.x has /dev/tap, but that seems to just blindly increase its + * couter on every open() for some people(??), i.e. on every qemu run. + */ + i = -1; +#else + i = 0; +#endif + for (; i < 10; i++) { + if (i == -1) + strcpy(dname, "/dev/tap"); + else + snprintf(dname, sizeof dname, "%s%d", + "/dev/tap", i); + fd = open(dname, O_RDWR); + if (fd >= 0) + break; + else if (errno == ENXIO || errno == ENOENT) { + if (i == 0 && !kldtried++) { + /* + * Attempt to load the tunnel interface KLD if it isn't loaded + * already. + */ + if (loadmodules(LOAD_VERBOSLY, "if_tap", NULL)) + i = -1; + continue; + } + if (errno != ENOENT || ++enoentcount > 3) { + err = errno; + break; + } + } else + err = errno; + } + if (fd < 0) { + fprintf(stderr, "warning: could not open %s (%s): no virtual network emulation\n", dname, strerror(err)); + return -1; + } +#else fd = open("/dev/tap", O_RDWR); if (fd < 0) { - fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n"); + fprintf(stderr, "warning: could not open /dev/tap (%s): no virtual network emulation\n", strerror(errno)); return -1; } +#endif fstat(fd, &s); dev = devname(s.st_rdev, S_IFCHR); Index: x86_64.ld =================================================================== RCS file: /cvsroot/qemu/qemu/x86_64.ld,v retrieving revision 1.1 diff -u -r1.1 x86_64.ld --- x86_64.ld 6 Jan 2005 20:50:00 -0000 1.1 +++ x86_64.ld 13 Apr 2005 18:06:11 -0000 @@ -2,7 +2,7 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") OUTPUT_ARCH(i386:x86-64) ENTRY(_start) -SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/local/lib64"); +SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/usr/X11R6/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ Index: fpu/softfloat-native.c =================================================================== RCS file: /cvsroot/qemu/qemu/fpu/softfloat-native.c,v retrieving revision 1.2 diff -u -r1.2 softfloat-native.c --- fpu/softfloat-native.c 20 Mar 2005 10:33:58 -0000 1.2 +++ fpu/softfloat-native.c 13 Apr 2005 18:06:12 -0000 @@ -6,7 +6,7 @@ void set_float_rounding_mode(int val STATUS_PARAM) { STATUS(float_rounding_mode) = val; -#if defined(_BSD) && !defined(__APPLE__) +#if defined(_BSD) && !defined(__APPLE__) && !defined(__FreeBSD__) fpsetround(val); #elif defined(__arm__) /* nothing to do */ @@ -22,7 +22,7 @@ } #endif -#if defined(_BSD) +#if defined(_BSD) && !defined(__FreeBSD__) #define lrint(d) ((int32_t)rint(d)) #define llrint(d) ((int64_t)rint(d)) #endif Index: fpu/softfloat-native.h =================================================================== RCS file: /cvsroot/qemu/qemu/fpu/softfloat-native.h,v retrieving revision 1.2 diff -u -r1.2 softfloat-native.h --- fpu/softfloat-native.h 20 Mar 2005 10:33:58 -0000 1.2 +++ fpu/softfloat-native.h 13 Apr 2005 18:06:12 -0000 @@ -1,6 +1,6 @@ /* Native implementation of soft float functions */ #include -#if defined(_BSD) && !defined(__APPLE__) +#if defined(_BSD) && !defined(__APPLE__) && !defined(__FreeBSD__) #include #else #include @@ -33,7 +33,7 @@ /*---------------------------------------------------------------------------- | Software IEC/IEEE floating-point rounding mode. *----------------------------------------------------------------------------*/ -#if defined(_BSD) && !defined(__APPLE__) +#if defined(_BSD) && !defined(__APPLE__) && !defined(__FreeBSD__) enum { float_round_nearest_even = FP_RN, float_round_down = FE_RM, Index: fpu/softfloat.h =================================================================== RCS file: /cvsroot/qemu/qemu/fpu/softfloat.h,v retrieving revision 1.2 diff -u -r1.2 softfloat.h --- fpu/softfloat.h 13 Mar 2005 18:52:29 -0000 1.2 +++ fpu/softfloat.h 13 Apr 2005 18:06:12 -0000 @@ -84,7 +84,8 @@ #define FLOAT128 #else /* native float support */ -#if (defined(__i386__) || defined(__x86_64__)) && !defined(_BSD) +#if (defined(__i386__) || defined(__x86_64__)) && \ + (!defined(_BSD) || defined(__FreeBSD__)) #define FLOATX80 #endif #endif /* !CONFIG_SOFTFLOAT */ Index: slirp/bootp.c =================================================================== RCS file: /cvsroot/qemu/qemu/slirp/bootp.c,v retrieving revision 1.6 diff -u -r1.6 bootp.c --- slirp/bootp.c 3 Oct 2004 11:44:41 -0000 1.6 +++ slirp/bootp.c 13 Apr 2005 18:06:12 -0000 @@ -29,11 +29,12 @@ #define START_ADDR 15 -#define LEASE_TIME (24 * 3600) +#define LEASE_TIME (120) typedef struct { uint8_t allocated; uint8_t macaddr[6]; + int time; } BOOTPClient; BOOTPClient bootp_clients[NB_ADDR]; @@ -51,15 +52,19 @@ { BOOTPClient *bc; int i; + int now = time(NULL); for(i = 0; i < NB_ADDR; i++) { if (!bootp_clients[i].allocated) goto found; } + for(i = 0; i < NB_ADDR; i++) { + if (now-bootp_clients[i].time > 3*LEASE_TIME) + goto found; + } return NULL; found: bc = &bootp_clients[i]; - bc->allocated = 1; paddr->s_addr = htonl(ntohl(special_addr.s_addr) | (i + START_ADDR)); return bc; } @@ -81,13 +86,36 @@ return bc; } -static void dhcp_decode(const uint8_t *buf, int size, - int *pmsg_type) +static BOOTPClient *find_reqaddr(struct in_addr *paddr, struct in_addr *reqaddr, const uint8_t *macaddr) +{ + BOOTPClient *bc=NULL; + int i; + /*check the net prefix*/ + if ((ntohl(reqaddr->s_addr) & 0xffffff00) == + (ntohl(special_addr.s_addr) & 0xffffff00)) { + i=(ntohl(reqaddr->s_addr) & 0xff) - START_ADDR; + if (i>=0 && i< NB_ADDR) { + bc = &bootp_clients[i]; + if (bc->allocated && + (memcmp(macaddr, bootp_clients[i].macaddr, 6)==0)) { + paddr->s_addr = reqaddr->s_addr; + return bc; + } + else + bc=NULL; + } + } + return bc; +} + +static void dhcp_decode(const uint8_t *buf, int size, int *pmsg_type, + struct sockaddr_in *preqaddr) { const uint8_t *p, *p_end; int len, tag; *pmsg_type = 0; + preqaddr->sin_addr.s_addr=htonl(0L); p = buf; p_end = buf + size; @@ -114,6 +142,10 @@ if (len >= 1) *pmsg_type = p[0]; break; + case RFC2132_REQ_ADDR: + if (len == 4) { + memcpy(&(preqaddr->sin_addr),p,4); + } default: break; } @@ -127,14 +159,14 @@ BOOTPClient *bc; struct mbuf *m; struct bootp_t *rbp; - struct sockaddr_in saddr, daddr; + struct sockaddr_in saddr, daddr, reqaddr; struct in_addr dns_addr; int dhcp_msg_type, val; - uint8_t *q; + uint8_t *q, replytype; /* extract exact DHCP msg type */ - dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type); - dprintf("bootp packet op=%d msgtype=%d\n", bp->bp_op, dhcp_msg_type); + dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type,&reqaddr); + dprintf("bootp packet op=%d msgtype=%d reqaddr=%x\n", bp->bp_op, dhcp_msg_type,ntohl(reqaddr.sin_addr.s_addr)); if (dhcp_msg_type == 0) dhcp_msg_type = DHCPREQUEST; /* Force reply for old BOOTP clients */ @@ -152,21 +184,18 @@ m->m_data += sizeof(struct udpiphdr); memset(rbp, 0, sizeof(struct bootp_t)); - if (dhcp_msg_type == DHCPDISCOVER) { - new_addr: - bc = get_new_addr(&daddr.sin_addr); - if (!bc) { - dprintf("no address left\n"); - return; - } - memcpy(bc->macaddr, client_ethaddr, 6); - } else { - bc = find_addr(&daddr.sin_addr, bp->bp_hwaddr); - if (!bc) { - /* if never assigned, behaves as if it was already - assigned (windows fix because it remembers its address) */ - goto new_addr; - } + bc=NULL; + daddr.sin_addr.s_addr=htonl(0L); + if (dhcp_msg_type == DHCPREQUEST) { + if (reqaddr.sin_addr.s_addr != htonl(0L)) + bc = find_reqaddr(&daddr.sin_addr, &reqaddr.sin_addr, bp->bp_hwaddr); + else + bc = find_addr(&daddr.sin_addr, bp->bp_hwaddr); + } + else if (dhcp_msg_type == DHCPDISCOVER) { + bc = find_addr(&daddr.sin_addr, bp->bp_hwaddr); + if (!bc) + bc = get_new_addr(&daddr.sin_addr); } dprintf("offered addr=%08x\n", ntohl(daddr.sin_addr.s_addr)); @@ -181,25 +210,27 @@ rbp->bp_hlen = 6; memcpy(rbp->bp_hwaddr, bp->bp_hwaddr, 6); - rbp->bp_yiaddr = daddr.sin_addr; /* Client IP address */ - rbp->bp_siaddr = saddr.sin_addr; /* Server IP address */ + rbp->bp_yiaddr = daddr.sin_addr; /* IP address */ q = rbp->bp_vend; memcpy(q, rfc1533_cookie, 4); q += 4; - if (dhcp_msg_type == DHCPDISCOVER) { - *q++ = RFC2132_MSG_TYPE; - *q++ = 1; - *q++ = DHCPOFFER; - } else if (dhcp_msg_type == DHCPREQUEST) { - *q++ = RFC2132_MSG_TYPE; - *q++ = 1; - *q++ = DHCPACK; - } - - if (dhcp_msg_type == DHCPDISCOVER || - dhcp_msg_type == DHCPREQUEST) { + if (bc != NULL) { + memcpy(bc->macaddr, client_ethaddr, 6); + bc->allocated = 1; + bc->time = time(NULL); + replytype=(dhcp_msg_type == DHCPDISCOVER)?DHCPOFFER:DHCPACK; + } + else + replytype=DHCPNACK; + + *q++ = RFC2132_MSG_TYPE; + *q++ = 1; + *q++ = replytype; + + if ((dhcp_msg_type == DHCPDISCOVER || + dhcp_msg_type == DHCPREQUEST) && replytype!=DHCPNACK) { *q++ = RFC2132_SRV_ID; *q++ = 4; memcpy(q, &saddr.sin_addr, 4); Index: slirp/bootp.h =================================================================== RCS file: /cvsroot/qemu/qemu/slirp/bootp.h,v retrieving revision 1.1 diff -u -r1.1 bootp.h --- slirp/bootp.h 22 Apr 2004 00:10:47 -0000 1.1 +++ slirp/bootp.h 13 Apr 2005 18:06:12 -0000 @@ -71,6 +71,7 @@ #define DHCPOFFER 2 #define DHCPREQUEST 3 #define DHCPACK 5 +#define DHCPNACK 6 #define RFC1533_VENDOR_MAJOR 0 #define RFC1533_VENDOR_MINOR 0 Index: slirp/slirp_config.h =================================================================== RCS file: /cvsroot/qemu/qemu/slirp/slirp_config.h,v retrieving revision 1.3 diff -u -r1.3 slirp_config.h --- slirp/slirp_config.h 12 Jul 2004 22:33:05 -0000 1.3 +++ slirp/slirp_config.h 13 Apr 2005 18:06:12 -0000 @@ -92,7 +92,7 @@ #undef BAD_SPRINTF /* Define if you have readv */ -#undef HAVE_READV +#define HAVE_READV /* Define if iovec needs to be declared */ #undef DECLARE_IOVEC @@ -104,7 +104,7 @@ #undef DECLARE_SPRINTF /* Define if you have a POSIX.1 sys/wait.h */ -#undef HAVE_SYS_WAIT_H +#define HAVE_SYS_WAIT_H /* Define if you have sys/select.h */ #undef HAVE_SYS_SELECT_H @@ -122,7 +122,7 @@ #endif /* Define if you have sys/signal.h */ -#undef HAVE_SYS_SIGNAL_H +#define HAVE_SYS_SIGNAL_H /* Define if you have sys/stropts.h */ #undef HAVE_SYS_STROPTS_H @@ -198,7 +198,7 @@ #undef HAVE_GRANTPT /* Define if you have fchmod */ -#undef HAVE_FCHMOD +#define HAVE_FCHMOD /* Define if you have */ #undef HAVE_SYS_TYPES32_H --Boundary-00=_OKYXC+kkn1fOkqy-- From owner-freebsd-emulation@FreeBSD.ORG Thu Apr 14 13:11:21 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 307C116A4CE; Thu, 14 Apr 2005 13:11:21 +0000 (GMT) Received: from bgo1smout1.broadpark.no (bgo1smout1.broadpark.no [217.13.4.94]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E68B43D2F; Thu, 14 Apr 2005 13:11:20 +0000 (GMT) (envelope-from des@des.no) Received: from bgo1sminn1.broadpark.no ([217.13.4.93]) by bgo1smout1.broadpark.no (Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21 2004)) with ESMTP id <0IEX00MJPTPGAD00@bgo1smout1.broadpark.no>; Thu, 14 Apr 2005 15:05:40 +0200 (CEST) Received: from dsa.des.no ([80.203.228.37]) by bgo1sminn1.broadpark.no (Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21 2004)) with ESMTP id <0IEX0036UU0XGMC0@bgo1sminn1.broadpark.no>; Thu, 14 Apr 2005 15:12:33 +0200 (CEST) Received: by dsa.des.no (Pony Express, from userid 666) id 1A7EFEBD35; Thu, 14 Apr 2005 15:11:18 +0200 (CEST) Received: from xps.des.no (xps.des.no [10.0.0.12]) by dsa.des.no (Pony Express) with ESMTP id 65C58EBD28; Thu, 14 Apr 2005 15:11:13 +0200 (CEST) Received: by xps.des.no (Postfix, from userid 1001) id 5574733C5A; Thu, 14 Apr 2005 15:11:13 +0200 (CEST) Date: Thu, 14 Apr 2005 15:11:13 +0200 From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) In-reply-to: <200504131635.26063.jkim@niksun.com> To: Jung-uk Kim Message-id: <86mzs11p1q.fsf@xps.des.no> MIME-version: 1.0 Content-type: text/plain; charset=iso-8859-1 Content-transfer-encoding: quoted-printable X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on dsa.des.no References: <200504131635.26063.jkim@niksun.com> User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3 (berkeley-unix) X-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED autolearn=disabled version=3.0.2 X-Spam-Level: cc: freebsd-emulation@freebsd.org cc: Juergen Lock cc: freebsd-amd64@freebsd.org Subject: Re: QEMU on FreeBSD/amd64 (patches) X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2005 13:11:21 -0000 Jung-uk Kim writes: > 2. Install following dependencies from ports: > > devel/gmake (of course) > net/samba > devel/sdl12 > > I believe samba is optional but sdl12 is not. qemu has a bogus hard dependency on Samba. The truth is that it will work just fine without it. Samba is only required if you run Windows as guest OS in qemu and wish to export parts of the host system's filesystem to the guest. DES --=20 Dag-Erling Sm=F8rgrav - des@des.no From owner-freebsd-emulation@FreeBSD.ORG Thu Apr 14 17:20:23 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 174CD16A4CE for ; Thu, 14 Apr 2005 17:20:23 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFDF543D1D for ; Thu, 14 Apr 2005 17:20:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3EHKMXF004483 for ; Thu, 14 Apr 2005 17:20:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3EHKM7x004482; Thu, 14 Apr 2005 17:20:22 GMT (envelope-from gnats) Date: Thu, 14 Apr 2005 17:20:22 GMT Message-Id: <200504141720.j3EHKM7x004482@freefall.freebsd.org> To: emulation@FreeBSD.org From: Florent Thoumie Subject: Re: kern/53874 X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Florent Thoumie List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2005 17:20:23 -0000 The following reply was made to PR kern/53874; it has been noted by GNATS. From: Florent Thoumie To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: Re: kern/53874 Date: Thu, 14 Apr 2005 19:11:08 +0200 I've closed ports/51711 since it describes the same issue and was in ports category. -- Florent Thoumie flz@FreeBSD.org From owner-freebsd-emulation@FreeBSD.ORG Fri Apr 15 09:56:20 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B545416A4CE; Fri, 15 Apr 2005 09:56:20 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C99743D2D; Fri, 15 Apr 2005 09:56:20 +0000 (GMT) (envelope-from flz@FreeBSD.org) Received: from freefall.freebsd.org (flz@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3F9uKPC060175; Fri, 15 Apr 2005 09:56:20 GMT (envelope-from flz@freefall.freebsd.org) Received: (from flz@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3F9uKkw060171; Fri, 15 Apr 2005 09:56:20 GMT (envelope-from flz) Date: Fri, 15 Apr 2005 09:56:20 GMT From: Florent Thoumie Message-Id: <200504150956.j3F9uKkw060171@freefall.freebsd.org> To: per@hedeland.org, flz@FreeBSD.org, emulation@FreeBSD.org Subject: Re: ports/68532: Add support for multiple VMWare instances X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 09:56:20 -0000 Synopsis: Add support for multiple VMWare instances State-Changed-From-To: feedback->closed State-Changed-By: flz State-Changed-When: Fri Apr 15 09:54:57 GMT 2005 State-Changed-Why: Submitter said changes have been committed. Thanks for your submission! http://www.freebsd.org/cgi/query-pr.cgi?pr=68532 From owner-freebsd-emulation@FreeBSD.ORG Fri Apr 15 10:20:38 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE93E16A4F7; Fri, 15 Apr 2005 10:20:38 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5BC243D4C; Fri, 15 Apr 2005 10:20:38 +0000 (GMT) (envelope-from flz@FreeBSD.org) Received: from freefall.freebsd.org (flz@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3FAKcat065458; Fri, 15 Apr 2005 10:20:38 GMT (envelope-from flz@freefall.freebsd.org) Received: (from flz@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3FAKcaE065454; Fri, 15 Apr 2005 10:20:38 GMT (envelope-from flz) Date: Fri, 15 Apr 2005 10:20:38 GMT From: Florent Thoumie Message-Id: <200504151020.j3FAKcaE065454@freefall.freebsd.org> To: marc@bowtie.nl, flz@FreeBSD.org, emulation@FreeBSD.org Subject: Re: ports/68202: [patch] Make vmware2 compile on -current X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 10:20:39 -0000 Synopsis: [patch] Make vmware2 compile on -current State-Changed-From-To: open->closed State-Changed-By: flz State-Changed-When: Fri Apr 15 10:20:27 GMT 2005 State-Changed-Why: Committed, thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=68202 From owner-freebsd-emulation@FreeBSD.ORG Fri Apr 15 10:21:47 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67EA516A4D4; Fri, 15 Apr 2005 10:21:47 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CE8843D41; Fri, 15 Apr 2005 10:21:47 +0000 (GMT) (envelope-from flz@FreeBSD.org) Received: from freefall.freebsd.org (flz@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3FALlSF065564; Fri, 15 Apr 2005 10:21:47 GMT (envelope-from flz@freefall.freebsd.org) Received: (from flz@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3FALiMK065559; Fri, 15 Apr 2005 10:21:44 GMT (envelope-from flz) Date: Fri, 15 Apr 2005 10:21:44 GMT From: Florent Thoumie Message-Id: <200504151021.j3FALiMK065559@freefall.freebsd.org> To: kaho@easy.es.tuat.ac.jp, flz@FreeBSD.org, emulation@FreeBSD.org Subject: Re: ports/63747: vmmon is not performing X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 10:21:47 -0000 Synopsis: vmmon is not performing State-Changed-From-To: feedback->closed State-Changed-By: flz State-Changed-When: Fri Apr 15 10:21:05 GMT 2005 State-Changed-Why: A similar fix has been committed, thanks for your submission anyway. http://www.freebsd.org/cgi/query-pr.cgi?pr=63747 From owner-freebsd-emulation@FreeBSD.ORG Fri Apr 15 19:55:57 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DF6616A4CE; Fri, 15 Apr 2005 19:55:57 +0000 (GMT) Received: from gwyn.kn-bremen.de (gwyn.kn-bremen.de [212.63.36.242]) by mx1.FreeBSD.org (Postfix) with ESMTP id 847F343D2F; Fri, 15 Apr 2005 19:55:55 +0000 (GMT) (envelope-from nox@saturn.kn-bremen.de) Received: from gwyn.kn-bremen.de (gwyn [127.0.0.1])j3FJtrnj032508; Fri, 15 Apr 2005 21:55:53 +0200 Received: from saturn.kn-bremen.de (uucp@localhost)j3FJtr5N032506; Fri, 15 Apr 2005 21:55:53 +0200 Received: (from nox@localhost) by saturn.kn-bremen.de (8.11.4/8.8.5) id j3FJpl470224; Fri, 15 Apr 2005 21:51:47 +0200 (CEST) From: Juergen Lock Date: Fri, 15 Apr 2005 21:51:43 +0200 To: Jung-uk Kim Message-ID: <20050415215142.A68957@saturn.kn-bremen.de> Mail-Followup-To: Jung-uk Kim , freebsd-amd64@freebsd.org, freebsd-emulation@freebsd.org References: <200504131635.26063.jkim@niksun.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0pre3i In-Reply-To: <200504131635.26063.jkim@niksun.com> cc: freebsd-emulation@freebsd.org cc: freebsd-amd64@freebsd.org Subject: Re: QEMU on FreeBSD/amd64 (patches) X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 19:55:57 -0000 On Wed, Apr 13, 2005 at 04:35:26PM -0400, Jung-uk Kim wrote: > I finally manage to build QEMU snapshot on FreeBSD/amd64 6-CURRENT. Nice! > There's ports/emulators/qemu but it doesn't build on AMD64 for > several reasons, i. e., QEMU and FreeBSD are both fast moving targets > (esp. src/lib/msun), some long double math functions don't exist on > FreeBSD, So the replacements in files/patch-aa in the port didnt work for amd64? (the ones #if defined(_BSD) && defined(USE_X86LDOUBLE)) > GCC in base system doesn't build QEMU because of several > optimization bugs specific to AMD64, etc. > > 1. Install GCC 3.4 from ports. > > Anything newer than 20050316 should work. (Theoretically you can use > gcc40 newer than 20041127 but not verified. Actually I am using > patched version of src/contrib/gcc. ;-) > > 2. Install following dependencies from ports: > > devel/gmake (of course) > net/samba > devel/sdl12 > > I believe samba is optional but sdl12 is not. It doesn't work without > SDL because `-nographic' option is broken. I believe it is an > upstream bug (related to FreeBSD's pty or termios, i. e., fail to get > correct term size and segfault) but I couldn't pin-point the culprit > yet. In fact, I didn't bother too much because SDL worked just > fine. ;-) Samba is needed for the -smb option (export a local dir to guest), if you don't use that you can omit samba thats true. >[...] > Note 2: qemu-libmath-amd64.diff contains C99 long double math > functions taken from glibc-2.3.5 and modified for FreeBSD/amd64: > > http://ftp.gnu.org/gnu/glibc/ > http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/?cvsroot=glibc > > rintl() sysdeps/i386/fpu/s_rintl.c > atan2l() sysdeps/i386/fpu/e_atan2l.c > sqrtl() sysdeps/i386/fpu/e_sqrtl.c > llrintl() sysdeps/x86_64/fpu/s_llrintl.S > lrintl() sysdeps/x86_64/fpu/s_llrintl.S > sinl() sysdeps/x86_64/fpu/s_sinl.S > cosl() sysdeps/x86_64/fpu/s_cosl.S > tanl() sysdeps/x86_64/fpu/s_tanl.S > logl() sysdeps/x86_64/fpu/e_logl.S > powl() sysdeps/x86_64/fpu/e_powl.S > remainderl() sysdeps/x86_64/fpu/e_remainderl.S > > Just enough to compile QEMU snapshot until we complete C99 > project. ;-) Similarly you can add other architectures under > bsd/${MACHINE_ARCH}. So we need different versions of these for i386 hosts? And how about 4.x i386 hosts? Obviously the port should still run on those too. Juergen From owner-freebsd-emulation@FreeBSD.ORG Fri Apr 15 21:14:01 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72FB216A4CE; Fri, 15 Apr 2005 21:14:01 +0000 (GMT) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id E40C943D5D; Fri, 15 Apr 2005 21:13:57 +0000 (GMT) (envelope-from jkim@niksun.com) Received: from [10.70.0.244] (daemon.mj.niksun.com [10.70.0.244]) by anuket.mj.niksun.com (8.13.1/8.12.11) with ESMTP id j3FLDuIT000836; Fri, 15 Apr 2005 17:13:57 -0400 (EDT) (envelope-from jkim@niksun.com) From: Jung-uk Kim Organization: Niksun, Inc. To: Juergen Lock Date: Fri, 15 Apr 2005 17:13:54 -0400 User-Agent: KMail/1.6.2 References: <200504131635.26063.jkim@niksun.com> <20050415215142.A68957@saturn.kn-bremen.de> In-Reply-To: <20050415215142.A68957@saturn.kn-bremen.de> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200504151713.54185.jkim@niksun.com> X-Virus-Scanned: ClamAV version 0.83, clamav-milter version 0.83 on anuket.mj.niksun.com X-Virus-Status: Clean cc: freebsd-emulation@freebsd.org cc: freebsd-amd64@freebsd.org Subject: Re: QEMU on FreeBSD/amd64 (patches) X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 21:14:01 -0000 On Friday 15 April 2005 03:51 pm, Juergen Lock wrote: > On Wed, Apr 13, 2005 at 04:35:26PM -0400, Jung-uk Kim wrote: > > I finally manage to build QEMU snapshot on FreeBSD/amd64 > > 6-CURRENT. > > Nice! > > > There's ports/emulators/qemu but it doesn't build on AMD64 for > > several reasons, i. e., QEMU and FreeBSD are both fast moving > > targets (esp. src/lib/msun), some long double math functions > > don't exist on FreeBSD, > > So the replacements in files/patch-aa in the port didnt work for > amd64? (the ones #if defined(_BSD) && defined(USE_X86LDOUBLE)) Correct. > > GCC in base system doesn't build QEMU because of several > > optimization bugs specific to AMD64, etc. > > > > 1. Install GCC 3.4 from ports. > > > > Anything newer than 20050316 should work. (Theoretically you can > > use gcc40 newer than 20041127 but not verified. Actually I am > > using patched version of src/contrib/gcc. ;-) > > > > 2. Install following dependencies from ports: > > > > devel/gmake (of course) > > net/samba > > devel/sdl12 > > > > I believe samba is optional but sdl12 is not. It doesn't work > > without SDL because `-nographic' option is broken. I believe it > > is an upstream bug (related to FreeBSD's pty or termios, i. e., > > fail to get correct term size and segfault) but I couldn't > > pin-point the culprit yet. In fact, I didn't bother too much > > because SDL worked just fine. ;-) > > Samba is needed for the -smb option (export a local dir to > guest), if you don't use that you can omit samba thats true. Understood. > >[...] > > Note 2: qemu-libmath-amd64.diff contains C99 long double math > > functions taken from glibc-2.3.5 and modified for FreeBSD/amd64: > > > > http://ftp.gnu.org/gnu/glibc/ > > http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/?cvsroot=glibc > > > > rintl() sysdeps/i386/fpu/s_rintl.c > > atan2l() sysdeps/i386/fpu/e_atan2l.c > > sqrtl() sysdeps/i386/fpu/e_sqrtl.c > > llrintl() sysdeps/x86_64/fpu/s_llrintl.S > > lrintl() sysdeps/x86_64/fpu/s_llrintl.S > > sinl() sysdeps/x86_64/fpu/s_sinl.S > > cosl() sysdeps/x86_64/fpu/s_cosl.S > > tanl() sysdeps/x86_64/fpu/s_tanl.S > > logl() sysdeps/x86_64/fpu/e_logl.S > > powl() sysdeps/x86_64/fpu/e_powl.S > > remainderl() sysdeps/x86_64/fpu/e_remainderl.S > > > > Just enough to compile QEMU snapshot until we complete C99 > > project. ;-) Similarly you can add other architectures under > > bsd/${MACHINE_ARCH}. > > So we need different versions of these for i386 hosts? Yes. > And how about 4.x i386 hosts? We need to add more #if's, of course. ;-) > Obviously the port should still run on those too. I know. I just wanted to tell people that it's possible. I will post a patch for those two cases when I find some free time. Thanks, Jung-uk Kim > Juergen