Re: pkg/49063: Update x11/slock to 1.1

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

The following reply was made to PR pkg/49063; it has been noted by GNATS.

From: Leonardo Taccari <iamleot%gmail.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: reed%reedmedia.net@localhost
Subject: Re: pkg/49063: Update x11/slock to 1.1
Date: Mon, 05 Jan 2015 22:26:13 +0100

 Hello to all pkgsrc-bugs@ readers and bug squashers,
 actually the latest stable version of x11/slock is 1.2... So I will
 attach a possible commit message and patches.
 This time I have also adjusted a bit the Makefile and removed all the
 do-* target. IMO it's easier to adjust config.mk and directly use the
 Makefile in ${WRKSRC}. More or less a copy-and-paste from x11/dmenu (all
 suckless.org projects uses similar Makefile and config.mk).
  =
 
 
 Thank you for your attention!
 Ciao,
 L.
 
 
 -------------------8<-----------------8<-----------------8<---------------=
 ----
 Update x11/slock to slock-1.2.
  =
 
 Changes:
  * slock-1.2:
    - Colors are now specified via config.h
    - Minor bug fixes
 
  * slock-1.1:
    - Eckhards dualcolor patch
    - Minor bug fixes
 
 pkgsrc changes:
  * 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:
    =C2=ABSimply invoke the 'slock' command. To get out of it, enter your
    password.=C2=BB. The user can read that in x11/slock/DESCR too.
 -------------------8<-----------------8<-----------------8<---------------=
 ----
 
 
 -------------------8<-----------------8<-----------------8<---------------=
 ----
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 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	5 Jan 2015 21:19:11 -0000
 @@ -1,6 +1,6 @@
  # $NetBSD: Makefile,v 1.5 2012/10/29 05:06:52 asau Exp $
  =
 
 -DISTNAME=3D		slock-1.0
 +DISTNAME=3D		slock-1.2
  CATEGORIES=3D		x11
  MASTER_SITES=3D		http://dl.suckless.org/tools/
  =
 
 @@ -9,27 +9,34 @@
  COMMENT=3D		Simple X11 screen locker
  LICENSE=3D		mit
  =
 
 +MAKE_JOBS_SAFE=3D	no
 +
  NO_CONFIGURE=3D		yes
 -INSTALLATION_DIRS=3D	bin share/doc/slock
 +INSTALLATION_DIRS=3D	bin
 +
 +# Adjust config.mk
 +SUBST_CLASSES+=3D		makefile
 +SUBST_STAGE.makefile=3D	pre-build
 +SUBST_MESSAGE.makefile=3D	Fixing config.mk
 +SUBST_FILES.makefile=3D	config.mk
 +SUBST_SED.makefile+=3D	-e 's,/usr/local,${PREFIX},g'
 +SUBST_SED.makefile+=3D	-e 's,/usr/X11R6,${X11BASE},'
 +SUBST_SED.makefile+=3D	-e '/^CPPFLAGS/ s,-DHAVE_SHADOW_H,,'
 +SUBST_SED.makefile+=3D	-e 's,^CFLAGS *=3D ,CFLAGS +=3D ,'
 +SUBST_SED.makefile+=3D	-e 's,^LDFLAGS *=3D ,LDFLAGS +=3D ,'
 +SUBST_SED.makefile+=3D	-e 's/cc/${CC:Q}/'
  =
 
  .include "../../mk/bsd.prefs.mk"
  =
 
  .if !(${OPSYS:M*BSD} !=3D "" || ${OPSYS} =3D=3D "Darwin" || ${OPSYS} =3D=3D=
  "DragonFly")
 -CFLAGS+=3D-DHAVE_SHADOW_H
 +CFLAGS+=3D	-DHAVE_SHADOW_H
  .endif
  =
 
 -# TODO: handle -lcrypt too
 +.if !(${OPSYS} =3D=3D "OpenBSD" || ${OPSYS} =3D=3D "Darwin")
  LIBS+=3D	-lcrypt
 -
 -do-build:
 -	cd ${WRKSRC} && ${CC} -c -DVERSION=3D\"1.0\" ${CFLAGS} slock.c && \
 -		${CC} -o slock slock.o -lc ${LIBS} ${X11_LDFLAGS} -lX11
 +.endif
  =
 
  SPECIAL_PERMS+=3D	bin/slock ${SETUID_ROOT_PERMS}
  =
 
 -do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/slock ${DESTDIR}${PREFIX}/bin/
 -	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/slock/
 -
  .include "../../x11/libX11/buildlink3.mk"
  .include "../../mk/bsd.pkg.mk"
 Index: PLIST
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvsroot/pkgsrc/x11/slock/PLIST,v
 retrieving revision 1.2
 diff -u -r1.2 PLIST
 --- PLIST	14 Jun 2009 18:25:06 -0000	1.2
 +++ PLIST	5 Jan 2015 21:19:11 -0000
 @@ -1,3 +1,2 @@
  @comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:06 joerg Exp $
  bin/slock
 -share/doc/slock/README
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 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	5 Jan 2015 21:19:11 -0000
 @@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.2 2012/05/23 17:10:50 reed Exp $
  =
 
 -SHA1 (slock-1.0.tar.gz) =3D 38cef8503d512252e8f3f8275200e802990892c5
 -RMD160 (slock-1.0.tar.gz) =3D 3fc1aa6c6aae9bfba59049a44f0330bef702f2df
 -Size (slock-1.0.tar.gz) =3D 4313 bytes
 +SHA1 (slock-1.2.tar.gz) =3D 15c5be7c10d7d278882723197255179ffef9c5b1
 +RMD160 (slock-1.2.tar.gz) =3D f08441f59ea6eb58bab7031575548813793d1014
 +Size (slock-1.2.tar.gz) =3D 4853 bytes
 -------------------8<-----------------8<-----------------8<---------------=
 ----