cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.3

Browse Source 
similar diff from Michael Reed earlier during lock

ok gsoares
This commit is contained in:
jung 2016-03-05 19:17:01 +00:00
parent 803a8e3f79
commit 659b2b4cb6
6 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/slock/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2015/04/16 19:00:08 jung Exp $ # $OpenBSD: Makefile,v 1.13 2016/03/05 19:17:01 jung Exp $
COMMENT= simple X screen locker COMMENT= simple X screen locker
DISTNAME= slock-1.2 DISTNAME= slock-1.3
CATEGORIES= x11 CATEGORIES= x11

4
x11/slock/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (slock-1.2.tar.gz) = NAJlj4kKiNo/NNsE/KF4PtVJreRcLruNjwzStUn2M7M= SHA256 (slock-1.3.tar.gz) = urSjrqQEaqD9A2HDZJt5uQylMbxd+uPEpsD+Q2FSvRg=
SIZE (slock-1.2.tar.gz) = 4853 SIZE (slock-1.3.tar.gz) = 5943

22
x11/slock/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.4 2015/04/16 19:00:09 jung Exp $ $OpenBSD: patch-Makefile,v 1.5 2016/03/05 19:17:01 jung Exp $
--- Makefile.orig Wed Apr 15 21:49:50 2015 --- Makefile.orig Fri Feb 12 20:29:02 2016
+++ Makefile Wed Apr 15 21:51:14 2015 +++ Makefile Fri Feb 26 21:06:04 2016
@@ -15,8 +15,7 @@ options: @@ -15,8 +15,7 @@ options:
@echo "CC = ${CC}" @echo "CC = ${CC}"
@ -21,15 +21,25 @@ $OpenBSD: patch-Makefile,v 1.4 2015/04/16 19:00:09 jung Exp $
clean: clean:
@echo cleaning @echo cleaning
@@ -42,10 +40,7 @@ dist: clean @@ -42,15 +40,12 @@ dist: clean
@rm -rf slock-${VERSION}
install: all install: all
@echo installing executable file to ${DESTDIR}${PREFIX}/bin - @echo installing executable file to ${DESTDIR}${PREFIX}/bin
- @mkdir -p ${DESTDIR}${PREFIX}/bin - @mkdir -p ${DESTDIR}${PREFIX}/bin
- @cp -f slock ${DESTDIR}${PREFIX}/bin - @cp -f slock ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/slock - @chmod 755 ${DESTDIR}${PREFIX}/bin/slock
- @chmod u+s ${DESTDIR}${PREFIX}/bin/slock - @chmod u+s ${DESTDIR}${PREFIX}/bin/slock
+ @${BSD_INSTALL_PROGRAM} slock ${DESTDIR}${PREFIX}/bin - @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
- @sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_PROGRAM} slock ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
+ sed "s/VERSION/${VERSION}/g" < slock.1 > slock.1.tmp
+ mv slock.1.tmp slock.1
+ ${BSD_INSTALL_MAN} slock.1 ${DESTDIR}${MANPREFIX}/man1
uninstall: uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin @echo removing executable file from ${DESTDIR}${PREFIX}/bin

18
x11/slock/patches/patch-config_def_h
View File

@ -1,7 +1,11 @@
$OpenBSD: patch-config_def_h,v 1.1 2015/04/16 19:00:09 jung Exp $ $OpenBSD: patch-config_def_h,v 1.2 2016/03/05 19:17:01 jung Exp $
--- config.def.h.orig Wed Apr 15 22:07:07 2015 --- config.def.h.orig Fri Feb 12 20:29:02 2016
+++ config.def.h Wed Apr 15 22:07:24 2015 +++ config.def.h Fri Feb 26 20:57:47 2016
@@ -1,2 +1,2 @@ @@ -1,6 +1,6 @@
#define COLOR1 "black" static const char *colorname[NUMCOLS] = {
-#define COLOR2 "#005577" "black", /* after initialization */
+#define COLOR2 "#404040" - "#005577", /* during input */
+ "#404040", /* during input */
"#CC3333", /* failed/cleared the input */
};
static const Bool failonclear = True;

19
x11/slock/patches/patch-config_mk
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-config_mk,v 1.7 2015/04/16 19:00:09 jung Exp $ $OpenBSD: patch-config_mk,v 1.8 2016/03/05 19:17:01 jung Exp $
--- config.mk.orig Wed Apr 15 21:51:53 2015 --- config.mk.orig Fri Feb 12 20:29:02 2016
+++ config.mk Wed Apr 15 21:55:01 2015 +++ config.mk Sat Feb 27 10:43:40 2016
@@ -4,27 +4,26 @@ VERSION = 1.2 @@ -4,28 +4,28 @@ VERSION = 1.3
# Customize below to fit your system # Customize below to fit your system
# paths # paths
-PREFIX = /usr/local -PREFIX = /usr/local
+#PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX = ${PREFIX}/man
-X11INC = /usr/X11R6/include -X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib -X11LIB = /usr/X11R6/lib
@ -15,15 +17,16 @@ $OpenBSD: patch-config_mk,v 1.7 2015/04/16 19:00:09 jung Exp $
# includes and libs # includes and libs
-INCS = -I. -I/usr/include -I${X11INC} -INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr
+INCS = -I${X11INC} +INCS = -I${X11INC}
+LIBS = -L${X11LIB} -lX11 -lXext +LIBS = -L${X11LIB} -lX11 -lXext -lXrandr
# flags # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS} -LDFLAGS = -s ${LIBS}
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_BSD_AUTH +CPPFLAGS += -DVERSION=\"${VERSION}\" -DHAVE_BSD_AUTH
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS} +LDFLAGS += ${LIBS}
# On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH # On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH

5
x11/slock/pkg/PLIST
View File

@ -1,4 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2009/05/31 20:00:22 jim Exp $ @comment $OpenBSD: PLIST,v 1.4 2016/03/05 19:17:01 jung Exp $
@mode g+s @mode g+s
@group auth @group auth
@bin bin/slock @bin bin/slock
@mode
@group
@man man/man1/slock.1