Attachment #87347 for bug #123949

View | Details | Raw Unified | Return to bug 123949
Collapse All | Expand All




#

PORTNAME=	vlock
PORTVERSION=	2.2.2
CATEGORIES=	security
MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/


		--with-modules="${VLOCKMODULES}" \
		--with-scripts="${VLOCKSCRIPTS}" \
		VLOCK_GROUP="${VLOCKGRP}" \
		VLOCK_MODE="0750" \
		EXTRA_CFLAGS="-I${LOCALBASE}/include" \
		EXTRA_LDFLAGS="-L${LOCALBASE}/lib"

OPTIONS=	ROOTPWD "Enable unlock using root password" on \
		VLOCKSCRIPTS "Install sample hook scripts" off \
		CACASAVER "Enable libcaca screensaver" off

MANLANG=	""


.include <bsd.port.pre.mk>

.if !defined(WITHOUT_ROOTPWD)
CONFIGURE_ARGS+=	--enable-root-password
.else
CONFIGURE_ARGS+=	--disable-root-password
.endif

.if !defined(WITHOUT_VLOCKSCRIPTS)
VLOCKSCRIPTS+=	amarok.sh example_script.sh mplayer.sh
PLIST_SUB+=	PL_VLOCKSCRIPTS=""

Lines 1-3 Link Here

(-)vlock/distinfo (-3 / +3 lines)
1	MD5 (vlock-2.2.1.tar.gz) = 5a8f7bb07b9f6107f1d06acb3aaa5578	1	MD5 (vlock-2.2.2.tar.gz) = 51c389ee4ef814bf59063bc367437eb8
2	SHA256 (vlock-2.2.1.tar.gz) = 11fa31b0cdc9e936cd114384db09b36981c412af7e23db83368d7c40677a031c	2	SHA256 (vlock-2.2.2.tar.gz) = ea875250cad150872583b6ed2436470bc5e9c3a580d85554e31a2d5ae1d92fad
3	SIZE (vlock-2.2.1.tar.gz) = 54381	3	SIZE (vlock-2.2.2.tar.gz) = 54732




--- configure.orig	2008-05-24 08:37:25.515872840 +0200
+++ configure	2008-05-24 08:38:44.943843155 +0200
@@ -220,7 +220,8 @@
   MODULEDIR="\$(LIBDIR)/vlock/modules"
 
   CC=gcc
-  DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
+  #DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
+  DEFAULT_CFLAGS="-pedantic -std=gnu99"
   DEBUG_CFLAGS="-O0 -g -Wall -W -pedantic -std=gnu99"
   CFLAGS="${DEFAULT_CFLAGS}"
   LD=ld

Return to bug 123949

Lines 6-12 Link Here

(-)vlock/Makefile (-4 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= vlock	8	PORTNAME= vlock
9	PORTVERSION= 2.2.1	9	PORTVERSION= 2.2.2
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/	11	MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
12		12
Lines 21-30 Link Here
21	--with-modules="${VLOCKMODULES}" \	21	--with-modules="${VLOCKMODULES}" \
22	--with-scripts="${VLOCKSCRIPTS}" \	22	--with-scripts="${VLOCKSCRIPTS}" \
23	VLOCK_GROUP="${VLOCKGRP}" \	23	VLOCK_GROUP="${VLOCKGRP}" \
24	VLOCK_MODE="0750"	24	VLOCK_MODE="0750" \
25	CONFIGURE_ENV= LOCALBASE=${LOCALBASE}	25	EXTRA_CFLAGS="-I${LOCALBASE}/include" \
		26	EXTRA_LDFLAGS="-L${LOCALBASE}/lib"
26		27
27	OPTIONS= VLOCKSCRIPTS "Install sample hook scripts" off \	28	OPTIONS= ROOTPWD "Enable unlock using root password" on \
		29	VLOCKSCRIPTS "Install sample hook scripts" off \
28	CACASAVER "Enable libcaca screensaver" off	30	CACASAVER "Enable libcaca screensaver" off
29		31
30	MANLANG= ""	32	MANLANG= ""
Lines 42-47 Link Here
42		44
43	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
44		46
		47	.if !defined(WITHOUT_ROOTPWD)
		48	CONFIGURE_ARGS+= --enable-root-password
		49	.else
		50	CONFIGURE_ARGS+= --disable-root-password
		51	.endif
		52
45	.if !defined(WITHOUT_VLOCKSCRIPTS)	53	.if !defined(WITHOUT_VLOCKSCRIPTS)
46	VLOCKSCRIPTS+= amarok.sh example_script.sh mplayer.sh	54	VLOCKSCRIPTS+= amarok.sh example_script.sh mplayer.sh
47	PLIST_SUB+= PL_VLOCKSCRIPTS=""	55	PLIST_SUB+= PL_VLOCKSCRIPTS=""

Lines 1-12 Link Here

(-)vlock/files/patch-configure (-12 / +12 lines)
1	--- configure.orig 2008-03-26 17:49:33.000000000 +0800	1	--- configure.orig 2008-05-24 08:37:25.515872840 +0200
2	+++ configure 2008-03-30 13:32:41.000000000 +0800	2	+++ configure 2008-05-24 08:38:44.943843155 +0200
3	@@ -255,6 +255,9 @@	3	@@ -220,7 +220,8 @@
4	DL_LIB=''	4	MODULEDIR="\$(LIBDIR)/vlock/modules"
5	CRYPT_LIB=''	5
6	MODULES="all.so new.so"	6	CC=gcc
7	+ CFLAGS="${CFLAGS} -I${LOCALBASE}/include"	7	- DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
8	+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"	8	+ #DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
9	+ ROOT_GROUP="wheel"	9	+ DEFAULT_CFLAGS="-pedantic -std=gnu99"
10	;;	10	DEBUG_CFLAGS="-O0 -g -Wall -W -pedantic -std=gnu99"
11	esac	11	CFLAGS="${DEFAULT_CFLAGS}"
12	}	12	LD=ld