Thu Dec 15 08:34:32 2011 UTC ()
graphics/vnc2swf: Fix logic flaw for Makefile dependency

On DragonFly, X11BASE equals LOCALBASE meaning any detected binaries on
X11BASE came from pkgsrc itself and not the native platform as intended.
The result is that x11/xwininfo was not getting added to the DEPENDS list
after that package was installed.


(marino)
diff -r1.14 -r1.15 pkgsrc/graphics/vnc2swf/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/graphics/vnc2swf/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/vnc2swf/Makefile 2010/05/15 13:17:28 1.14
+++ pkgsrc/graphics/vnc2swf/Makefile 2011/12/15 08:34:32 1.15
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.14 2010/05/15 13:17:28 obache Exp $ 1# $NetBSD: Makefile,v 1.15 2011/12/15 08:34:32 marino Exp $
2# 2#
3 3
4DISTNAME= vnc2swf-0.5.0 4DISTNAME= vnc2swf-0.5.0
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://www.unixuser.org/~euske/vnc2swf/ 7MASTER_SITES= http://www.unixuser.org/~euske/vnc2swf/
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://www.unixuser.org/~euske/vnc2swf/ 10HOMEPAGE= http://www.unixuser.org/~euske/vnc2swf/
11COMMENT= Record vnc session as flash movie 11COMMENT= Record vnc session as flash movie
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16.include "../../mk/bsd.fast.prefs.mk" 16.include "../../mk/bsd.fast.prefs.mk"
17 17
18DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc 18DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc
19.if !exists(${X11BASE}/bin/xwininfo) 19.if ${X11BASE} == ${LOCALBASE} || !exists(${X11BASE}/bin/xwininfo)
20DEPENDS+= xwininfo-[0-9]*:../../x11/xwininfo 20DEPENDS+= xwininfo-[0-9]*:../../x11/xwininfo
21.endif 21.endif
22 22
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25 25
26USE_TOOLS+= pax 26USE_TOOLS+= pax
27 27
28INSTALLATION_DIRS= bin lib/X11/app-defaults share/doc/vnc2swf 28INSTALLATION_DIRS= bin lib/X11/app-defaults share/doc/vnc2swf
29 29
30SUBST_CLASSES+= x11base 30SUBST_CLASSES+= x11base
31SUBST_STAGE.x11base= pre-configure 31SUBST_STAGE.x11base= pre-configure
32SUBST_MESSAGE.x11base= Change X11base to ${PREFIX} in Makefile 32SUBST_MESSAGE.x11base= Change X11base to ${PREFIX} in Makefile