diff options
Diffstat (limited to 'net/tightvnc')
| -rw-r--r-- | net/tightvnc/DESCR | 9 | ||||
| -rw-r--r-- | net/tightvnc/Makefile | 49 | ||||
| -rw-r--r-- | net/tightvnc/PLIST | 9 | ||||
| -rw-r--r-- | net/tightvnc/distinfo | 18 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-aa | 23 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ab | 715 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ac | 27 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ad | 14 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ae | 30 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-af | 13 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ag | 13 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ah | 13 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ai | 13 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-aj | 13 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-ak | 22 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-al | 18 | ||||
| -rw-r--r-- | net/tightvnc/patches/patch-am | 24 |
17 files changed, 0 insertions, 1023 deletions
diff --git a/net/tightvnc/DESCR b/net/tightvnc/DESCR deleted file mode 100644 index c29a2a0a7db..00000000000 --- a/net/tightvnc/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -"VNC stands for Virtual Network Computing. It is, in essence, a remote - display system which allows you to view a computing 'desktop' - environment not only on the machine where it is running, but from - anywhere on the Internet and from a wide variety of machine - architectures." - -Tight VNC is a modified version of VNC that offers some performance -improvements -- local cursor handling, better compression algorithms, -etc. diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile deleted file mode 100644 index 0bf29befb6f..00000000000 --- a/net/tightvnc/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:07 rillig Exp $ -# - -DISTNAME= tightvnc-1.2.9 -PKGREVISION= 2 -CATEGORIES= net x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} -DISTFILES= ${DISTNAME}_unixsrc.tar.bz2 - -MAINTAINER= riz@NetBSD.org -HOMEPAGE= http://www.tightvnc.com/ -COMMENT= Display X and Win32 desktops on remote X/Win32/Java displays - -CONFLICTS= vnc-[0-9]* - -WRKSRC= ${WRKDIR}/vnc_unixsrc -CRYPTO= yes -USE_IMAKE= yes -USE_TOOLS+= perl:run -NO_INSTALL_MANPAGES= yes - -BUILD_TARGET= World - -# We have to frob a few things, and we want our own permissions, so it's easier -# to do the install ourselves. -post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \ - ${PREFIX}/bin/Xvnc - ${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man \ - ${PREFIX}/${PKGMANDIR}/man1/Xvnc.1 - ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \ - ${PREFIX}/bin/vncconnect - ${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man \ - ${PREFIX}/${PKGMANDIR}/man1/vncconnect.1 - ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \ - ${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_MAN} ${WRKSRC}/vncserver.man \ - ${PREFIX}/${PKGMANDIR}/man1/vncserver.1 - -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/tightvnc/PLIST b/net/tightvnc/PLIST deleted file mode 100644 index 013febe57ff..00000000000 --- a/net/tightvnc/PLIST +++ /dev/null @@ -1,9 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2003/11/27 17:27:29 abs Exp $ -bin/Xvnc -bin/vncconnect -bin/vncpasswd -bin/vncserver -man/man1/Xvnc.1 -man/man1/vncconnect.1 -man/man1/vncpasswd.1 -man/man1/vncserver.1 diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo deleted file mode 100644 index 1600b5981b0..00000000000 --- a/net/tightvnc/distinfo +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: distinfo,v 1.12 2005/04/06 04:44:15 xtraeme Exp $ - -SHA1 (tightvnc-1.2.9_unixsrc.tar.bz2) = 62b55237676bbdc7f08771e6ff72c0f70264f4ee -RMD160 (tightvnc-1.2.9_unixsrc.tar.bz2) = 57c4d24bbc008b7188ae4bb177fbb409bc1d26d3 -Size (tightvnc-1.2.9_unixsrc.tar.bz2) = 1738256 bytes -SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4 -SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4 -SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd -SHA1 (patch-ad) = 437c27c443bd8511bce0c3787e028a54829ab223 -SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50 -SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d -SHA1 (patch-ag) = 675c42780888ff471109521de0a358ba40a6b8f3 -SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861 -SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af -SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22 -SHA1 (patch-ak) = 71e36559fe55c80382691b6292fa68084f8e7ca1 -SHA1 (patch-al) = 4a45378b53b0e550c87ddc0b244b7a03f518bfb4 -SHA1 (patch-am) = 2de40589cc8ff7401086d6400655123f0eaeff3a diff --git a/net/tightvnc/patches/patch-aa b/net/tightvnc/patches/patch-aa deleted file mode 100644 index 4c90acd47c6..00000000000 --- a/net/tightvnc/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/10/20 14:33:54 lukem Exp $ - ---- Imakefile.orig Fri Oct 18 10:51:23 2002 -+++ Imakefile -@@ -1,7 +1,7 @@ - #define IHaveSubdirs - #define PassCDebugFlags - --SUBDIRS = libvncauth vncviewer vncpasswd vncconnect -+SUBDIRS = libvncauth vncpasswd vncconnect - - World: - make Makefiles -@@ -9,8 +9,7 @@ World: - make all - @echo "" - @echo Built $(SUBDIRS). -- @echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"' -- @echo "" -+ (cd Xvnc && ./configure && make) - - libs: - @echo 'No libraries included.' diff --git a/net/tightvnc/patches/patch-ab b/net/tightvnc/patches/patch-ab deleted file mode 100644 index eced01476f6..00000000000 --- a/net/tightvnc/patches/patch-ab +++ /dev/null @@ -1,715 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ - ---- Xvnc/config/cf/NetBSD.cf.orig 2000-06-11 12:00:51.000000000 +0000 -+++ Xvnc/config/cf/NetBSD.cf 2004-01-03 11:41:23.000000000 +0000 -@@ -2,9 +2,37 @@ - - - --XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.9 1997/07/26 06:30:39 dawes Exp $ -+XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.13 1999/10/12 17:18:20 hohndel Exp $ - - -+ -+XCOMM -+XCOMM This file currently contains support for: -+XCOMM -+XCOMM NetBSD/i386 client/server -+XCOMM NetBSD/sparc client/server -+XCOMM NetBSD/sparc64 client/server -+XCOMM NetBSD/sun3 client/server -+XCOMM NetBSD/hp300 client -+XCOMM NetBSD/mac68k client/server -+XCOMM NetBSD/pmax client/server -+XCOMM NetBSD/amiga client/server -+XCOMM NetBSD/alpha client/server -+XCOMM NetBSD/arm32 client/server -+XCOMM NetBSD/atari client/server -+XCOMM NetBSD/vax client/server -+XCOMM NetBSD/pc532 client -+XCOMM NetBSD/x68k client/server -+XCOMM NetBSD/macppc client/server -+XCOMM NetBSD/hpcmips client/server -+XCOMM NetBSD/next68k client -+XCOMM NetBSD/prep client -+XCOMM NetBSD/news68k client -+XCOMM NetBSD/cobalt client -+XCOMM NetBSD/sgimips client -+XCOMM NetBSD/luna68k client -+XCOMM -+ - #ifndef OSName - #define OSName DefaultOSName OSBinaryType - #endif -@@ -14,24 +42,34 @@ - #ifndef OSMinorVersion - #define OSMinorVersion DefaultOSMinorVersion - #endif -+/* XXX this does not deal with patches, but, patches should not affect it */ -+/* 1 = A, 2 = B, 3 = C, 4 = D, 5 = E, ... */ - #ifndef OSTeenyVersion - #define OSTeenyVersion DefaultOSTeenyVersion - #endif - - - #ifndef OSVendor --#define OSVendor /**/ -+#define OSVendor The NetBSD Foundation, Inc. - #endif - XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) - - /* -+ * Enable support for "xdmauth" authentification. -+ */ -+#ifndef HasXdmAuth -+#define HasXdmAuth NO -+#endif -+ -+/* - * C library features - */ - #if ((OSMajorVersion > 1) || \ - (OSMajorVersion == 1 && OSMinorVersion > 2) || \ - (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1)) --# define HasPoll YES -+# define HasPoll YES - #endif -+ - #define HasNdbm YES - #define HasPutenv YES - #define HasSnprintf YES -@@ -61,7 +99,20 @@ - (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2)) - # define HasDlsymBug YES - #endif --/* Mkstemp is there since 1.2 (at least) */ -+ -+/* -+ * The USB HID library came after 1.4 -+ */ -+#if ((OSMajorVersion == 1 && OSMinorVersion > 4) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion > 8)) -+# define HasUsbLib YES -+#endif -+ -+ -+#if OSMajorVersion >= 1 -+# define LexCmd lex -l -+#endif -+ - #if (!(OSMajorVersion == 0 || \ - (OSMajorVersion == 1 && OSMinorVersion < 2))) - #define HasMkstemp YES -@@ -85,9 +136,10 @@ - #define NeedVarargsPrototypes YES - #define NeedWidePrototypes NO - -+#define HasMktemp NO - #define MkdirHierCmd mkdir -p - --#define CppCmd /usr/libexec/cpp -+#define CppCmd /usr/bin/cpp - #define StandardCppDefines -traditional - #define PreProcessCmd CppCmd - #define PreIncDir /usr/include -@@ -96,13 +148,15 @@ - #define CcCmd gcc - #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) - #define DefaultCCOptions /**/ -+#elif defined(arm32Architecture) -+#define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char -fomit-frame-pointer - #else - #define DefaultCCOptions -ansi -Dasm=__asm - #endif - - #define GccGasOption -DGCCUSESGAS - #define AsmDefines -DUSE_GAS -- -+ - /* UseElfFormat defaults to YES if __ELF__ set */ - #ifndef UseElfFormat - # ifdef __ELF__ -@@ -114,60 +168,234 @@ - #endif - - /* -+ * Make sure the binaries know where to look for the shared libaries. -+ * NOTE: This is done in bsdLib.rules for ELF libraries! -+ */ -+#if (OSMajorVersion == 1 && OSMinorVersion >= 2) || OSMajorVersion > 1 -+# if !defined(UseElfFormat) || UseElfFormat == NO -+# define ExtraLoadFlags -R$(USRLIBDIR) -+# endif -+#endif -+ -+/* - * Dynamic loading supported starting in 1.0 on a.out platforms, - * and on all ELF platforms. -- * -- * XXX May not be correct on NetBSD/pmax (ELF, but might not have -- * working shared libs). - */ - #if ((OSMajorVersion > 0) && \ - !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \ - UseElfFormat - # ifndef BuildDynamicLoading --# define BuildDynamicLoading YES -+# define BuildDynamicLoading YES -+# endif -+# ifndef ForceNormalLib -+# define ForceNormalLib YES - # endif - #endif - - #if UseElfFormat --#define DlLibrary -rdynamic /* no -ldl yet */ -+# define DlLibrary -rdynamic /* no -ldl yet */ - #else --#define DlLibrary /**/ -+# define DlLibrary /**/ - #endif - -+/* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ - #ifdef i386Architecture -+# ifndef DefaultGcc2i386Opt -+# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) -+ /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ -+# define DefaultGcc2i386Opt -O2 -+# endif -+# endif - # define OptimizedCDebugFlags DefaultGcc2i386Opt - # if OSMajorVersion < 1 - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF - # else - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME - # endif --# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2 --# define ServerExtraSysLibs -li386 DlLibrary --# endif --#else --# define OptimizedCDebugFlags -O2 --# if defined(SparcArchitecture) || defined(AlphaArchitecture) --# define ServerOSDefines -DDDXOSINIT --# else --# define ServerOSDefines /**/ --# endif - # if BuildDynamicLoading --# define ServerExtraSysLibs DlLibrary -+# define ServerExtraSysLibs -li386 DlLibrary - # else - # define ServerExtraSysLibs /**/ - # endif --#endif --#ifdef i386Architecture - # define ServerExtraDefines GccGasOption XFree86ServerDefines - # ifndef XFree86ConsoleDefines - # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT - # endif - #else --# if defined(AlphaArchitecture) --# define ServerExtraDefines GccGasOption -D_XSERVER64 -+# if defined(m68kArchitecture) && OSMajorVersion == 1 && OSMinorVersion <= 3 -+# define OptimizedCDebugFlags -O - # else --# define ServerExtraDefines GccGasOption -+# define OptimizedCDebugFlags -O2 -+# endif -+#endif -+ -+/* -+ * On mips, all libs are compiled with ABIcalls, not just sharedlibs. -+ * Disable MIPS specific code which was not used and tested. -+ */ -+#if defined(MipsArchitecture) -+# define SeparateSharedCompile NO -+# undef MipsArchitecture -+#endif -+ -+#if defined(SparcArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# if defined(Sparc64Architecture) -+# define ServerExtraDefines GccGasOption -D_XSERVER64 -+# else -+# define ServerExtraDefines GccGasOption -+# endif -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(Sun3Architecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__sun3__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(hp300Architecture) -+# define BuildServer NO /* XXX */ -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(mac68kArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__mac68k__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(AlphaArchitecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D_XSERVER64 -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# undef OptimizedCDebugFlags /* XXX ??? */ -+# define OptimizedCDebugFlags /* XXX ??? */ -+#endif -+ -+#if defined(amigaArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__amiga__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define XserverNeedsSetUID YES -+#endif -+ -+#if defined(arm32Architecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -DDDXTIME -+# define ServerExtraDefines GccGasOption XFree86ServerDefines -+# ifndef XFree86ConsoleDefines -+# define XFree86ConsoleDefines -DPCCONS_SUPPORT - # endif -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(atariArchitecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__atari__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(VaxArchitecture) -+# define BuildServer NO -+# define ServerExtraDefines GccGasOption -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(pc532Architecture) -+# define BuildServer NO -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(x68kArchitecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__x68k__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define XserverNeedsSetUID YES -+#endif -+ -+#if defined(macppcArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__macppc__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -+#endif -+ -+#if defined(pmaxArchitecture) -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(hpcmipsArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define BuildServer YES -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define ServerExtraDefines -DSTATIC_COLOR -+# define XserverNeedsSetUID YES -+#endif -+ -+#if defined(next68kArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(prepArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(news68kArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(cobaltArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(sgimipsArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(luna68kArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#ifndef OptimizedCDebugFlags -+# define OptimizedCDebugFlags -O2 -+#endif -+ -+#ifndef PositionIndependentCFlags -+# define PositionIndependentCFlags -fPIC - #endif - - #define StandardDefines -DCSRG_BASED -@@ -177,7 +405,18 @@ - #define ExtraLibraries /**/ - #endif - #ifndef UseGnuMalloc -+/* -+ * There is no way to map 1.4J correctly to OS*Version, so 'J' is mapped -+ * to OSTeenyVersion == 10. This should be save since there will never a -+ * release for 1.4.10. -+ */ -+# if ((OSMajorVersion > 1) || \ -+ (OSMajorVersion == 1 && OSMinorVersion > 4) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 10)) -+# define UseGnuMalloc NO -+# else - # define UseGnuMalloc YES -+# endif - #endif - #ifndef GnuMallocLibrary - #define GnuMallocLibrary -lgnumalloc -@@ -191,6 +430,13 @@ - #endif - #endif - -+/* 1.4R and later has setusercontext() */ -+# if ((OSMajorVersion > 1) || \ -+ (OSMajorVersion == 1 && OSMinorVersion > 4) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 18)) -+#define HasSetUserContext YES -+#endif -+ - #define AdmDir /var/log - - /* -@@ -200,8 +446,17 @@ - #define StripInstalledPrograms YES - #define CompressAllFonts YES - #define GzipFontCompression YES --#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR) --#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) -+#define DefaultUserPath /usr/bin:/bin:/usr/pkg/bin:$(BINDIR):/usr/local/bin -+#define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/pkg/sbin:$(BINDIR):/usr/local/bin:/usr/local/sbin -+ -+#define InstPgmFlags -s -m 0555 -o root -g wheel -+#define InstBinFlags -m 0555 -o root -g wheel -+#define InstUidFlags -m 4511 -o root -g wheel -+#define InstLibFlags -m 0444 -o root -g wheel -+#define InstIncFlags -m 0444 -o root -g wheel -+#define InstManFlags -m 0444 -o root -g wheel -+#define InstDatFlags -m 0444 -o root -g wheel -+#define InstKmemFlags -m 2555 -o root -g kmem - - #ifdef InstallCmd - # undef InstallCmd -@@ -212,11 +467,23 @@ - # define ExtraFilesToClean *.core - #endif - -+#ifdef arm32Architecture -+/* -+ * NetBSD's default .SUFFIXES target places .s at a higher priority -+ * than .c. This breaks architectures which use the .c versions of -+ * various files in the XFree86 server tree for which there are also -+ * .s versions. Default to the basic .SUFFIXES list specified in -+ * SUSv2 (without the SCCS-related suffixes) plus .cxx for Motif.rules. -+ */ -+.SUFFIXES: -+.SUFFIXES: .o .c .y .l .a .sh .f .cxx -+#endif -+ - /* - * Documentation formatting - */ --#define NeqnCmd neqn -Tlatin1 --#define NroffCmd nroff -Tlatin1 -+#define NeqnCmd neqn -Tascii -+#define NroffCmd nroff -Tascii - #define EqnCmd eqn -Tps - #define TroffCmd groff -Tps - -@@ -264,7 +531,10 @@ - -@if [ -f file.0 ]; \ @@\ - then \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\ -- fi -+ fi @@\ -+ @@\ -+clean:: @@\ -+ $(RM) file.0 - - #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ - InstallManPageLong(file,destdir,dest) -@@ -281,7 +551,16 @@ - done - - #define InstallMultipleMan(list,dest) @@\ -- InstallMultipleManSuffix(list,dest,man) -+ MakeDir($(DESTDIR)dest) @@\ -+ case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ -+ for i in list; do \ @@\ -+ (set -x; \ @@\ -+ MNAME=`echo $$i | cut -f1 -d.`; \ @@\ -+ cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ -+ $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.man $(DESTDIR)dest/$${MNAME}.0; \ @@\ -+ $(RM) /tmp/$$$$.man); \ @@\ -+ done -+ - - #define InstallManPageAliases(file,destdir,aliases) @@\ - install.man:: @@\ -@@ -299,13 +578,10 @@ - /* - * Shared libraries supported starting in 1.0 on a.out platforms, - * and on all ELF platforms. -- * -- * XXX May not be correct on NetBSD/pmax (ELF, but might not have -- * working shared libs). - */ - #if ((OSMajorVersion > 0) && \ -- !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \ -- UseElfFormat -+ !defined(AlphaArchitecture) && !defined(MipsArchitecture)) \ -+ || UseElfFormat - # ifndef HasSharedLibraries - # define HasSharedLibraries YES - # endif -@@ -327,51 +603,179 @@ - #include <bsdLib.rules> - #endif /* HasSharedLibraries */ - --#ifdef i386Architecture -+#if defined(i386Architecture) || defined(arm32Architecture) || \ -+ defined(atariArchitecture) - # include <xfree86.cf> --#endif - - /* -- * Definitions for the SUN server on NetBSD/sparc -+ * XXX The DynamicModuleTarget macro in xf86.rules does NOT work properly -+ * XXX on ELF systems. This macro should be moved into bsdLib.rules, since -+ * XXX it depends on how shlibs are built on that platform. -+ * XXX -+ * XXX The following overrides DynamicModuleTarget so it should work on -+ * XXX ELF and a.out. -+ */ -+/* -+ * DynamicModuleTarget - build a module to be dynamically loaded -+ */ -+# undef DynamicModuleTarget -+# define DynamicModuleTarget(module,modlist) @@\ -+AllTarget(module) @@\ -+ @@\ -+module: modlist @@\ -+ RemoveFile($@) @@\ -+ $(CC) -nostdlib -o $@ -Wl,-Bshareable -R$(USRLIBDIR) modlist @@\ -+ @@\ -+clean:: @@\ -+ RemoveFile(module) -+ -+#endif /* i386Architecture || arm32Architecture || atariArchitecture */ -+ -+/* -+ * NetBSD always uses the XFree86 contrib distribution. - */ --#ifdef SparcArchitecture -+#undef XF86Contrib -+#define XF86Contrib YES -+ -+/* -+ * Definitions for the SUN server on NetBSD/sparc or NetBSD/sun3 -+ */ -+#if defined(SparcArchitecture) || defined(Sun3Architecture) - #ifndef Xsun24Server -+#if defined(SparcArchitecture) -+#define Xsun24Server YES -+#else - #define Xsun24Server NO - #endif -+#endif - #ifndef XsunServer - #define XsunServer YES - #endif - #ifndef XsunMonoServer - #define XsunMonoServer YES - #endif --#ifndef BuildScreenSaverLibrary --#define BuildScreenSaverLibrary YES - #endif -+ - /* -- * XFree86 uses its own (more portable) database routines to speed up -- * the RGB database lookups -- * However, if you want to use ndbm anyway, you can set that to NO in -- * site.def -+ * Definitions for the NetBSD/mac68k server. - */ --#ifndef UseRgbTxt --#define UseRgbTxt YES -+#ifdef mac68kArchitecture -+# ifndef Xmac68kServer -+# define Xmac68kServer YES -+# endif - #endif -+ -+/* -+ * Definitions for the NetBSD/vax server. -+ */ -+#ifdef VaxArchitecture -+# define XvaxMonoServer YES -+# if HasGcc -+# define BuildPexExt XvaxMonoServer -+# else -+# define BuildPex NO /* compiler runs out of table space */ -+# define BuildXInputLib NO /* compiler runs out of table space */ -+# endif -+# define HasSaberC NO -+# define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */ - #endif - - /* -- * Definition for compiling on MIPS machines -+ * Definitions for the NetBSD/amiga server. - */ --#ifdef MipsArchitecture --#define PositionIndependentCFlags --#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | --sed 's/\.[0-9]*$$//'` --#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) --#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB) -+#ifdef amigaArchitecture -+# ifndef XamigaCCmono -+# define XamigaCCmono NO -+# endif -+# ifndef XamigaCCcolor -+# define XamigaCCcolor YES -+# endif -+# ifndef XamigaGfxCardSupport -+# define XamigaGfxCardSupport YES -+# endif -+# ifndef XamigaRetinaZ3Support -+# define XamigaRetinaZ3Support YES -+# endif -+# ifndef XamigaCl5426Server -+# define XamigaCl5426Server YES -+# endif -+# ifndef XamigaCV64Support -+# define XamigaCV64Support YES -+# endif -+/* -+ * You need XamigaGfxCardSupport if you enable XamigaCl5426Server, -+ * XamigaRetinaZ3Support or XamigaCV64Support and you can't use XamigaCCmono -+ * if you enable XamigaCCcolor. -+ * Don't change the next 10 lines !!!!!!!!! -+ */ -+# if (XamigaCl5426Server || XamigaCV64Support || XamigaRetinaZ3Support) \ -+ && !XamigaGfxCardSupport -+# undef XamigaGfxCardSupport -+# define XamigaGfxCardSupport YES -+# endif -+# if XamigaCCcolor -+# undef XamigaCCmono -+# define XamigaCCmono NO -+# endif -+#endif -+ -+/* -+ * Definitions for the NetBSD/alpha X server. -+ */ -+#if defined(AlphaArchitecture) -+# define XalphaNetBSDServer YES -+#ifndef XkbServerDefines -+#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -+#endif - #endif - - /* -- * Definition for compiling on Alpha machines -+ * Definitions for the NetBSD/arm32 VIDC20 X server. - */ --#ifdef AlphaArchitecture --#define BuildServer NO -+#if defined(arm32Architecture) -+# define Xarm32VIDCServer YES -+#endif -+ -+/* -+ * Definitions for the NetBSD/x68k X server. -+ */ -+#if defined(x68kArchitecture) -+# define X68kServer YES -+#endif -+ -+/* -+ * Definitions for the NetBSD/macppc X server. -+ */ -+#if defined(macppcArchitecture) -+# define XmacppcServer YES -+#endif -+ -+/* -+ * Definitions for the NetBSD/pmax X server. -+ */ -+#if defined(pmaxArchitecture) -+# define XpmaxServer YES -+#endif -+ -+/* -+ * Definitions for the NetBSD/hpcmips X server. -+ */ -+#if defined(hpcmipsArchitecture) -+# define XhpcServer YES -+#endif -+ -+ -+#ifndef BuildScreenSaverLibrary -+#define BuildScreenSaverLibrary YES -+#endif -+ -+#ifndef XkbServerDefines -+#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -+#endif -+ -+/* -+ * We use rgb.txt with XFree86, so we must use it here to be compatible. -+ */ -+#ifndef UseRgbTxt -+#define UseRgbTxt YES - #endif diff --git a/net/tightvnc/patches/patch-ac b/net/tightvnc/patches/patch-ac deleted file mode 100644 index 4c86f03fe7f..00000000000 --- a/net/tightvnc/patches/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2003/11/27 17:27:29 abs Exp $ - ---- Xvnc/config/cf/vnc.def.orig 2003-07-31 15:19:37.000000000 +0100 -+++ Xvnc/config/cf/vnc.def -@@ -10,8 +10,6 @@ - - #ifdef BeforeVendorCF - --#include "platform.def" -- - /*****************************************************************************/ - /* - * First try to switch off all the extras that we don't want. This includes -@@ -117,13 +115,7 @@ - * You may need to change this. - */ - --#ifdef SunArchitecture --#define ProjectRoot /usr/openwin --#else --#ifdef LinuxArchitecture - #define ProjectRoot /usr/X11R6 --#endif --#endif - - #endif /* BeforeVendorCF */ - diff --git a/net/tightvnc/patches/patch-ad b/net/tightvnc/patches/patch-ad deleted file mode 100644 index ecdb171dc3d..00000000000 --- a/net/tightvnc/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2004/05/11 04:22:49 snj Exp $ - ---- Xvnc/config/cf/vnclibs.def.orig 2002-06-28 06:53:19.000000000 +0100 -+++ Xvnc/config/cf/vnclibs.def -@@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncaut - /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ - VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a - #else --VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -+VNCSYSLIBS = ${LDFLAGS} -ljpeg -lz - #endif - --VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include -+VNCCPPFLAGS = -I$(TOP)/../include ${CPPFLAGS} diff --git a/net/tightvnc/patches/patch-ae b/net/tightvnc/patches/patch-ae deleted file mode 100644 index c78f8802a43..00000000000 --- a/net/tightvnc/patches/patch-ae +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2003/11/27 17:27:29 abs Exp $ - ---- Xvnc/config/imake/imakemdep.h.orig 2003-02-19 16:39:54.000000000 +0000 -+++ Xvnc/config/imake/imakemdep.h -@@ -253,9 +253,12 @@ in this Software without prior written a - #ifdef _CRAY - #define DEFAULT_CPP "/lib/pcpp" - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -+#if defined(__386BSD__) - #define DEFAULT_CPP "/usr/libexec/cpp" - #endif -+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -+#define USE_CC_E -+#endif - #if defined(__sgi) && defined(__ANSI_CPP__) - #define USE_CC_E - #endif -@@ -290,6 +293,11 @@ in this Software without prior written a - * that support multiple operating systems). - */ - -+#ifdef __NetBSD__ -+#undef unix -+#define unix 42 -+#endif -+ - #define ARGUMENTS 50 /* number of arguments in various arrays */ - char *cpp_argv[ARGUMENTS] = { - "cc", /* replaced by the actual program to exec */ diff --git a/net/tightvnc/patches/patch-af b/net/tightvnc/patches/patch-af deleted file mode 100644 index 0ec0ce73c47..00000000000 --- a/net/tightvnc/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.3 2003/11/27 17:27:29 abs Exp $ - ---- Xvnc/configure.orig 2003-02-19 16:39:30.000000000 +0000 -+++ Xvnc/configure -@@ -25,7 +25,7 @@ else - else - if [ "$SYSNAME" != Darwin ] - then -- REV=`echo $REV | sed -e 's/^V//' -e 's/-.*$//'` -+ REV=`echo $REV | sed -e 's/^V//' -e 's/[-_].*$//'` - fi - fi - diff --git a/net/tightvnc/patches/patch-ag b/net/tightvnc/patches/patch-ag deleted file mode 100644 index b63cb44b75b..00000000000 --- a/net/tightvnc/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2003/11/27 17:27:29 abs Exp $ - ---- Xvnc/programs/Xserver/Imakefile.orig 2000-06-11 13:00:51.000000000 +0100 -+++ Xvnc/programs/Xserver/Imakefile -@@ -1712,7 +1712,7 @@ XVNCOBJS = - XVNC = hw/vnc/libvnc.a $(VNCLIBS) - XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs - XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS) --ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),$(XVNCLIBS),$(XVNCSYSLIBS)) -+ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),,$(XVNCLIBS) $(XVNCSYSLIBS)) - #endif /* XvncServer */ - - diff --git a/net/tightvnc/patches/patch-ah b/net/tightvnc/patches/patch-ah deleted file mode 100644 index 273c1eab933..00000000000 --- a/net/tightvnc/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2003/11/27 17:27:29 abs Exp $ - ---- Xvnc/programs/Xserver/cfb/stipsparc.s.orig 2002-03-20 05:16:03.000000000 +0000 -+++ Xvnc/programs/Xserver/cfb/stipsparc.s -@@ -85,7 +85,7 @@ in this Software without prior written a - #define ForEachBits LY4 - #define NextBits LY5 - --#if defined(SVR4) || ( defined(linux) && defined(__ELF__) ) -+#if defined(SVR4) || defined(__ELF__) - #ifdef TETEXT - #define _cfbStippleStack cfbStippleStackTE - #else diff --git a/net/tightvnc/patches/patch-ai b/net/tightvnc/patches/patch-ai deleted file mode 100644 index 8c37b4629c4..00000000000 --- a/net/tightvnc/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2003/11/27 17:27:29 abs Exp $ - ---- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig 2002-03-20 05:16:03.000000000 +0000 -+++ Xvnc/programs/Xserver/cfb/stipsprc32.s -@@ -81,7 +81,7 @@ in this Software without prior written a - #define ForEachBits LY4 - #define NextBits LY5 - --#if defined(SVR4) || ( defined(linux) && defined(__ELF__) ) -+#if defined(SVR4) || defined(__ELF__) - #ifdef TETEXT - #define _cfb32StippleStack cfb32StippleStackTE - #else diff --git a/net/tightvnc/patches/patch-aj b/net/tightvnc/patches/patch-aj deleted file mode 100644 index a7cb0c19adb..00000000000 --- a/net/tightvnc/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2003/11/27 17:27:29 abs Exp $ - ---- Xvnc/programs/Xserver/hw/vnc/Imakefile.orig 2002-04-30 14:07:31.000000000 +0100 -+++ Xvnc/programs/Xserver/hw/vnc/Imakefile -@@ -12,7 +12,7 @@ OBJS = init.o sockets.o kbdptr.o cmap.o - #include <vnclibs.def> - INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) -I$(XINCLUDESRC) \ - -I../../cfb -I../../mfb -I../../mi -I../../include -I../../os \ -- $(VNCCPPFLAGS) -+ ${BUILDLINK_CPPFLAGS} $(VNCCPPFLAGS) - - DEFINES = ServerOSDefines - diff --git a/net/tightvnc/patches/patch-ak b/net/tightvnc/patches/patch-ak deleted file mode 100644 index 9620f13b475..00000000000 --- a/net/tightvnc/patches/patch-ak +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2004/01/03 14:18:57 mrg Exp $ - ---- Xvnc/programs/Xserver/include/servermd.h.orig 2003-02-19 16:39:54.000000000 +0000 -+++ Xvnc/programs/Xserver/include/servermd.h -@@ -132,7 +132,7 @@ SOFTWARE. - - #endif /* vax */ - --#if (defined(Lynx) && defined(__powerpc__)) -+#if ((defined(__NetBSD__) || defined(Lynx)) && defined(__powerpc__)) - - /* For now this is for Xvfb only */ - #define IMAGE_BYTE_ORDER MSBFirst -@@ -341,7 +341,7 @@ SOFTWARE. - #define BITMAP_BIT_ORDER MSBFirst - #endif /* (__s390__ || __s390x__) && linux */ - --#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) -+#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__) || defined(__arm__))) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) - - #ifndef IMAGE_BYTE_ORDER - #define IMAGE_BYTE_ORDER LSBFirst diff --git a/net/tightvnc/patches/patch-al b/net/tightvnc/patches/patch-al deleted file mode 100644 index 9f7a37b406e..00000000000 --- a/net/tightvnc/patches/patch-al +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-al,v 1.1 2003/11/27 17:27:29 abs Exp $ - ---- vncserver.orig 2003-07-31 15:19:37.000000000 +0100 -+++ vncserver -@@ -41,10 +41,11 @@ $vncUserDir = "$ENV{HOME}/.vnc"; - $fontPath = "unix/:7100"; - - # 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/"; -+$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 diff --git a/net/tightvnc/patches/patch-am b/net/tightvnc/patches/patch-am deleted file mode 100644 index 11bc397a8d6..00000000000 --- a/net/tightvnc/patches/patch-am +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-am,v 1.1 2005/04/06 04:44:15 xtraeme Exp $ - ---- Xvnc/programs/Xserver/include/misc.h.orig 1996-12-23 07:09:29.000000000 +0000 -+++ Xvnc/programs/Xserver/include/misc.h 2005-02-17 23:05:46.000000000 +0000 -@@ -83,6 +83,10 @@ - #include <X11/Xmd.h> - #include <X11/X.h> - -+#ifdef __NetBSD__ -+#include <stdlib.h> -+#endif -+ - #ifndef NULL - #ifndef X_NOT_STDC_ENV - #include <stddef.h> -@@ -159,7 +166,7 @@ - #define min(a, b) (((a) < (b)) ? (a) : (b)) - #define max(a, b) (((a) > (b)) ? (a) : (b)) - #if !defined(AMOEBA) && !defined(__EMX__) --#ifndef abs -+#if !defined(abs) - #define abs(a) ((a) > 0 ? (a) : -(a)) - #endif - #else /* AMOEBA || __EMX__ */ |