diff options
author | tnn <tnn> | 2007-07-01 00:13:31 +0000 |
---|---|---|
committer | tnn <tnn> | 2007-07-01 00:13:31 +0000 |
commit | 5ed0ea98f02421a8c55f1a04c75c46907c7420ff (patch) | |
tree | 88a374842d8af90f68ecb431ea1b6aa52a9f8824 | |
parent | 6b9137b7947a603494b57a37d9c4f18c9277491d (diff) | |
download | pkgsrc-5ed0ea98f02421a8c55f1a04c75c46907c7420ff.tar.gz |
Make the tightvnc package a bit more modular X.org-friendly:
- If using modular X.org, depend on x11/rgb
- Set rgb- and font-paths to sane default values
- While here, fix some pkglint warnings
- Bump PKGREVISION
-rw-r--r-- | net/tightvnc/Makefile | 30 | ||||
-rw-r--r-- | net/tightvnc/distinfo | 4 | ||||
-rw-r--r-- | net/tightvnc/patches/patch-al | 20 |
3 files changed, 34 insertions, 20 deletions
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 97c24224004..e81cdfa0ffd 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2007/06/17 20:58:49 tnn Exp $ +# $NetBSD: Makefile,v 1.24 2007/07/01 00:13:31 tnn Exp $ # DISTNAME= tightvnc-1.3.9 +PKGREVISION= 1 CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} DISTFILES= ${DISTNAME}_unixsrc.tar.bz2 @@ -28,6 +29,27 @@ BUILD_TARGET= World _WRAP_EXTRA_ARGS.CC+= -DDDXTIME -D_XSERVER64 -DGCCUSESGAS .endif +.if ${X11_TYPE} == "modular" +DEPENDS= rgb>=1.0.1:../../x11/rgb +RGBPATH= ${PREFIX}/share/X11/rgb +.else +RGBPATH= ${X11BASE}/lib/X11/rgb +.endif +FONTPATH= ${X11BASE}/lib/X11/fonts/misc,${X11BASE}/lib/X11/fonts/75dpi + +SUBST_CLASSES+= hpath +SUBST_STAGE.hpath= pre-configure +SUBST_MESSAGE.hpath= fixing hardcoded paths +SUBST_FILES.hpath= vncserver +SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' + +REPLACE_PERL= vncserver + +post-extract: + (echo "#define DefaultRGBDatabase ${RGBPATH}";\ + echo "#define DefaultFontPath ${FONTPATH}")\ + >> ${WRKSRC}/Xvnc/config/cf/site.def + # We have to frob a few things, and we want our own permissions, so it's easier # to do the install ourselves. post-install: @@ -43,11 +65,7 @@ post-install: ${PREFIX}/bin/vncpasswd ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \ ${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1 - ${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \ - -e 's|/usr/bin/perl|${PERL5}|g' \ - < ${WRKSRC}/vncserver \ - > ${WRKSRC}/vncserver.local - ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver + ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver ${INSTALL_MAN} ${WRKSRC}/vncserver.man \ ${PREFIX}/${PKGMANDIR}/man1/vncserver.1 diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo index 3616d148214..fc5ebb40079 100644 --- a/net/tightvnc/distinfo +++ b/net/tightvnc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2007/06/17 20:58:49 tnn Exp $ +$NetBSD: distinfo,v 1.14 2007/07/01 00:13:31 tnn Exp $ SHA1 (tightvnc-1.3.9_unixsrc.tar.bz2) = a9529a262a060517402fb9845ef63a0d18c3141f RMD160 (tightvnc-1.3.9_unixsrc.tar.bz2) = 79d858466b7fab740b4d66d6b0963533f48a5163 @@ -14,5 +14,5 @@ SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861 SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22 SHA1 (patch-ak) = f79238fabee0dfcf6c8ffa29c269d0d70d2f362f -SHA1 (patch-al) = 57f01fbaa2679105b849a43b16e49a5033c210ce +SHA1 (patch-al) = 0a77ae744d81661cbb698690d93d395aea39e8ec SHA1 (patch-am) = 2de40589cc8ff7401086d6400655123f0eaeff3a diff --git a/net/tightvnc/patches/patch-al b/net/tightvnc/patches/patch-al index 985ca655b83..0e24fc2e0d8 100644 --- a/net/tightvnc/patches/patch-al +++ b/net/tightvnc/patches/patch-al @@ -1,17 +1,13 @@ -$NetBSD: patch-al,v 1.2 2007/06/17 20:58:49 tnn Exp $ +$NetBSD: patch-al,v 1.3 2007/07/01 00:13:32 tnn Exp $ ---- vncserver.orig 2007-04-26 12:57:06.000000000 +0200 +--- vncserver.orig 2007-06-30 23:05:23.000000000 +0200 +++ vncserver -@@ -42,10 +42,10 @@ $fontPath = "unix/:7100"; +@@ -38,7 +38,7 @@ $depth = 24; + $desktopName = "X"; + $vncClasses = "/usr/local/vnc/classes"; + $vncUserDir = "$ENV{HOME}/.vnc"; +-$fontPath = "unix/:7100"; ++#$fontPath = "unix/:7100"; $authType = "-rfbauth $vncUserDir/passwd"; # Here is another example of setting the font path: --# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/"; -+$fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/"; - - # X colors database path is optional, uncomment and edit to use: --# $colorPath = "/usr/lib/X11/rgb"; -+$colorPath = "/usr/X11R6/lib/X11/rgb"; - - # You might wish to make your vnc directory under /tmp, to make sure - # passwords are always kept on the local filesystem. To do that, just |