Date: Tue, 26 Mar 2019 05:31:27 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496879 - in head/net/tightvnc: . files Message-ID: <201903260531.x2Q5VRrI076048@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Tue Mar 26 05:31:27 2019 New Revision: 496879 URL: https://svnweb.freebsd.org/changeset/ports/496879 Log: net/tightvnc: Switch to options helpers, etc - Switch to options helpers - Regenerate patches - Adjust CONFLICTS since some conflicting ports removed from ports tree - Pet portlint (bring USES earlier) - Add missing USES,USE_XORG - Bump PORTREVISION due to USES change Sponsored by: HAW International, Inc. Modified: head/net/tightvnc/Makefile head/net/tightvnc/files/patch-Imakefile head/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf head/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf head/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def head/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h head/net/tightvnc/files/patch-Xvnc__include__Xos.h head/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c head/net/tightvnc/files/patch-vncserver head/net/tightvnc/files/patch-vncviewer__Imakefile head/net/tightvnc/files/patch-vncviewer__rfbproto.c Modified: head/net/tightvnc/Makefile ============================================================================== --- head/net/tightvnc/Makefile Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/Makefile Tue Mar 26 05:31:27 2019 (r496879) @@ -3,7 +3,7 @@ PORTNAME= tightvnc PORTVERSION= 1.3.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net java MASTER_SITES= SF/vnc-tight/TightVNC-unix/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}_unixsrc @@ -14,34 +14,27 @@ COMMENT= Enhanced version of VNC LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENCE.TXT +BROKEN_aarch64= Fails to build: invokes x86 asm +USES= cpe imake jpeg shebangfix perl5 tar:bzip2 +USE_XORG= ice sm x11 xaw xext xmu xt xpm + RUN_DEPENDS= showrgb:x11/rgb \ xauth:x11/xauth \ xorg-fonts>=7.2:x11-fonts/xorg-fonts -BROKEN_aarch64= Fails to build: invokes x86 asm - MAKE_JOBS_UNSAFE= yes -CONFLICTS= tridiavnc-[0-9]* vnc-[0-9]* tigervnc-* +CONFLICTS= tigervnc-* WRKSRC= ${WRKDIR}/vnc_unixsrc -USES= cpe imake jpeg shebangfix perl5 tar:bzip2 SHEBANG_FILES= vncserver CFLAGS+= -Wno-return-type -USE_XORG= xaw ALL_TARGET= World OPTIONS_DEFINE= JVNC_VIEWER +OPTIONS_SUB= yes JVNC_VIEWER_DESC= Install Java-based vnc viewer +JVNC_VIEWER_USE_JAVA= yes +JVNC_VIEWER_JAVA_RUN= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MJVNC_VIEWER} -USE_JAVA= yes -JAVA_RUN= yes -PLIST_SUB+= JVNC_VIEWER="" -.else -PLIST_SUB+= JVNC_VIEWER="@comment " -.endif - .ifdef(TIGHTVNC_BASE) PREFIX=${TIGHTVNC_BASE} .endif @@ -68,9 +61,9 @@ do-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${FILE} .endfor .endif -.if ${PORT_OPTIONS:MJVNC_VIEWER} + +do-install-JVNC_VIEWER-on: @${MKDIR} ${STAGEDIR}${DATADIR}/classes ${INSTALL_DATA} ${WRKSRC}/classes/*.* ${STAGEDIR}${DATADIR}/classes -.endif .include <bsd.port.post.mk> Modified: head/net/tightvnc/files/patch-Imakefile ============================================================================== --- head/net/tightvnc/files/patch-Imakefile Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Imakefile Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Imakefile.orig Wed May 22 23:19:15 2002 -+++ Imakefile Wed May 22 23:20:03 2002 -@@ -11,6 +11,7 @@ +--- Imakefile.orig 2002-04-30 13:07:31 UTC ++++ Imakefile +@@ -11,6 +11,7 @@ World: @echo Built $(SUBDIRS). @echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"' @echo "" Modified: head/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/config/cf/FreeBSD.cf.orig 2000-06-11 21:00:51.000000000 +0900 -+++ Xvnc/config/cf/FreeBSD.cf 2009-03-09 08:18:00.000000000 +0900 -@@ -223,7 +223,9 @@ XCOMM operating system: OSName (OSMajor +--- Xvnc/config/cf/FreeBSD.cf.orig 2000-06-11 12:00:51 UTC ++++ Xvnc/config/cf/FreeBSD.cf +@@ -223,7 +223,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS # define GccGasOption /**/ #endif @@ -10,7 +10,7 @@ #define StandardDefines -DCSRG_BASED -@@ -253,11 +253,17 @@ +@@ -253,11 +255,17 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS #endif #ifdef i386Architecture @@ -30,7 +30,7 @@ #ifndef PreIncDir # define PreIncDir /usr/include #endif -@@ -353,12 +359,15 @@ +@@ -353,12 +361,15 @@ install.man:: #define HasBsdMake YES #endif Modified: head/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/config/cf/Imake.cf.orig 2006-12-23 21:07:55.000000000 +0900 -+++ Xvnc/config/cf/Imake.cf 2007-09-05 07:45:05.000000000 +0900 -@@ -206,6 +206,12 @@ +--- Xvnc/config/cf/Imake.cf.orig 2006-12-23 12:07:55 UTC ++++ Xvnc/config/cf/Imake.cf +@@ -206,6 +206,12 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/1 # define i386Architecture # undef i386 # endif Modified: head/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def Tue Mar 26 05:31:27 2019 (r496879) @@ -1,5 +1,5 @@ ---- Xvnc/config/cf/vnclibs.def.orig Sat May 3 11:31:54 2003 -+++ Xvnc/config/cf/vnclibs.def Tue Sep 26 21:48:43 2006 +--- Xvnc/config/cf/vnclibs.def.orig 2003-05-03 09:31:55 UTC ++++ Xvnc/config/cf/vnclibs.def @@ -5,13 +5,6 @@ * and programs/Xserver/hw/vnc whenever you change this file. */ Modified: head/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/config/imake/imakemdep.h.orig Sat Nov 24 16:43:07 2001 -+++ Xvnc/config/imake/imakemdep.h Sat Nov 24 16:44:48 2001 -@@ -225,6 +225,9 @@ +--- Xvnc/config/imake/imakemdep.h.orig 2003-02-19 16:39:54 UTC ++++ Xvnc/config/imake/imakemdep.h +@@ -225,6 +225,9 @@ in this Software without prior written authorization f #ifdef hpux #define USE_CC_E #endif @@ -10,7 +10,7 @@ #ifdef WIN32 #define USE_CC_E #define DEFAULT_CC "cl" -@@ -253,7 +256,7 @@ +@@ -253,7 +256,7 @@ in this Software without prior written authorization f #ifdef _CRAY #define DEFAULT_CPP "/lib/pcpp" #endif Modified: head/net/tightvnc/files/patch-Xvnc__include__Xos.h ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__include__Xos.h Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__include__Xos.h Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/include/Xos.h.orig Sat Jul 13 02:14:08 2002 -+++ Xvnc/include/Xos.h Sat Jul 13 02:14:15 2002 -@@ -151,7 +151,6 @@ +--- Xvnc/include/Xos.h.orig 2000-06-11 12:00:51 UTC ++++ Xvnc/include/Xos.h +@@ -151,7 +151,6 @@ extern int sys_nerr; #endif /* X_NOT_POSIX else */ #ifdef CSRG_BASED Modified: head/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/programs/Xserver/dix/Imakefile.orig Fri Mar 29 05:30:51 2002 -+++ Xvnc/programs/Xserver/dix/Imakefile Fri Mar 29 05:32:27 2002 -@@ -36,15 +36,11 @@ +--- Xvnc/programs/Xserver/dix/Imakefile.orig 2009-03-05 06:38:33 UTC ++++ Xvnc/programs/Xserver/dix/Imakefile +@@ -43,15 +43,11 @@ OBJS = atom.o colormap.o cursor.o devices.o dispatch.o * changed. */ Modified: head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c Tue Mar 26 05:31:27 2019 (r496879) @@ -1,5 +1,5 @@ ---- Xvnc/programs/Xserver/hw/vnc/sockets.c Tue Mar 19 18:59:22 2002 -+++ Xvnc/programs/Xserver/hw/vnc/sockets.c Fri Nov 1 18:03:02 2002 +--- Xvnc/programs/Xserver/hw/vnc/sockets.c.orig 2006-12-23 12:07:55 UTC ++++ Xvnc/programs/Xserver/hw/vnc/sockets.c @@ -38,6 +38,7 @@ */ Modified: head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/programs/Xserver/hw/xfree86/common/compiler.h.orig 2015-12-23 13:48:48.097424000 +0800 -+++ Xvnc/programs/Xserver/hw/xfree86/common/compiler.h 2015-12-23 13:49:19.871472000 +0800 -@@ -371,7 +371,7 @@ +--- Xvnc/programs/Xserver/hw/xfree86/common/compiler.h.orig 2000-06-11 12:00:51 UTC ++++ Xvnc/programs/Xserver/hw/xfree86/common/compiler.h +@@ -371,7 +371,7 @@ static __inline__ unsigned long ldw_u(unsigned short * #define mem_barrier() /* NOP */ #define write_mem_barrier() /* NOP */ Modified: head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/programs/Xserver/os/Imakefile.orig Sun Jun 11 21:00:52 2000 -+++ Xvnc/programs/Xserver/os/Imakefile Fri Dec 6 02:53:22 2002 -@@ -135,7 +135,7 @@ +--- Xvnc/programs/Xserver/os/Imakefile.orig 2000-06-11 12:00:51 UTC ++++ Xvnc/programs/Xserver/os/Imakefile +@@ -135,7 +135,7 @@ SpecialCObjectRule(xalloc,$(ICONFIGFILES),NullParamete #if defined(SparcArchitecture) && HasGcc && !HasGcc2 oscolor.o: oscolor.c $(ICONFIGFILES) $(RM) $@ Modified: head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c ============================================================================== --- head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- Xvnc/programs/Xserver/os/access.c.orig 2000-06-11 21:00:51.000000000 +0900 -+++ Xvnc/programs/Xserver/os/access.c 2007-09-05 12:07:30.000000000 +0900 -@@ -634,7 +634,7 @@ +--- Xvnc/programs/Xserver/os/access.c.orig 2000-06-11 12:00:51 UTC ++++ Xvnc/programs/Xserver/os/access.c +@@ -634,7 +634,7 @@ DefineSelf (fd) #endif ifc.ifc_len = sizeof (buf); ifc.ifc_buf = buf; Modified: head/net/tightvnc/files/patch-vncserver ============================================================================== --- head/net/tightvnc/files/patch-vncserver Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-vncserver Tue Mar 26 05:31:27 2019 (r496879) @@ -1,12 +1,11 @@ ---- vncserver.orig Thu Aug 10 13:01:07 2006 -+++ vncserver Tue Sep 26 21:08:10 2006 -@@ -38,7 +38,7 @@ +--- vncserver.orig 2019-03-26 05:19:17 UTC ++++ vncserver +@@ -34,7 +34,7 @@ $depth = 24; $desktopName = "X"; $vncClasses = "/usr/local/vnc/classes"; $vncUserDir = "$ENV{HOME}/.vnc"; -$fontPath = "unix/:7100"; +#$fontPath = "unix/:7100"; $authType = "-rfbauth $vncUserDir/passwd"; - - # Here is another example of setting the font path: - + + # Read configuration from the system-wide and user files if present. Modified: head/net/tightvnc/files/patch-vncviewer__Imakefile ============================================================================== --- head/net/tightvnc/files/patch-vncviewer__Imakefile Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-vncviewer__Imakefile Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- vncviewer/Imakefile.orig Thu Sep 26 11:26:17 2002 -+++ vncviewer/Imakefile Thu Sep 26 11:28:47 2002 -@@ -10,17 +10,12 @@ +--- vncviewer/Imakefile.orig 2003-03-12 16:20:34 UTC ++++ vncviewer/Imakefile +@@ -10,17 +10,12 @@ XCOMM seems to cause problems on Digital Unix. DEFINES = -DMITSHM #endif @@ -22,7 +22,7 @@ DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) -@@ -44,4 +39,4 @@ +@@ -45,4 +40,4 @@ SRCS = \ OBJS = $(SRCS:.c=.o) Modified: head/net/tightvnc/files/patch-vncviewer__rfbproto.c ============================================================================== --- head/net/tightvnc/files/patch-vncviewer__rfbproto.c Tue Mar 26 05:27:34 2019 (r496878) +++ head/net/tightvnc/files/patch-vncviewer__rfbproto.c Tue Mar 26 05:31:27 2019 (r496879) @@ -1,6 +1,6 @@ ---- vncviewer/rfbproto.c~ 2006-12-08 18:20:03.000000000 +1100 -+++ vncviewer/rfbproto.c 2013-09-29 09:19:34.782746129 +1000 -@@ -569,7 +569,7 @@ +--- vncviewer/rfbproto.c.orig 2006-12-08 07:20:03 UTC ++++ vncviewer/rfbproto.c +@@ -569,7 +569,7 @@ AuthenticateVNC(void) passwd = getpass("Password: "); } @@ -9,4 +9,3 @@ fprintf(stderr, "Reading password failed\n"); return False; } -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903260531.x2Q5VRrI076048>