[pkgsrc/trunk]: pkgsrc/net/vncviewer Make this work on Solaris, which has no ...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e42fa337c558
branches:  trunk
changeset: 496797:e42fa337c558
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Wed Jul 13 13:47:57 2005 +0000

description:
Make this work on Solaris, which has no ComplexProgramTargetNoMan()
function for Imakefiles, only ComplexProgramTarget().

Bump pkg revision to vncviewer-3.3.3.2nb2

diffstat:

 net/vncviewer/Makefile         |   4 ++--
 net/vncviewer/distinfo         |   4 ++--
 net/vncviewer/patches/patch-aa |  15 +++++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (61 lines):

diff -r fc58d104c195 -r e42fa337c558 net/vncviewer/Makefile
--- a/net/vncviewer/Makefile    Wed Jul 13 13:17:03 2005 +0000
+++ b/net/vncviewer/Makefile    Wed Jul 13 13:47:57 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/13 13:47:57 hubertf Exp $
 
 DISTNAME=              vnc-3.3.3r2_unixsrc
 PKGNAME=               vncviewer-3.3.3.2
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net x11
 MASTER_SITES=          http://www.uk.research.att.com/archive/vnc/dist/
 EXTRACT_SUFX=          .tgz
diff -r fc58d104c195 -r e42fa337c558 net/vncviewer/distinfo
--- a/net/vncviewer/distinfo    Wed Jul 13 13:17:03 2005 +0000
+++ b/net/vncviewer/distinfo    Wed Jul 13 13:47:57 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:14:06 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/07/13 13:47:57 hubertf Exp $
 
 SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
 RMD160 (vnc-3.3.3r2_unixsrc.tgz) = 3c70c386065d8b0254b1a0627455fb7bc03846ae
@@ -6,5 +6,5 @@
 SHA1 (vnc-3.3.3r2-v6-20010421.diff.gz) = d2af7e0fb0074200f490f6463fb250901368875e
 RMD160 (vnc-3.3.3r2-v6-20010421.diff.gz) = dea9aff6124bfdbe099fd1207e20d22cab1c0d6b
 Size (vnc-3.3.3r2-v6-20010421.diff.gz) = 6510 bytes
-SHA1 (patch-aa) = 1f2a6e6cb65c8b206e357fa974627c4f0b45f510
+SHA1 (patch-aa) = ec85472922c648648c89c7f1bb0ce406214289c8
 SHA1 (patch-ab) = b387f2ee2e78ced366e312f90bb9bad809f9e3ba
diff -r fc58d104c195 -r e42fa337c558 net/vncviewer/patches/patch-aa
--- a/net/vncviewer/patches/patch-aa    Wed Jul 13 13:17:03 2005 +0000
+++ b/net/vncviewer/patches/patch-aa    Wed Jul 13 13:47:57 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/09/22 00:49:33 mycroft Exp $
+$NetBSD: patch-aa,v 1.3 2005/07/13 13:47:57 hubertf Exp $
 
---- vncviewer/Imakefile.orig   Fri Aug 13 05:29:34 1999
-+++ vncviewer/Imakefile        Fri Sep 21 20:45:00 2001
-@@ -8,9 +8,7 @@
+--- vncviewer/Imakefile.orig   2005-07-13 15:26:57.329207000 +0200
++++ vncviewer/Imakefile
+@@ -8,9 +8,7 @@ CDEBUGFLAGS = -O2
  XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but
  XCOMM seems to cause problems on Digital Unix.
  
@@ -12,9 +12,12 @@
  
  INCLUDES = -I../include -I.
  VNCAUTH_LIB = ../libvncauth/libvncauth.a
-@@ -35,4 +33,4 @@
+@@ -36,4 +34,8 @@ SRCS = \
  
  OBJS = $(SRCS:.c=.o)
  
--ComplexProgramTarget(vncviewer)
++#if !defined(SunArchitecture)
 +ComplexProgramTargetNoMan(vncviewer)
++#else
+ ComplexProgramTarget(vncviewer)
++#endif