Tue Apr 3 04:34:09 2012 UTC ()
Add modular X font paths to FONTPATH.
PR 46085.


(obache)
diff -r1.36 -r1.37 pkgsrc/net/tightvnc/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/net/tightvnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tightvnc/Makefile 2010/12/23 11:44:53 1.36
+++ pkgsrc/net/tightvnc/Makefile 2012/04/03 04:34:09 1.37
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:53 dsainty Exp $ 1# $NetBSD: Makefile,v 1.37 2012/04/03 04:34:09 obache Exp $
2 2
3DISTNAME= tightvnc-1.3.10 3DISTNAME= tightvnc-1.3.10
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= net x11 5CATEGORIES= net x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
7DISTFILES= ${DISTNAME}_unixsrc.tar.bz2 7DISTFILES= ${DISTNAME}_unixsrc.tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tightvnc.com/ 10HOMEPAGE= http://www.tightvnc.com/
11COMMENT= Display X and Win32 desktops on remote X/Win32/Java displays 11COMMENT= Display X and Win32 desktops on remote X/Win32/Java displays
12 12
13CONFLICTS= vnc-[0-9]* vncviewer-[0-9]* 13CONFLICTS= vnc-[0-9]* vncviewer-[0-9]*
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16WRKSRC= ${WRKDIR}/vnc_unixsrc 16WRKSRC= ${WRKDIR}/vnc_unixsrc
17CRYPTO= yes 17CRYPTO= yes
@@ -25,27 +25,27 @@ BUILD_TARGET= World @@ -25,27 +25,27 @@ BUILD_TARGET= World
25 25
26# XXX - this should go into Xvnc's NetBSD.cf, but imake doesn't 26# XXX - this should go into Xvnc's NetBSD.cf, but imake doesn't
27# seem to pick it up. Someone with strong X-fu needs to look at it. 27# seem to pick it up. Someone with strong X-fu needs to look at it.
28.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) 28.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
29_WRAP_EXTRA_ARGS.CC+= -DDDXTIME -D_XSERVER64 -DGCCUSESGAS 29_WRAP_EXTRA_ARGS.CC+= -DDDXTIME -D_XSERVER64 -DGCCUSESGAS
30.endif 30.endif
31 31
32.if ${X11_TYPE} == "modular" 32.if ${X11_TYPE} == "modular"
33DEPENDS+= rgb>=1.0.1:../../x11/rgb 33DEPENDS+= rgb>=1.0.1:../../x11/rgb
34RGBPATH= ${PREFIX}/share/X11/rgb 34RGBPATH= ${PREFIX}/share/X11/rgb
35.else 35.else
36RGBPATH= ${X11BASE}/lib/X11/rgb 36RGBPATH= ${X11BASE}/lib/X11/rgb
37.endif 37.endif
38FONTPATH= ${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi 38FONTPATH= ${X11BASE}/share/fonts/X11/misc,${X11BASE}/share/fonts/X11/75dpi,${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi
39 39
40SUBST_CLASSES+= hpath 40SUBST_CLASSES+= hpath
41SUBST_STAGE.hpath= pre-configure 41SUBST_STAGE.hpath= pre-configure
42SUBST_MESSAGE.hpath= fixing hardcoded paths 42SUBST_MESSAGE.hpath= fixing hardcoded paths
43SUBST_FILES.hpath= vncserver tightvncserver.conf 43SUBST_FILES.hpath= vncserver tightvncserver.conf
44SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 44SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
45SUBST_SED.hpath+= -e 's|/etc/tightvncserver.conf|${PKG_SYSCONFDIR}/tightvncserver.conf|g' 45SUBST_SED.hpath+= -e 's|/etc/tightvncserver.conf|${PKG_SYSCONFDIR}/tightvncserver.conf|g'
46 46
47REPLACE_PERL= vncserver 47REPLACE_PERL= vncserver
48 48
49post-extract: 49post-extract:
50 (${ECHO} "#define DefaultRGBDatabase ${RGBPATH}";\ 50 (${ECHO} "#define DefaultRGBDatabase ${RGBPATH}";\
51 ${ECHO} "#define DefaultFontPath ${FONTPATH}")\ 51 ${ECHO} "#define DefaultFontPath ${FONTPATH}")\