pkg/49063: Update x11/slock to 1.1

[Leonardo Taccari <iamleot%gmail.com@localhost>]

>Number:         49063
>Category:       pkg
>Synopsis:       Update x11/slock to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 01 21:25:00 +0000 2014
>Originator:     Leonardo Taccari
>Release:        NetBSD 6.1.4
>Organization:
The NetBSD community
>Environment:
        
        
System: NetBSD :) 6.1.4 NetBSD 6.1.4 (EEEPC900) #2: Sun Jun 29 02:00:06 CEST 
2014 leot@:):/usr/src/sys/arch/i386/compile/EEEPC900 i386
Architecture: i386
Machine: i386
>Description:
        slock in pkgsrc (1.0) is not the latest stable version (1.1).
>How-To-Repeat:
        $ cd pkgsrc/x11/slock
        $ make show-var VARNAME=PKGNAME_NOREV
>Fix:
        Please apply the attached patches.

        While here I will also append a possible commit message, for more
        information please give a look to the original announcement of
        slock-1.1:
         http://lists.suckless.org/dev/1210/13048.html


-------------------8<-----------------8<-----------------8<-------------------
Update x11/slock to slock-1.1.

Changes:
 o Eckhards dualcolor patch
 o Minor bug fixes
-------------------8<-----------------8<-----------------8<-------------------


-------------------8<-----------------8<-----------------8<-------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/slock/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile    29 Oct 2012 05:06:52 -0000      1.5
+++ Makefile    1 Aug 2014 20:59:43 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.5 2012/10/29 05:06:52 asau Exp $
 
-DISTNAME=              slock-1.0
+DISTNAME=              slock-1.1
 CATEGORIES=            x11
 MASTER_SITES=          http://dl.suckless.org/tools/
 
@@ -15,14 +15,16 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if !(${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly")
-CFLAGS+=-DHAVE_SHADOW_H
+CFLAGS+=       -DHAVE_SHADOW_H
 .endif
 
-# TODO: handle -lcrypt too
+.if !(${OPSYS} == "OpenBSD" || ${OPSYS} == "Darwin")
 LIBS+= -lcrypt
+.endif
 
 do-build:
-       cd ${WRKSRC} && ${CC} -c -DVERSION=\"1.0\" ${CFLAGS} slock.c && \
+       cd ${WRKSRC} && ${CC} -c -DVERSION=\"1.1\" -DCOLOR1=\"black\" \
+               -DCOLOR2=\"\#005577\" ${CFLAGS} slock.c && \
                ${CC} -o slock slock.o -lc ${LIBS} ${X11_LDFLAGS} -lX11
 
 SPECIAL_PERMS+=        bin/slock ${SETUID_ROOT_PERMS}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/slock/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo    23 May 2012 17:10:50 -0000      1.2
+++ distinfo    1 Aug 2014 20:59:43 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.2 2012/05/23 17:10:50 reed Exp $
 
-SHA1 (slock-1.0.tar.gz) = 38cef8503d512252e8f3f8275200e802990892c5
-RMD160 (slock-1.0.tar.gz) = 3fc1aa6c6aae9bfba59049a44f0330bef702f2df
-Size (slock-1.0.tar.gz) = 4313 bytes
+SHA1 (slock-1.1.tar.gz) = 3eb71d2ddabdfc9d7d6d4d6fbd39d2f83fad351e
+RMD160 (slock-1.1.tar.gz) = 4c8e1c3c603f9cf467c9118f443ff09f5d2e403f
+Size (slock-1.1.tar.gz) = 4604 bytes

>Unformatted: