[csw-devel] SF.net SVN: gar:[6204] csw/mgar/pkg/vncserver/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 6204
          http://gar.svn.sourceforge.net/gar/?rev=6204&view=rev
Author:   wahwah
Date:     2009-09-06 07:41:24 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
vncserver: Compiles correctly now. To be tested.

Modified Paths:
--------------
    csw/mgar/pkg/vncserver/trunk/Makefile

Modified: csw/mgar/pkg/vncserver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vncserver/trunk/Makefile	2009-09-06 01:04:38 UTC (rev 6203)
+++ csw/mgar/pkg/vncserver/trunk/Makefile	2009-09-06 07:41:24 UTC (rev 6204)
@@ -3,65 +3,67 @@
 CATEGORIES = utils
 
 DESCRIPTION = TightVNC server is a free remote control package derived from the popular VNC software
+
 define BLURB
+  TightVNC is a free remote control software package. With TightVNC, you can see
+  the desktop of a remote machine and control it with your local mouse and
+  keyboard, just like you would do it sitting in the front of that computer.
 endef
 
 SF_PROJ = vnc-tight
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2
 DISTFILES += vncservers
-
-PACKAGES = CSWvncs
-CATALOGNAME = vncserver
-
+PACKAGES = CSWvncs CSWvncv
+CATALOGNAME_CSWvncs = vncserver
+CATALOGNAME_CSWvncv = vncviewer
 SPKG_SOURCEURL = http://www.tightvnc.org/
-
-REQUIRED_PKGS = CSWjpeg CSWtcpwrap
-
 UPSTREAM_USE_SF = 1
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2
-
 DISTNAME = vnc_unixsrc
+PKGFILES_CSWvncv  = $(bindir)/vncviewer
+PKGFILES_CSWvncv += $(mandir)/man1/vncviewer\.1
+SPKG_DESC_CSWvncs = TightVNC server
+SPKG_DESC_CSWvncv = TightVNC viewer
 
-# Use tightvnc.spec
+REQUIRED_PKGS = CSWjpeg CSWtcpwrap CSWzlib
+REQUIRED_PKGS += SUNWcslr SUNWlibmsr SUNWxwice SUNWxwplt 
 
+sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
+
 EXTRA_DEFINES = -DUSE_LIBWRAP=1
 EXTRA_INC = /usr/openwin/share/include/X11
 EXTRA_LDFLAGS = /opt/csw/lib
 LOCAL_LDFLAGS = $(LINKER_FLAGS)
 BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS
-
 CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile Xvnc
 CONFIGURE_ARGS = -a
-
 BUILD_SCRIPTS = vnc Xvnc
-
-# VNC doesn't come with tests
 SKIPTEST = 1
-
 INSTALL_SCRIPTS = vnc
-
 PATCHFILES  = 0001-GNU-make-by-default.patch
+# This patch has been sent upstream with a bug report.
+# http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067
 PATCHFILES += 0002-Test-for-Makefile-presence.patch
 
 include gar/category.mk
 
 pre-configure-modulated:
 	perl -pi -e "s|/usr/local/vnc/classes|$(datadir)/vnc/classes|" $(WORKSRC)/vncserver
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 configure-Xvnc:
 	banner "Config Xvnc"
 	perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure
 	cd $(WORKSRC)/Xvnc && ./configure
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 build-vnc:
 	banner "Build VNC"
-        #$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS)
 	cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 build-Xvnc: configure-Xvnc
 	banner "Build Xvnc"
@@ -85,53 +87,5 @@
 	(cd $(WORKSRC); cp -pR classes $(DESTDIR)$(datadir)/vnc)
 	#mkdir -p %{buildroot}/etc/rc.d/init.d
 	#install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver
+	ginstall -d $(DESTDIR)$(sysconfdir)/vncservers
 	ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers
-
-	
-
-# Build
-
-#patch < vnc-xclients.patch
-
-#xmkmf -a
-#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World
-#cd Xvnc
-#./configure
-#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \
-#     EXTRA_DEFINES="-DUSE_LIBWRAP=1"
-
-
-
-
-# Install
-
-#rm -rf %{buildroot}
-
-#mkdir -p %{buildroot}%{_bindir}
-#mkdir -p %{buildroot}%{_mandir}/man1
-#./vncinstall %{buildroot}%{_bindir} %{buildroot}%{_mandir}
-
-#mkdir -p %{buildroot}%{_datadir}/vnc
-#cp -aR classes %{buildroot}%{_datadir}/vnc
-
-#strip %{buildroot}%{_bindir}/* || :
-
-#mkdir -p %{buildroot}/etc/rc.d/init.d
-#install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver
-#
-#mkdir -p %{buildroot}/etc/sysconfig
-#cat > %{buildroot}/etc/sysconfig/vncservers << EOF
-# The VNCSERVERS variable is a list of display:user pairs.
-#
-# Uncomment the line below to start a VNC server on display :1
-# as my 'myusername' (adjust this to your own).  You will also
-# need to set a VNC password; run 'man vncpasswd' to see how
-# to do that.  
-#
-# DO NOT RUN THIS SERVICE if your local area network is
-# untrusted!  For a secure way of using VNC, see
-# <URL:http://www.uk.research.att.com/vnc/sshvnc.html>.
-
-# VNCSERVERS="1:myusername"
-#EOF
-#chmod 644 %{buildroot}/etc/sysconfig/vncservers


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.