Tue Jan 6 13:32:25 2015 UTC ()
Update 1.0 to 1.2 based on PR pkg/49063 by Leonardo Taccari.
(pkgsrc)
  - Instead of using do-* in Makefile adjust config.mk and use the
    official Makefile like other suckless.org packages (e.g. x11/dmenu).
  - Do not install README: the only useful information for the user was:
    Simply invoke the 'slock' command. To get out of it, enter your
    password. The user can read that in x11/slock/DESCR by
    pkg_info slock.
(upstream)
  * slock-1.2:
    - Colors are now specified via config.h
    - Minor bug fixes

  * slock-1.1:
    - Eckhards dualcolor patch
    - Minor bug fixes


(mef)
diff -r1.5 -r1.6 pkgsrc/x11/slock/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/slock/PLIST
diff -r1.2 -r1.3 pkgsrc/x11/slock/distinfo
cvs diff -r1.5 -r1.6 pkgsrc/x11/slock/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/slock/Makefile 2012/10/29 05:06:52 1.5
+++ pkgsrc/x11/slock/Makefile 2015/01/06 13:32:25 1.6
@@ -1,35 +1,44 @@ @@ -1,35 +1,44 @@
1# $NetBSD: Makefile,v 1.5 2012/10/29 05:06:52 asau Exp $ 1# $NetBSD: Makefile,v 1.6 2015/01/06 13:32:25 mef Exp $
2 2
3DISTNAME= slock-1.0 3DISTNAME= slock-1.2
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= http://dl.suckless.org/tools/ 5MASTER_SITES= http://dl.suckless.org/tools/
6 6
7MAINTAINER= reed@reedmedia.net 7MAINTAINER= reed@reedmedia.net
8HOMEPAGE= http://tools.suckless.org/slock 8HOMEPAGE= http://tools.suckless.org/slock
9COMMENT= Simple X11 screen locker 9COMMENT= Simple X11 screen locker
10LICENSE= mit 10LICENSE= mit
11 11
 12MAKE_JOBS_SAFE= no
 13
12NO_CONFIGURE= yes 14NO_CONFIGURE= yes
 15
 16# Adjust config.mk
 17SUBST_CLASSES+= makefile
 18SUBST_STAGE.makefile= pre-build
 19SUBST_MESSAGE.makefile= Fixing config.mk
 20SUBST_FILES.makefile= config.mk
 21SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
 22SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},'
 23SUBST_SED.makefile+= -e '/^CPPFLAGS/ s,-DHAVE_SHADOW_H,,'
 24SUBST_SED.makefile+= -e 's,^CFLAGS *= ,CFLAGS += ,'
 25SUBST_SED.makefile+= -e 's,^LDFLAGS *= ,LDFLAGS += ,'
 26SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
 27
13INSTALLATION_DIRS= bin share/doc/slock 28INSTALLATION_DIRS= bin share/doc/slock
14 29
15.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
16 31
17.if !(${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly") 32.if !(${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly")
18CFLAGS+=-DHAVE_SHADOW_H 33CFLAGS+= -DHAVE_SHADOW_H
19.endif 34.endif
20 35
21# TODO: handle -lcrypt too 36.if !(${OPSYS} == "OpenBSD" || ${OPSYS} == "Darwin")
22LIBS+= -lcrypt 37LIBS+= -lcrypt
23 38
24do-build: 39.endif
25 cd ${WRKSRC} && ${CC} -c -DVERSION=\"1.0\" ${CFLAGS} slock.c && \ 
26 ${CC} -o slock slock.o -lc ${LIBS} ${X11_LDFLAGS} -lX11 
27 40
28SPECIAL_PERMS+= bin/slock ${SETUID_ROOT_PERMS} 41SPECIAL_PERMS+= bin/slock ${SETUID_ROOT_PERMS}
29 42
30do-install: 
31 ${INSTALL_PROGRAM} ${WRKSRC}/slock ${DESTDIR}${PREFIX}/bin/ 
32 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/slock/ 
33 
34.include "../../x11/libX11/buildlink3.mk" 43.include "../../x11/libX11/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/x11/slock/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/slock/PLIST 2009/06/14 18:25:06 1.2
+++ pkgsrc/x11/slock/PLIST 2015/01/06 13:32:25 1.3
@@ -1,3 +1,2 @@ @@ -1,3 +1,2 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:06 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2015/01/06 13:32:25 mef Exp $
2bin/slock 2bin/slock
3share/doc/slock/README 
cvs diff -r1.2 -r1.3 pkgsrc/x11/slock/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/slock/distinfo 2012/05/23 17:10:50 1.2
+++ pkgsrc/x11/slock/distinfo 2015/01/06 13:32:25 1.3
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.2 2012/05/23 17:10:50 reed Exp $ 1$NetBSD: distinfo,v 1.3 2015/01/06 13:32:25 mef Exp $
2 2
3SHA1 (slock-1.0.tar.gz) = 38cef8503d512252e8f3f8275200e802990892c5 3SHA1 (slock-1.2.tar.gz) = 15c5be7c10d7d278882723197255179ffef9c5b1
4RMD160 (slock-1.0.tar.gz) = 3fc1aa6c6aae9bfba59049a44f0330bef702f2df 4RMD160 (slock-1.2.tar.gz) = f08441f59ea6eb58bab7031575548813793d1014
5Size (slock-1.0.tar.gz) = 4313 bytes 5Size (slock-1.2.tar.gz) = 4853 bytes