Added vnc-reflector, corrected typo in vpnc/Config.in added then to menuconfig

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2648 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 69 insertions, 1 deletions

diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index b8f4d6b00c..5cd589491c 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -130,6 +130,7 @@ source "package/ttcp/Config.in"
 source "package/ulogd/Config.in"
 source "package/updatedd/Config.in"
 source "package/vgp/Config.in"
+source "package/vnc-reflector/Config.in"
 source "package/vpnc/Config.in"
 source "package/vrrpd/Config.in"
 source "package/vsftpd/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index af04601fe2..f906df6074 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -206,6 +206,7 @@ package-$(BR2_PACKAGE_USTL) += ustl
 package-$(BR2_COMPILE_UTIL_LINUX) += util-linux
 package-$(BR2_PACKAGE_UDEV) += udev
 package-$(BR2_PACKAGE_VGP) += vgp
+package_$(BR2_PACKAGE_VNC_REFLECTOR) += vnc-reflector
 package-$(BR2_PACKAGE_VPNC) += vpnc
 package-$(BR2_PACKGE_VRRPD) += vrrpd
 package-$(BR2_PACKAGE_VTUN) += vtun
@@ -315,6 +316,7 @@ tcpdump-compile: libpcap-compile
 tinc-compile: zlib-compile openssl-compile liblzo-compile
 tor-compile: libevent-compile openssl-compile zlib-compile
 usbutils-compile: libusb-compile
+vnc-reflector-compile: jpeg-compile zlib-compile
 vpnc-compile: libgcrypt-compile libgpg-error-compile
 vtun-compile: zlib-compile openssl-compile liblzo-compile
 wificonf-compile: wireless-tools-compile nvram-compile
diff --git a/openwrt/package/vnc-reflector/Config.in b/openwrt/package/vnc-reflector/Config.in
new file mode 100755
index 0000000000..84a158c399
--- /dev/null
+++ b/openwrt/package/vnc-reflector/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_VNC_REFLECTOR
+        tristate "vnc-reflector....................... VNC proxy for multiple clients"
+	default m if CONFIG_DEVEL
+	depends on BR2_PACKAGE_JPEG
+	depends on BR2_PACKAGE_ZLIB
+	help
+		VNC Reflector is a specialized VNC server which acts as a proxy sitting between real VNC server (a host) and a number of VNC clients. It was designed to work efficiently with large number of clients.
diff --git a/openwrt/package/vnc-reflector/Makefile b/openwrt/package/vnc-reflector/Makefile
new file mode 100755
index 0000000000..6d58abbf67
--- /dev/null
+++ b/openwrt/package/vnc-reflector/Makefile
@@ -0,0 +1,31 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=vnc-reflector
+PKG_VERSION:=1.2.4
+PKG_RELEASE:=1
+PKG_MD5SUM:=
+PKG_SOURCE_URL:=@SF/vnc-reflector
+PKG_SOURCE:=vnc_reflector-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/vnc_reflector
+PKG_CAT:=zcat
+
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,VNC_REFLECTOR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) STAGING_DIR=$(STAGING_DIR) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR)
+	install -d $(PKG_INSTALL_DIR)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/vncreflector $(PKG_INSTALL_DIR)/usr/sbin/
+	touch $@
+
+$(IPKG_VNC_REFLECTOR):
+	mkdir -p $(IDIR_VNC_REFLECTOR)
+	cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VNC_REFLECTOR)/
+	$(RSTRIP) $(IDIR_VNC_REFLECTOR)
+	$(IPKG_BUILD) $(IDIR_VNC_REFLECTOR) $(PACKAGE_DIR)
diff --git a/openwrt/package/vnc-reflector/ipkg/vnc-reflector.control b/openwrt/package/vnc-reflector/ipkg/vnc-reflector.control
new file mode 100755
index 0000000000..293a0a0701
--- /dev/null
+++ b/openwrt/package/vnc-reflector/ipkg/vnc-reflector.control
@@ -0,0 +1,6 @@
+Package: vnc-reflector
+Depends: jpeg, zlib
+Section: net
+Architecture: mipsel
+Priority: optional
+Description: VNC Reflector is a specialized VNC server which acts as a proxy sitting between real VNC server (a host) and a number of VNC clients. It was designed to work efficiently with large number of clients.
diff --git a/openwrt/package/vnc-reflector/patches/01-honor_include_lib_path.patch b/openwrt/package/vnc-reflector/patches/01-honor_include_lib_path.patch
new file mode 100644
index 0000000000..8bc04c2829
--- /dev/null
+++ b/openwrt/package/vnc-reflector/patches/01-honor_include_lib_path.patch
@@ -0,0 +1,21 @@
+diff -urN orig/vnc_reflector/Makefile vnc_reflector/Makefile
+--- orig/vnc_reflector/Makefile	2003-04-16 19:32:42.000000000 +0200
++++ vnc_reflector/Makefile	2005-12-13 11:08:09.000000000 +0100
+@@ -14,7 +14,7 @@
+ #
+ # Variables you might want to edit: CFLAGS, CONFFLAGS
+ 
+-IFLAGS =	-I.
++IFLAGS =	-I. -I$(STAGING_DIR)/usr/include
+ 
+ # Production
+ CFLAGS =	-O2 $(IFLAGS)
+@@ -29,7 +29,7 @@
+ CONFFLAGS =	-DUSE_POLL
+ 
+ # Link with zlib and JPEG libraries
+-LDFLAGS =	-L/usr/local/lib -lz -ljpeg
++LDFLAGS =	-L$(STAGING_DIR)/usr/lib -lz -ljpeg
+ 
+ PROG = 	vncreflector
+ 
diff --git a/openwrt/package/vpnc/Config.in b/openwrt/package/vpnc/Config.in
index 2b3a42356e..03d909a9b0 100755
--- a/openwrt/package/vpnc/Config.in
+++ b/openwrt/package/vpnc/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_VPNC
-	tristate "vpnc............................. client for cisco3000 VPN Concentrator."
+	tristate "vpnc............................. VPN client for Cisco 3000"
 	default m if CONFIG_DEVEL
 	depends on BR2_PACKAGE_KMOD_TUN
 	depends on BR2_PACKAGE_LIBGPG_ERROR