NetBSD Problem Report #49063

From iamleot@gmail.com  Fri Aug  1 21:21:55 2014
Return-Path: <iamleot@gmail.com>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 6B3C1A8A3E
	for <gnats-bugs@gnats.netbsd.org>; Fri,  1 Aug 2014 21:21:55 +0000 (UTC)
Message-Id: <53dc04ef.e335c20a.2c4f.5b07@mx.google.com>
Date: Fri, 01 Aug 2014 14:21:51 -0700 (PDT)
From: Leonardo Taccari <iamleot@gmail.com>
Reply-To: Leonardo Taccari <iamleot@gmail.com>
To: gnats-bugs@gnats.NetBSD.org
Subject: Update x11/slock to 1.1
X-Send-Pr-Version: 3.95

>Number:         49063
>Category:       pkg
>Synopsis:       Update x11/slock to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    reed
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 01 21:25:00 +0000 2014
>Closed-Date:    Tue Jan 06 13:33:54 +0000 2015
>Last-Modified:  Tue Jan 06 13:35:00 +0000 2015
>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

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->reed
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Fri, 01 Aug 2014 23:49:57 +0000
Responsible-Changed-Why:
Over to maintainer.


From: Leonardo Taccari <iamleot@gmail.com>
To: gnats-bugs@NetBSD.org
Cc: reed@reedmedia.net
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<---------------=
 ----

State-Changed-From-To: open->closed
State-Changed-By: mef@NetBSD.org
State-Changed-When: Tue, 06 Jan 2015 13:33:54 +0000
State-Changed-Why:
Patch committed, thanks Leonardo.


From: "Makoto Fujiwara" <mef@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/49063 CVS commit: pkgsrc/x11/slock
Date: Tue, 6 Jan 2015 13:32:25 +0000

 Module Name:	pkgsrc
 Committed By:	mef
 Date:		Tue Jan  6 13:32:25 UTC 2015

 Modified Files:
 	pkgsrc/x11/slock: Makefile PLIST distinfo

 Log Message:
 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


 To generate a diff of this commit:
 cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/slock/Makefile
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/slock/PLIST pkgsrc/x11/slock/distinfo

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

Home	PR Database Search