Import of pkgsrc-2015Q1

x11/slock/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2012/10/29 05:06:52 asau Exp $
+# $NetBSD: Makefile,v 1.7 2015/01/09 14:34:54 joerg Exp $
 
-DISTNAME=		slock-1.0
+DISTNAME=		slock-1.2
 CATEGORIES=		x11
 MASTER_SITES=		http://dl.suckless.org/tools/
 
@@ -9,27 +9,37 @@ HOMEPAGE=		http://tools.suckless.org/slock
 COMMENT=		Simple X11 screen locker
 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_FILES.makefile=	config.mk
+SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},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,^LDFLAGS *= ,LDFLAGS += ,'
+SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
+
 INSTALLATION_DIRS=	bin share/doc/slock
 
 .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
 
-do-build:
-	cd ${WRKSRC} && ${CC} -c -DVERSION=\"1.0\" ${CFLAGS} slock.c && \
-		${CC} -o slock slock.o -lc ${LIBS} ${X11_LDFLAGS} -lX11
+.endif
 
 SPECIAL_PERMS+=	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 "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

x11/slock/PLIST

@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/01/06 13:32:25 mef Exp $
 bin/slock
-share/doc/slock/README

x11/slock/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/05/23 17:10:50 reed Exp $
+$NetBSD: distinfo,v 1.3 2015/01/06 13:32:25 mef 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.2.tar.gz) = 15c5be7c10d7d278882723197255179ffef9c5b1
+RMD160 (slock-1.2.tar.gz) = f08441f59ea6eb58bab7031575548813793d1014
+Size (slock-1.2.tar.gz) = 4853 bytes