Date: Tue, 07 Aug 2001 09:23:48 +0900 From: "R. Lahaye" <lahaye@users.sourceforge.net> To: nakai@FreeBSD.org Cc: ports@FreeBSD.org Subject: FreeBSD Port: xfce-3.8.6 Message-ID: <3B6F3514.A0E677E1@users.sourceforge.net>
next in thread | raw e-mail | index | archive | help
Hi, I've upgraded the xfce port to xfce-3.8.6 The make ends with an error during the patches: -------------------------------------------------------------------- # make >> xfce-3.8.6.tar.gz doesn't seem to exist in /usr/ports/distfiles/. >> Attempting to fetch from http://www.xfce.org/archive/. Receiving xfce-3.8.6.tar.gz (3916552 bytes): 100% 3916552 bytes transferred in 91.6 seconds (41.76 kBps) ===> Extracting for xfce-3.8.6 >> Checksum OK for xfce-3.8.6.tar.gz. ===> xfce-3.8.6 depends on executable: libtool - found ===> xfce-3.8.6 depends on shared library: gdk_pixbuf.2 - found ===> xfce-3.8.6 depends on shared library: Xpm.4 - found ===> xfce-3.8.6 depends on shared library: X11.6 - found ===> xfce-3.8.6 depends on shared library: glib12.3 - found ===> xfce-3.8.6 depends on shared library: gtk12.2 - found ===> Patching for xfce-3.8.6 ===> Applying FreeBSD patches for xfce-3.8.6 Ignoring previously applied (or reversed) patch. 2 out of 2 hunks ignored--saving rejects to xfsound/xfdsp.c.rej >> Patch patch-ai failed to apply cleanly. *** Error code 1 Stop in /usr/ports/x11-wm/xfce. *** Error code 1 Stop in /usr/ports/x11-wm/xfce. *** Error code 1 Stop in /usr/ports/x11-wm/xfce. *** Error code 1 Stop in /usr/ports/x11-wm/xfce. *** Error code 1 Stop in /usr/ports/x11-wm/xfce. ------------------------------------------------- xfsound/xfdsp.c.rej contains: *************** *** 45,51 **** #include <sys/stat.h> #include <sys/ioctl.h> #include <sys/types.h> - #if defined(linux) #include <sys/soundcard.h> /* guess :) */ #endif --- 45,51 ---- #include <sys/stat.h> #include <sys/ioctl.h> #include <sys/types.h> + #if defined(linux) || defined(__FreeBSD__) #include <sys/soundcard.h> /* guess :) */ #endif *************** *** 62,68 **** int masterfd; - #if defined(linux) int i_play (char *soundfile) { --- 62,68 ---- int masterfd; + #if defined(linux) || defined(__FreeBSD__) int i_play (char *soundfile) { ----------------------------------------------------- Regards, Rob. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3B6F3514.A0E677E1>