Import of pkgsrc-2016Q3

x11/slock/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/01/09 14:34:54 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/28 19:49:06 joerg Exp $
 
-DISTNAME=		slock-1.2
+DISTNAME=		slock-1.3
 CATEGORIES=		x11
 MASTER_SITES=		http://dl.suckless.org/tools/
 
@@ -11,21 +11,28 @@ LICENSE=		mit
 
 MAKE_JOBS_SAFE=	no
 
-NO_CONFIGURE=		yes
-
-# Adjust config.mk
 SUBST_CLASSES+=		makefile
-SUBST_STAGE.makefile=	pre-build
-SUBST_MESSAGE.makefile=	Fixing config.mk
+SUBST_STAGE.makefile=	pre-configure
+SUBST_MESSAGE.makefile=	Adjust config.mk
 SUBST_FILES.makefile=	config.mk
 SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.makefile+=	-e 's,/usr/X11R6,${X11BASE},'
 SUBST_SED.makefile+=	-e '/^CPPFLAGS/ s,-DHAVE_SHADOW_H,,'
 SUBST_SED.makefile+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
+SUBST_SED.makefile+=	-e 's,^CPPFLAGS *= ,CPPFLAGS += ,'
 SUBST_SED.makefile+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
 SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
 
-INSTALLATION_DIRS=	bin share/doc/slock
+# Bump _XOPEN_SOURCE version to 600 in order to avoid "Compiler or options
+# invalid for pre-UNIX 03 X/Open applications" error on SunOS.
+SUBST_CLASSES+=		slock
+SUBST_STAGE.slock=	pre-configure
+SUBST_MESSAGE.slock=	Bump _XOPEN_SOURCE version
+SUBST_FILES.slock=	slock.c
+SUBST_SED.slock+=	-e '/_XOPEN_SOURCE/ s/500/600/'
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,4 +49,6 @@ SPECIAL_PERMS+=	bin/slock ${SETUID_ROOT_PERMS}
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

x11/slock/PLIST

@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2015/01/06 13:32:25 mef Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/02/16 17:47:19 leot Exp $
 bin/slock
+man/man1/slock.1

x11/slock/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/01/06 13:32:25 mef Exp $
+$NetBSD: distinfo,v 1.5 2016/02/16 17:47:19 leot Exp $
 
-SHA1 (slock-1.2.tar.gz) = 15c5be7c10d7d278882723197255179ffef9c5b1
-RMD160 (slock-1.2.tar.gz) = f08441f59ea6eb58bab7031575548813793d1014
-Size (slock-1.2.tar.gz) = 4853 bytes
+SHA1 (slock-1.3.tar.gz) = 5e370b09b1644cd0f2490ed55209dd8f9e83e25b
+RMD160 (slock-1.3.tar.gz) = 9b352dff97ecebe4ccd971e54e8bdf4348964b12
+SHA512 (slock-1.3.tar.gz) = 5024588f6d25f9d72a9d2b8ef9d8a2a94e5d5e53f30f4a15df83b693a3706b1ad6550422f36af29f54429a9c516d14a349e46aeb9896c6e32009ff0da5c02a8f
+Size (slock-1.3.tar.gz) = 5943 bytes