--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/Makefile Thu Oct 11 11:47:20 2007 -0700
@@ -0,0 +1,224 @@
+###############################################################################
+#
+# Xvnc server Makefile
+# Based on Fedora's vnc-4.1.2-21.fc8/vnc.spec
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.3 07/10/11
+#
+
+# Build 32-bit or 64-bit?
+BUILD_TYPES_SET=yes
+BUILD_TYPES_sparc=64
+BUILD_TYPES_i386=32
+BUILD_TYPES=$(BUILD_TYPES_$(MACH))
+
+# Package name used in tarballs
+MODULE_NAME=vnc
+
+# Name used in server-specific rules in ../Makefile.inc
+XSERVER=XVNC
+
+# Version number (used in path names)
+VNC_VERS=4.1.2
+VNC_TARBALL_VERS=4_1_2-unixsrc
+
+# Source tarball
+SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(VNC_TARBALL_VERS).tar.gz
+
+# Xorg server source tarball to use sources from
+XORG_TARBALL=$(TARBALLDIR)/xorg-server-$(XORGSERVER_VERS).tar.bz2
+XORG_SOURCE_DIR=$(BUILD_DIR)/xorg-server-$(XORGSERVER_VERS)
+XORG_BUILD_DIR=$(SOURCE_DIR)/unix/xorg-x11-server-source
+
+# Download site for source
+# - Master source site doesn't allow wget downloads, so we use a mirror
+#SOURCE_URL=http://www.realvnc.com/dist/$(SOURCE_TARBALL_NAME)
+SOURCE_URL=http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/$(SOURCE_TARBALL_NAME)
+SOURCE_URL_SET=yes
+SOURCE_UNCOMPRESS=gzcat
+
+# Directory created by unpacking source
+SOURCE_DIR=$(BUILD_DIR)/$(MODULE_NAME)-$(VNC_TARBALL_VERS)
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = \
+ vnc-use-fb.patch,-p1 \
+ vnc-restart.patch,-p1 \
+ vnc-modular-xorg.patch,-p1 \
+ vnc-nohttpd.patch,-p1 \
+ vnc-int10.patch,-p1 \
+ vnc-64bit.patch,-p1 \
+ vnc-ipv6.patch,-p1 \
+ vnc-render.patch,-p1 \
+ vnc-autotools.patch,-p1 \
+ vnc-autotools-compile.patch,-p1 \
+ vnc-always_use_fb.patch,-p1 \
+ vnc-24bit.patch,-p1 \
+ c++public.patch \
+ build-without-Xorg.patch \
+ solaris-port.patch
+
+XORG_SOURCE_PATCHES:sh=cat ../xorg/patch-list
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES= unix/xc/programs/Xserver/Xvnc.man \
+ unix/vncconfig/vncconfig.man unix/vncpasswd/vncpasswd.man \
+ unix/vncserver.man unix/vncviewer/vncviewer.man \
+ unix/x0vncserver/x0vncserver.man
+SUNTOUCH_MAN_FLAGS= \
+ -a '{Availability, SUNWxvnc} {Interface Stability, Volatile}'
+
+# Compiler to use - VNC code only builds with g++, not Sun Studio, so use
+# gcc/g++ on both platforms for now
+COMPILER=gcc
+
+# Binary built in tree
+XVNCSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg
+
+BUILD_TARGETS=$(XVNCSERVER_BIN)
+
+default: all
+
+# Merge in additional sources from Xorg tarball & sun-src directory
+# Use layout from Fedora RPM so their patches apply
+# This step has to be done before including common/Makefile.inc so
+# that patches applied in that step work correctly.
+source_gen:: $(LNDIR)
+ mkdir -p $(SOURCE_DIR)/unix
+ bzcat $(XORG_TARBALL) | (cd $(BUILD_DIR) ; tar -xf - )
+ @if [ "x$(XORG_SOURCE_PATCHES)" != "x" ] ; then \
+ for p in $(XORG_SOURCE_PATCHES) x ; do \
+ if [ "$$p" != "x" ] ; then \
+ PATCH_CMD=`echo $$p | awk -F, '{if (NF > 1) FLAGS = $$2; else FLAGS="-p0" ; printf "gpatch -d $(XORG_SOURCE_DIR) %s < ../xorg/%s\n", FLAGS, $$1}'` ; \
+ echo "$${PATCH_CMD}" ; \
+ eval $${PATCH_CMD} ; \
+ fi ; \
+ done ; \
+ fi
+ mv $(XORG_SOURCE_DIR) $(XORG_BUILD_DIR)
+ (cd $(XORG_BUILD_DIR) && $(LNDIR) ../../../../../xorg/sun-src)
+
+
+include ../Makefile.inc
+
+# Merge in additional sources from Xorg tarball & sun-src directory
+# Use layout from Fedora RPM so their patches apply
+# This step has to be done after including common/Makefile.inc since
+# it depends on files created in that stage
+source_gen::
+ (cd $(SOURCE_DIR) ; \
+ cp -p unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+ unix/xc/programs/Xserver/Xvnc.man \
+ unix/xc/programs/Xserver/vnc/*.h \
+ unix/xc/programs/Xserver/vnc/*.cc \
+ unix/xorg-x11-server-source/hw/vnc/ ; \
+ cp -p unix/xorg-x11-server-source/cfb/cfb.h \
+ unix/xorg-x11-server-source/fb/fb.h \
+ unix/xorg-x11-server-source/fb/fbrop.h \
+ unix/xorg-x11-server-source/hw/vnc/ ; \
+ perl -i -p -e 's,\b(xor|and)\b,c_$$1,g' \
+ unix/xorg-x11-server-source/hw/vnc/cfb.h \
+ unix/xorg-x11-server-source/hw/vnc/fb.h \
+ unix/xorg-x11-server-source/hw/vnc/fbrop.h )
+
+# Command line options to GNU autoconf configure script for vnc
+VNC_CONFIG_OPTS= --with-installed-zlib --prefix=$(XVNCSERVER_PREFIX) \
+ --mandir='$${prefix}/share/man' --libdir='$${exec_prefix}/lib/vnc'
+
+# Command line options to GNU autoconf configure script for Xorg
+XVNC_CONFIG_OPTS = $(XSERVER_CONFIG_OPTS) \
+ --disable-builddocs --with-int10=stub \
+ --disable-dga --disable-xfree86-utils --disable-dri \
+ --disable-xorg --disable-dmx --disable-xvfb --disable-xnest \
+ --disable-xprint --disable-kdrive
+
+XVNC_CPPFLAGS = \
+ -I$(PWD)/$(SOURCE_DIR)/common \
+ -I$(PWD)/$(SOURCE_DIR)/unix/vncconfig \
+ $(XSERVER_CPPFLAGS)
+
+# Uncomment to build debug
+# OPT_CFLAGS = -g
+# DEFAULT_GCC_CFLAGS = -g -O3 -fno-omit-frame-pointer -Wall
+
+DEFAULT_GCC_CFLAGS += -fPIC
+
+# Environment variable options to GNU autoconf configure script
+XVNC_CONFIG_ENV = LIBS="-lsocket -lnsl"
+CONFIG_ENV += $(XVNC_CONFIG_ENV)
+
+LDPATH_ADD += -L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \
+ -R$(X11_SERVERMODS_DIR)/extensions/mesa/$(ARCHLIBSUBDIR) \
+ -R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR)
+
+# Run configure scripts for vnc sources
+$(SOURCE_DIR)/unix/Makefile: $(UNPACK_TARGET)
+ (cd $(SOURCE_DIR)/common && autoreconf --install --force && \
+ $(CONFIG_ENV) ./configure $(VNC_CONFIG_OPTS) )
+ (cd $(SOURCE_DIR)/unix && autoreconf --install --force && \
+ $(CONFIG_ENV) ./configure $(VNC_CONFIG_OPTS) )
+
+# Run configure script for Xvnc
+$(XORG_BUILD_DIR)/Makefile: $(UNPACK_TARGET)
+ (cd $(XORG_BUILD_DIR) && \
+ ACLOCAL="$(ACLOCAL_PATH)" autoreconf --install --force && \
+ $(CONFIG_ENV) ./configure $(XVNC_CONFIG_OPTS) )
+ $(TOP)/common/delibtoolize.pl $(SOURCE_DIR)
+
+$(XVNCSERVER_BIN): $(SOURCE_DIR)/unix/Makefile $(XORG_BUILD_DIR)/Makefile
+ (cd $(SOURCE_DIR)/common ; $(BUILD_ENV) $(MAKE) $(MFLAGS))
+ (cd $(SOURCE_DIR)/unix ; $(BUILD_ENV) $(MAKE) $(MFLAGS))
+ (cd $(XORG_BUILD_DIR) ; $(BUILD_ENV) $(MAKE) $(MFLAGS))
+
+install_gen: $(XVNCSERVER_BIN)
+ (cd $(XORG_BUILD_DIR)/hw/vnc \
+ && $(BUILD_ENV) $(MAKE) $(MFLAGS) -e install \
+ DESTDIR=$(PROTODIR) CPPROG="cp -p" )
+ mkdir -p $(PROTODIR)/usr/bin \
+ $(PROTODIR)/usr/share/man/man1 \
+ $(PROTODIR)$(X11_MAN_DIR)/man/man1 \
+ $(PROTODIR)/usr/share/vnc \
+ $(PROTODIR)/var/svc/manifest/application/x11
+ cp -pf $(SOURCE_DIR)/unix/vncserver \
+ $(SOURCE_DIR)/unix/vncpasswd/vncpasswd \
+ $(SOURCE_DIR)/unix/vncconfig/vncconfig \
+ $(PROTODIR)/usr/bin
+ cp -pf $(SOURCE_DIR)/unix/vncserver.man \
+ $(PROTODIR)/usr/share/man/man1/vncserver.1
+ cp -pf $(SOURCE_DIR)/unix/vncconfig/vncconfig.man \
+ $(PROTODIR)/usr/share/man/man1/vncconfig.1
+ cp -pf $(SOURCE_DIR)/unix/vncpasswd/vncpasswd.man \
+ $(PROTODIR)/usr/share/man/man1/vncpasswd.1
+ cp -pf $(SOURCE_DIR)/common/javabin/index.vnc \
+ $(PROTODIR)/usr/share/vnc
+ cp -pf $(XORG_BUILD_DIR)/hw/vnc/Xvnc.man \
+ $(PROTODIR)$(X11_MAN_DIR)/man1/Xvnc.1
+ cp -pf xvnc-inetd.xml $(PROTODIR)/var/svc/manifest/application/x11/