Ok. Thanks.
On Mon, May 25, 2009 at 09:31:07AM -0400, Jim Razmus wrote: > I've had a very similar patch in my tree waiting on an OK from Gleysdon. > It's being reviewed and I expect to commit it as soon I get the OK. > > Jim > > * Abel Camarillo <[email protected]> [090524 19:45]: > > This update fixes a problem that some users (like me) experienced when > > using mplayer on fullscreen and tried to run slock (the DPMS error): > > > > http://lists.suckless.org/dwm/0804/5417.html > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/x11/slock/Makefile,v > > retrieving revision 1.5 > > diff -u -r1.5 Makefile > > --- Makefile 2 Jun 2008 20:09:53 -0000 1.5 > > +++ Makefile 24 May 2009 23:39:34 -0000 > > @@ -2,11 +2,11 @@ > > > > COMMENT= simple X screen locker > > > > -DISTNAME= slock-0.8 > > +DISTNAME= slock-0.9 > > > > CATEGORIES= x11 > > > > -HOMEPAGE= http://www.suckless.org/wiki/tools/xlib > > +HOMEPAGE= http://www.suckless.org/ > > > > MAINTAINER= Gleydson Soares <[email protected]> > > > > @@ -18,7 +18,7 @@ > > > > WANTLIB= X11 c Xext > > > > -MASTER_SITES= http://www.suckless.org/download/ > > +MASTER_SITES= http://code.suckless.org/dl/tools/ > > > > MAKE_ENV= CC="${CC}" \ > > LDFLAGS="${LDFLAGS}" > > Index: distinfo > > =================================================================== > > RCS file: /cvs/ports/x11/slock/distinfo,v > > retrieving revision 1.5 > > diff -u -r1.5 distinfo > > --- distinfo 2 Jun 2008 20:09:53 -0000 1.5 > > +++ distinfo 24 May 2009 23:33:28 -0000 > > @@ -1,5 +1,5 @@ > > -MD5 (slock-0.8.tar.gz) = b6buFqmJPsFXA0P+U76AbQ== > > -RMD160 (slock-0.8.tar.gz) = FmYf2iQEHFk/SzBUg0kQPtW/gFQ= > > -SHA1 (slock-0.8.tar.gz) = LmLnHqLx7/VkJyu+MJlDjO5nU+I= > > -SHA256 (slock-0.8.tar.gz) = l548MmosigTqcNQgs07kwBigUs0XduH6Z9dJHMjsa+I= > > -SIZE (slock-0.8.tar.gz) = 3730 > > +MD5 (slock-0.9.tar.gz) = 3zQq0SnPLDuOuNqdnQq4RQ== > > +RMD160 (slock-0.9.tar.gz) = yrfQ4fWdBflsGnRRHsGFA3JusL0= > > +SHA1 (slock-0.9.tar.gz) = k5zrn07CdGaOw3o4z6PYFS32j4w= > > +SHA256 (slock-0.9.tar.gz) = id23PLt5AQwZeccnIjROUgjy0v6YFZc5+n6YKFgU170= > > +SIZE (slock-0.9.tar.gz) = 3772 > > Index: patches/patch-Makefile > > =================================================================== > > RCS file: /cvs/ports/x11/slock/patches/patch-Makefile,v > > retrieving revision 1.2 > > diff -u -r1.2 patch-Makefile > > --- patches/patch-Makefile 2 Jun 2008 20:09:53 -0000 1.2 > > +++ patches/patch-Makefile 24 May 2009 23:15:21 -0000 > > @@ -1,8 +1,8 @@ > > $OpenBSD: patch-Makefile,v 1.2 2008/06/02 20:09:53 wcmaier Exp $ > > ---- Makefile.orig Thu Mar 13 11:58:47 2008 > > -+++ Makefile Mon Jun 2 14:55:45 2008 > > -@@ -16,14 +16,12 @@ options: > > - @echo "LD = ${LD}" > > +--- Makefile.orig Tue Jul 29 13:22:46 2008 > > ++++ Makefile Sun May 24 18:14:49 2009 > > +@@ -15,33 +15,24 @@ options: > > + @echo "CC = ${CC}" > > > > .c.o: > > - @echo CC $< > > @@ -12,13 +12,22 @@ > > ${OBJ}: config.mk > > > > slock: ${OBJ} > > -- @echo LD $@ > > -- @${LD} -o $@ ${OBJ} ${LDFLAGS} > > -+ ${LD} -o $@ ${OBJ} ${LDFLAGS} > > - @strip $@ > > +- @echo CC -o $@ > > +- @${CC} -o $@ ${OBJ} ${LDFLAGS} > > ++ ${CC} -o $@ ${OBJ} ${LDFLAGS} > > > > clean: > > -@@ -40,10 +38,7 @@ dist: clean > > + @echo cleaning > > + @rm -f slock ${OBJ} slock-${VERSION}.tar.gz > > + > > + dist: clean > > +- @echo creating dist tarball > > +- @mkdir -p slock-${VERSION} > > +- @cp -R LICENSE Makefile README config.mk ${SRC} slock-${VERSION} > > +- @tar -cf slock-${VERSION}.tar slock-${VERSION} > > +- @gzip slock-${VERSION}.tar > > + @rm -rf slock-${VERSION} > > ++ @${BSD_INSTALL_PROGRAM} slock ${DESTDIR}${PREFIX}/bin > > > > install: all > > @echo installing executable file to ${DESTDIR}${PREFIX}/bin > > Index: patches/patch-config_mk > > =================================================================== > > RCS file: /cvs/ports/x11/slock/patches/patch-config_mk,v > > retrieving revision 1.3 > > diff -u -r1.3 patch-config_mk > > --- patches/patch-config_mk 2 Jun 2008 20:09:53 -0000 1.3 > > +++ patches/patch-config_mk 24 May 2009 23:26:47 -0000 > > @@ -1,7 +1,7 @@ > > $OpenBSD: patch-config_mk,v 1.3 2008/06/02 20:09:53 wcmaier Exp $ > > ---- config.mk.orig Thu Mar 13 11:58:47 2008 > > -+++ config.mk Mon Jun 2 14:48:38 2008 > > -@@ -4,18 +4,18 @@ VERSION = 0.8 > > +--- config.mk.orig Tue Jul 29 13:22:46 2008 > > ++++ config.mk Sun May 24 18:26:38 2009 > > +@@ -4,27 +4,27 @@ VERSION = 0.9 > > # Customize below to fit your system > > > > # paths > > @@ -20,20 +20,19 @@ > > +LIBS = -L${X11LIB} -lX11 -lXext > > > > # flags > > --CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H > > --LDFLAGS = ${LIBS} > > -+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_BSD_AUTH > > -+LDFLAGS += ${LIBS} > > - #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H > > - #LDFLAGS = -g ${LIBS} > > +-CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H > > +-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} > > +-LDFLAGS = -s ${LIBS} > > ++CPPFLAGS += -DVERSION=\"${VERSION}\" -DHAVE_BSD_AUTH > > ++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} > > ++LDFLAGS += -s ${LIBS} > > > > -@@ -23,10 +23,10 @@ LDFLAGS = ${LIBS} > > + # On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH > > # On OpenBSD and Darwin remove -lcrypt from LIBS > > > > # compiler and linker > > -CC = cc > > +CC ?= cc > > - LD = ${CC} > > > > # Install mode. On BSD systems MODE=2755 and GROUP=auth > > # On others MODE=4755 and GROUP=root > > Index: pkg/PLIST > > =================================================================== > > RCS file: /cvs/ports/x11/slock/pkg/PLIST,v > > retrieving revision 1.2 > > diff -u -r1.2 PLIST > > --- pkg/PLIST 26 Jan 2008 18:48:19 -0000 1.2 > > +++ pkg/PLIST 24 May 2009 23:33:37 -0000 > > @@ -1,4 +1,4 @@ > > @comment $OpenBSD: PLIST,v 1.2 2008/01/26 18:48:19 matthieu Exp $ > > @mode g+s > > @group auth > > -bin/slock > > +...@bin bin/slock > > > > -- > > DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/ > > This message will self-destruct in 3 seconds. > > > -- DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/ This message will self-destruct in 3 seconds.
