Mon Nov 2 11:51:43 2009 UTC ()
This needs Xinerama. Unbreak it.


(asau)
diff -r1.56 -r1.57 pkgsrc/x11/xlockmore/Makefile.common
cvs diff -r1.56 -r1.57 pkgsrc/x11/xlockmore/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/Makefile.common 2009/10/25 22:54:03 1.56
+++ pkgsrc/x11/xlockmore/Makefile.common 2009/11/02 11:51:43 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.56 2009/10/25 22:54:03 tron Exp $ 1# $NetBSD: Makefile.common,v 1.57 2009/11/02 11:51:43 asau Exp $
2# 2#
3# This Makefile.common is included by: 3# This Makefile.common is included by:
4# 4#
5# x11/xlockmore/Makefile 5# x11/xlockmore/Makefile
6# x11/xlockmore-lite/Makefile 6# x11/xlockmore-lite/Makefile
7# 7#
8# If these packages are updated, please remember to reset any PKGREVISIONs 8# If these packages are updated, please remember to reset any PKGREVISIONs
9# in those Makefiles. 9# in those Makefiles.
10 10
11DISTNAME= xlockmore-5.29.1 11DISTNAME= xlockmore-5.29.1
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${DISTNAME}/ \ 13MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${DISTNAME}/ \
14 ftp://ibiblio.org/pub/Linux/X11/screensavers/ 14 ftp://ibiblio.org/pub/Linux/X11/screensavers/
@@ -79,26 +79,27 @@ CONFIGURE_ARGS+= --disable-allow-root @@ -79,26 +79,27 @@ CONFIGURE_ARGS+= --disable-allow-root
79 ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS" 79 ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
80SPECIAL_PERMS+= bin/xlock ${SETUID_ROOT_PERMS} 80SPECIAL_PERMS+= bin/xlock ${SETUID_ROOT_PERMS}
81.elif ${OPSYS} == "Linux" 81.elif ${OPSYS} == "Linux"
82# setgid shadow should be enough for modern Linux 82# setgid shadow should be enough for modern Linux
83SPECIAL_PERMS+= bin/xlock ${REAL_ROOT_USER} shadow 2511 83SPECIAL_PERMS+= bin/xlock ${REAL_ROOT_USER} shadow 2511
84.endif 84.endif
85 85
86BUILDLINK_DEPMETHOD.libXt?= build 86BUILDLINK_DEPMETHOD.libXt?= build
87 87
88.include "../../x11/libICE/buildlink3.mk" 88.include "../../x11/libICE/buildlink3.mk"
89.include "../../x11/libSM/buildlink3.mk" 89.include "../../x11/libSM/buildlink3.mk"
90.include "../../x11/libX11/buildlink3.mk" 90.include "../../x11/libX11/buildlink3.mk"
91.include "../../x11/libXext/buildlink3.mk" 91.include "../../x11/libXext/buildlink3.mk"
 92.include "../../x11/libXinerama/buildlink3.mk"
92.include "../../x11/libXt/buildlink3.mk" 93.include "../../x11/libXt/buildlink3.mk"
93.include "../../x11/xextproto/buildlink3.mk" 94.include "../../x11/xextproto/buildlink3.mk"
94 95
95# Set the complete paths to the sound files and set the default xlock 96# Set the complete paths to the sound files and set the default xlock
96# mode/screensaver. 97# mode/screensaver.
97# 98#
98post-patch: 99post-patch:
99 cd ${WRKSRC}/xlock; \ 100 cd ${WRKSRC}/xlock; \
100 ${MV} -f XLock.ad XLock.ad.presed; \ 101 ${MV} -f XLock.ad XLock.ad.presed; \
101 ${SED} -e "s|/usr/lib/|${PREFIX}/lib/|g" \ 102 ${SED} -e "s|/usr/lib/|${PREFIX}/lib/|g" \
102 XLock.ad.presed > XLock.ad; \ 103 XLock.ad.presed > XLock.ad; \
103 ${RM} -f XLock.ad.presed 104 ${RM} -f XLock.ad.presed
104.if defined(XLOCK_DEFAULT_MODE) && !empty(XLOCK_DEFAULT_MODE) 105.if defined(XLOCK_DEFAULT_MODE) && !empty(XLOCK_DEFAULT_MODE)