From owner-freebsd-ports Wed Mar 15 15:56:50 2000 Delivered-To: freebsd-ports@freebsd.org Received: from camtech.net.au (goliath.camtech.net.au [203.5.73.2]) by hub.freebsd.org (Postfix) with SMTP id C6C8437BD31 for ; Wed, 15 Mar 2000 15:56:46 -0800 (PST) (envelope-from thyerm@camtech.net.au) Received: from camtech.net.au ([203.55.243.157]) by camtech.net.au ; Thu, 16 Mar 2000 04:26:10 +1030 Message-ID: <38CFCEF1.70EB200B@camtech.net.au> Date: Thu, 16 Mar 2000 04:27:05 +1030 From: Matthew Thyer Reply-To: thyerm@camtech.net.au X-Mailer: Mozilla 4.72 [en] (X11; I; FreeBSD 4.0-CURRENT i386) X-Accept-Language: en MIME-Version: 1.0 To: Thomas Gellekum , bagleyd@tux.org Cc: ports@FreeBSD.org Subject: Re: xlockmore-4.15 wont build with XFree86-4.0 References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Thomas Gellekum wrote: > > Matthew Sean Thyer writes: > > > ===> Building for xlockmore-4.15 > > cc -c -o ./xlock.o -DHAVE_CONFIG_H > > -DDEF_FILESEARCHPATH=\"/usr/X11R6/lib/X11/app-defaults/%N%C%S:/usr/X11R6/lib/X11/app-defaults/%N%S\" -I > > . -I.. -I../.. -I/usr/X11R6/include -I/usr/X11R6/include > > -I/usr/X11R6/include/X11 -I/usr/X11R6/include -O -pipe ./xlock.c > > In file included from ./xlock.c:594: > > /usr/X11R6/include/X11/extensions/dpms.h:48: syntax error before `CARD16' > > I'm sure David Bagley , the author of xlockmore, will > appreciate patches. I don't run XFree86-4, so I don't know what's > wrong. > > tg Through some simple hacking I've managed to get xlockmore-4.15 to compile, install and run as usual under XFree86 version 4.0. Note these are minimal changes to make it work and are probably not the right thing to do but I dont care as I'm happy now that it works! Hopefully someone more enlightened than me (the author maybe?) can fix the program properly to cope with XFree86 version 4.X What I did: 1) Removed the -lXdpms from XLOCKLIBS in modes/Makefile 2) changed xlock/xlock.c as follows: new: {38} diff -u xlock/xlock.c.orig xlock/xlock.c --- xlock/xlock.c.orig Thu Mar 16 04:04:15 2000 +++ xlock/xlock.c Thu Mar 16 04:04:30 2000 @@ -591,8 +591,8 @@ #endif #ifdef USE_DPMS #define MIN_DPMS 30 /* 30 second minimum */ +#include #include -extern unsigned char DPMSQueryExtension(Display *, int *, int *); extern int DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *); extern int DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short); extern int dpmsstandby; -- /=======================================================================\ | Work: Matthew.Thyer@dsto.defence.gov.au | Home: thyerm@camtech.net.au | \=======================================================================/ "If it is true that our Universe has a zero net value for all conserved quantities, then it may simply be a fluctuation of the vacuum of some larger space in which our Universe is imbedded. In answer to the question of why it happened, I offer the modest proposal that our Universe is simply one of those things which happen from time to time." E. P. Tryon from "Nature" Vol.246 Dec.14, 1973 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message